Changeset 9141 in orxonox.OLD for branches/presentation/src/util

Timestamp:

Jul 4, 2006, 3:18:25 PM (18 years ago)

Author:

rennerc

Message:

new model for team 1

File:

• branches/presentation/src/util/multiplayer_team_deathmatch.cc (modified) (2 diffs)

branches/presentation/src/util/multiplayer_team_deathmatch.cc

@@ -305 +305 @@
     return "models/creatures/doom_guy.md2";
   else if ( team == 1 )
-    return "models/creatures/doom_guy.md2";
+    return "models/creatures/male.md2";
   else
     return "";
+}
+
+std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
+{
+  if ( classId == CL_FPS_PLAYER )
+  {
+    if ( team == 0 )
+      return "maps/doom_guy.png";
+    else
+      return "maps/male_fiend.pcx";
+  }
+  
+  return "";
+}
+
+float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, ClassID classId )
+{
+  if ( classId == CL_FPS_PLAYER )
+  {
+    return 10.0f;
+  }
+  
+  return 1.0f;
 }
 
@@ -781 +804 @@
 }
 
-std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
-{
-  if ( classId == CL_FPS_PLAYER )
-  {
-    return "maps/doom_guy.png";
-  }
-  
-  return "";
-}
-
-float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, ClassID classId )
-{
-  if ( classId == CL_FPS_PLAYER )
-  {
-    return 10.0f;
-  }
-  
-  return 1.0f;
-}
+