Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9008 in orxonox.OLD for trunk/src/util/game_rules.cc


Ignore:
Timestamp:
Jul 2, 2006, 2:22:19 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/game_rules.cc

    r8802 r9008  
    9090  if ( !SharedNetworkData::getInstance()->isGameServer() )
    9191    return;
     92
    9293  PRINTF(0)("Received Event: Kill\n");
    93   this->killList.push_back(kill);
     94
     95  this->killList.push_back( kill );
    9496}
    9597
Note: See TracChangeset for help on using the changeset viewer.