Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/creatures/fps_player.cc

    r9235 r9406  
    276276//     if( target != NULL)
    277277//     {
    278 //       PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
     278//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
    279279//     }
    280280//     else
     
    287287  //dealing damage
    288288
    289   if ( State::isOnline() && SharedNetworkData::getInstance()->isGameServer() )
     289  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer()))
    290290  {
    291291    this->damageTicker -= time;
     
    299299      if ( victim )
    300300      {
    301         PRINTF(0)("FIRE: hit %s\n", victim->getClassName());
     301        PRINTF(0)("FIRE: hit %s\n", victim->getClassCName());
    302302        victim->hit( 20, this );
    303303      }
Note: See TracChangeset for help on using the changeset viewer.