Changeset 9406 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/world_entities/creatures/fps_player.cc (modified) (3 diffs)

trunk/src/world_entities/creatures/fps_player.cc

@@ -276 +276 @@
 //     if( target != NULL)
 //     {
-//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
 //     }
 //     else
@@ -287 +287 @@
   //dealing damage
 
-  if ( State::isOnline() && SharedNetworkData::getInstance()->isGameServer() )
+  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer()))
   {
     this->damageTicker -= time;
@@ -299 +299 @@
       if ( victim )
       {
-        PRINTF(0)("FIRE: hit %s\n", victim->getClassName());
+        PRINTF(0)("FIRE: hit %s\n", victim->getClassCName());
         victim->hit( 20, this );
       }