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

Timestamp:

Jul 25, 2006, 10:52:37 AM (18 years ago)

Author:

patrick

Message:

switched another interface funciton

Location:

branches/proxy/src/world_entities

Files:

• 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/creatures/fps_player.cc

@@ -287 +287 @@
   //dealing damage
 
-  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer()))
+  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()))
   {
     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() || SharedNetworkData::getInstance()->isProxyServer())
+    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     {
       //TODO handle this

branches/proxy/src/world_entities/spawning_point.cc

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