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

Timestamp:

Nov 9, 2006, 7:41:00 PM (18 years ago)

Author:

rennerc

Message:

compiles again

File:

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

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -46 +46 @@
 #include "spawning_point.h"
 
-
-
-
+#include "creatures/fps_player.h"
 
 ObjectListDefinition(MultiplayerTeamDeathmatch);
@@ -305 +303 @@
 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
 {
-  if (classId == CL_TURBINE_HOVER)
-  {
-    assert(false);
-    return "models/ships/hoverglider_mainbody.obj";
-  }
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";
@@ -335 +328 @@
 float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
 {
-  if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
+  if ( classId == FPSPlayer::staticClassID() )
   {
     return 10.0f;