Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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/lib/network/network_game_manager.cc

    r8708 r9008  
    3939
    4040#include "network_game_manager.h"
     41
     42#include "multiplayer_team_deathmatch.h"
    4143
    4244
     
    118120  stats->setPlayableUniqueId( playable.getUniqueID() );
    119121  stats->setModelFileName( playableModel );
     122 
     123  if ( rules.isA( CL_MULTIPLAYER_TEAM_DEATHMATCH ) )
     124    dynamic_cast<MultiplayerTeamDeathmatch*>(&rules)->respawnPlayable( &playable, team, 0.0f );
    120125 
    121126  return true;
Note: See TracChangeset for help on using the changeset viewer.