Changeset 10114 in orxonox.OLD for trunk/src/util

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/util

Files:

• game_rules.cc (modified) (1 diff)
• kill_target.cc (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (7 diffs)
• signal_handler.cc (modified) (2 diffs)
• singleplayer_shootemup.cc (modified) (1 diff)

trunk/src/util/game_rules.cc

@@ -65 +65 @@
     PRINTF(4)("Adding Mission Goal:%s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
-    if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)
+    if (created != NULL /*&& created->isA(GameRules::staticClassID())*/)
     {
       MissionGoal* mg = dynamic_cast<MissionGoal*>(created);

trunk/src/util/kill_target.cc

@@ -22 +22 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
+
+ObjectListDefinition(KillTarget);
 CREATE_FACTORY(KillTarget);
 

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -46 +46 @@
 #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 +146 @@
       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 +295 @@
 
   if ( team == 0 || team == 1 )
-    return ObjectListBase::retrieveIdentity("TurbineHover");
+    return ObjectListBase::retrieveIdentity("FPSPlayer");
 
   assert( false );
@@ -315 +303 @@
 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 +308 @@
     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 +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;
@@ -499 +487 @@
 
   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 );

trunk/src/util/signal_handler.cc

@@ -42 +42 @@
   catchSignal( SIGSEGV );
   catchSignal( SIGABRT );
+  catchSignal( SIGILL );
 }
 
@@ -94 +95 @@
     case SIGABRT:
       sigName = "SIGABRT";
+      break;
+    case SIGILL:
+      sigName = "SIGILL";
       break;
   }

trunk/src/util/singleplayer_shootemup.cc

@@ -25 +25 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
+
+ObjectListDefinition(SingleplayerShootemup);
 CREATE_FACTORY(SingleplayerShootemup);