Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8459 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Jun 15, 2006, 2:08:04 PM (18 years ago)
Author:
rennerc
Message:

red team uses turbinehover now

Location:
branches/network/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/network/network_game_manager.cc

    r8306 r8459  
    100100  Playable & playable = *(dynamic_cast<Playable*>(bo));
    101101 
    102   playable.loadModel( playableModel );
     102  if (  playableModel != "" )
     103    playable.loadModel( playableModel );
    103104  playable.setOwner( userId );
    104105  playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
  • branches/network/src/util/multiplayer_team_deathmatch.cc

    r8331 r8459  
    305305    return CL_SPECTATOR;
    306306 
    307   if ( team == 0 || team == 1 )
     307  if ( team == 0 )
    308308    return CL_SPACE_SHIP;
     309 
     310  if ( team == 1)
     311    return CL_TURBINE_HOVER;
    309312 
    310313  assert( false );
     
    315318  if ( team == 0 )
    316319    return "models/ships/reap_#.obj";
    317   else if ( team == 1 )
    318     return "models/ships/fighter.obj";
     320 // else if ( team == 1 )
     321 //   return "models/ships/fighter.obj";
    319322  else
    320323    return "";
Note: See TracChangeset for help on using the changeset viewer.