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

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

File:

• branches/proxy/src/world_entities/creatures/fps_player.cc (modified) (1 diff)

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;