Changeset 9396 in orxonox.OLD for branches/proxy/src/world_entities

Timestamp:

Jul 23, 2006, 10:07:23 PM (18 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

Location:

branches/proxy/src/world_entities

Files:

• bsp_entity.cc (modified) (3 diffs)
• creatures/fps_player.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• spawning_point.cc (modified) (2 diffs)

branches/proxy/src/world_entities/bsp_entity.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2004 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    ### File Specific:
    main-programmer: Claudio Botta
@@ -53 +53 @@
 
   this->bspManager = NULL;
- 
+
   this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name" ) );
-  
+
   this->setSynchronized( true );
 }
@@ -63 +63 @@
 {
   PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
-  
+
   this->name = name;
 

branches/proxy/src/world_entities/creatures/fps_player.cc

@@ -287 +287 @@
   //dealing damage
 
-  if ( State::isOnline() && SharedNetworkData::getInstance()->isMasterServer() )
+  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer()))
   {
     this->damageTicker -= time;

branches/proxy/src/world_entities/space_ships/space_ship.cc

@@ -314 +314 @@
   if( entity->isA(CL_PROJECTILE) && entity != ref)
   {
-    if ( SharedNetworkData::getInstance()->isMasterServer() )
+    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
     {
       //TODO handle this

branches/proxy/src/world_entities/spawning_point.cc

@@ -178 +178 @@
       }
 
-      if ( found && SharedNetworkData::getInstance()->isMasterServer() )
+      if ( found && SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
         this->sendRespawnMessage( it->entity->getUniqueID() );
 
@@ -218 +218 @@
 bool SpawningPoint::respawnMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
   {
     PRINTF(2)("server received spawn message!\n");