Index: trunk/src/util/multiplayer_team_deathmatch.cc
===================================================================
--- trunk/src/util/multiplayer_team_deathmatch.cc	(revision 9869)
+++ trunk/src/util/multiplayer_team_deathmatch.cc	(revision 10114)
@@ -46,9 +46,7 @@
 #include "spawning_point.h"
 
-
-
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
+#include "creatures/fps_player.h"
+
+ObjectListDefinition(MultiplayerTeamDeathmatch);
 CREATE_FACTORY(MultiplayerTeamDeathmatch);
 /**
@@ -148,29 +146,19 @@
       box->setAbsCoor2D( 300, 100 );
 
-      if( SharedNetworkData::getInstance()->isClient() ||  SharedNetworkData::getInstance()->isProxyServerActive())
-      {
-        OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
-        box->pack( buttonSpectator );
-        buttonSpectator->released.connect(this, &MultiplayerTeamDeathmatch::onButtonSpectator);
-
-        OrxGui::GLGuiPushButton * buttonRandom = new OrxGui::GLGuiPushButton("Random");
-        box->pack( buttonRandom );
-        buttonRandom->released.connect(this, &MultiplayerTeamDeathmatch::onButtonRandom);
-
-        OrxGui::GLGuiPushButton * buttonTeam0 = new OrxGui::GLGuiPushButton("Blue Team");
-        box->pack( buttonTeam0 );
-        buttonTeam0->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam0);
-
-        OrxGui::GLGuiPushButton * buttonTeam1 = new OrxGui::GLGuiPushButton("Red Team");
-        box->pack( buttonTeam1 );
-        buttonTeam1->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam1);
-      }
-      else
-      {
-        OrxGui::GLGuiText* text = new OrxGui::GLGuiText();
-        text->setText("Server Mode: not able to play at this node");
-        box->pack( text);
-      }
-
+      OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
+      box->pack( buttonSpectator );
+      buttonSpectator->released.connect(this, &MultiplayerTeamDeathmatch::onButtonSpectator);
+
+      OrxGui::GLGuiPushButton * buttonRandom = new OrxGui::GLGuiPushButton("Random");
+      box->pack( buttonRandom );
+      buttonRandom->released.connect(this, &MultiplayerTeamDeathmatch::onButtonRandom);
+
+      OrxGui::GLGuiPushButton * buttonTeam0 = new OrxGui::GLGuiPushButton("Blue Team");
+      box->pack( buttonTeam0 );
+      buttonTeam0->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam0);
+
+      OrxGui::GLGuiPushButton * buttonTeam1 = new OrxGui::GLGuiPushButton("Red Team");
+      box->pack( buttonTeam1 );
+      buttonTeam1->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam1);
 
       if ( bShowTeamChange )
@@ -307,5 +295,5 @@
 
   if ( team == 0 || team == 1 )
-    return ObjectListBase::retrieveIdentity("TurbineHover");
+    return ObjectListBase::retrieveIdentity("FPSPlayer");
 
   assert( false );
@@ -315,6 +303,4 @@
 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
 {
-  if (classId == CL_TURBINE_HOVER)
-    return "models/ships/hoverglider_mainbody.obj";
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";
@@ -322,15 +308,17 @@
     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";
   }
 
@@ -340,5 +328,5 @@
 float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
 {
-  if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
+  if ( classId == FPSPlayer::staticClassID() )
   {
     return 10.0f;
@@ -499,8 +487,10 @@
 
   assert( bo != NULL );
-  assert( bo->isA( CL_PLAYABLE ) );
+  assert( bo->isA( Playable::staticClassID() ) );
 
   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 );
