Changeset 9912 in orxonox.OLD for branches/network/src/util

Timestamp:

Nov 2, 2006, 4:34:52 PM (19 years ago)

Author:

rennerc

Message:

still not working

File:

• branches/network/src/util/multiplayer_team_deathmatch.cc (modified) (3 diffs)

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -306 +306 @@
 {
   if (classId == CL_TURBINE_HOVER)
+  {
+    assert(false);
     return "models/ships/hoverglider_mainbody.obj";
+  }
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";
@@ -312 +315 @@
     return "models/creatures/male.md2";
   else
+  {
     return "";
+  }
 }
 
 std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
 {
-  if ( classId == CL_FPS_PLAYER )
+  if ( team == 0 || team == 1 )
   {
     if ( team == 0 )
-      return "maps/doom_guy.png";
+      return "doom_guy.png";
     else
-      return "maps/male_fiend.pcx";
+      return "male_fiend.pcx";
   }
 
@@ -493 +498 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
 
+  PRINTF(0)("%s %s %f\n", playableModel.c_str(), playableTexture.c_str(), playableScale );
+  
   playable.loadMD2Texture( playableTexture );
   playable.loadModel( playableModel, playableScale );