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

Timestamp:

Jul 27, 2006, 10:44:28 AM (18 years ago)

Author:

bensch

Message:

merged the proxy back

Location:

trunk/src/util

Files:

• Makefile.am (modified) (2 diffs)
• game_rules.cc (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (5 diffs)
• network_stats_widget.cc (deleted)
• network_stats_widget.h (deleted)

trunk/src/util/Makefile.am

@@ -26 +26 @@
                         animation/animation_player.cc \
                         \
-                        track/pilot_node.cc \
-                        \
-                        network_stats_widget.cc
+                        track/pilot_node.cc
 
 #                       track/track_manager.cc \
@@ -54 +52 @@
                         animation/t_animation.h \
                         \
-                        track/pilot_node.h \
-                        \
-                        network_stats_widget.h
-
+                        track/pilot_node.h
 
 #                       track/track_manager.h \

trunk/src/util/game_rules.cc

@@ -87 +87 @@
 void GameRules::registerKill(const Kill& kill)
 {
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -152 +152 @@
       box->setAbsCoor2D( 300, 100 );
 
-      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( 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);
+      }
+
 
       if ( bShowTeamChange )
@@ -204 +214 @@
   assignPlayable();
 
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 
@@ -268 +278 @@
 void MultiplayerTeamDeathmatch::checkGameRules()
 {
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 
@@ -296 +306 @@
 
   if ( team == 0 || team == 1 )
-    return CL_FPS_PLAYER;
+    return CL_TURBINE_HOVER;
 
   assert( false );
@@ -303 +313 @@
 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, ClassID classId )
 {
+  if (classId == CL_TURBINE_HOVER)
+   return "models/ships/hoverglider_mainbody.obj";
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";