Changeset 8459 in orxonox.OLD

Timestamp:

Jun 15, 2006, 2:08:04 PM (18 years ago)

Author:

rennerc

Message:

red team uses turbinehover now

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -100 +100 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
   
-  playable.loadModel( playableModel );
+  if (  playableModel != "" )
+    playable.loadModel( playableModel );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -305 +305 @@
     return CL_SPECTATOR;
   
-  if ( team == 0 || team == 1 )
+  if ( team == 0 )
     return CL_SPACE_SHIP;
+  
+  if ( team == 1)
+    return CL_TURBINE_HOVER;
   
   assert( false );
@@ -315 +318 @@
   if ( team == 0 )
     return "models/ships/reap_#.obj";
-  else if ( team == 1 )
-    return "models/ships/fighter.obj";
+ // else if ( team == 1 )
+ //   return "models/ships/fighter.obj";
   else
     return "";