Changeset 9911 in orxonox.OLD

Timestamp:

Nov 1, 2006, 2:22:00 PM (17 years ago)

Author:

rennerc

Message:

enabled playing for server

Location:

branches/network/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)
• world_entities/creatures/fps_player.cc (modified) (1 diff)

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -148 +148 @@
       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 +297 @@
 
   if ( team == 0 || team == 1 )
-    return ObjectListBase::retrieveIdentity("TurbineHover");
+    return ObjectListBase::retrieveIdentity("FPSPlayer");
 
   assert( false );

branches/network/src/world_entities/creatures/fps_player.cc

@@ -384 +384 @@
 
   // physical falling of the player
-  if( !this->isOnGround())
+  if( /*FIXME for testing*/ false && !this->isOnGround())
   {
     this->fallVelocity += 300.0f * time;