Changeset 9470 in orxonox.OLD for branches/proxy/src/util

Timestamp:

Jul 25, 2006, 10:23:17 PM (19 years ago)

Author:

patrick

Message:

heavy permissions fight: no node was ever thought to be client and server at the same time, proxy server are hybrid nodes so there is need for a big framework extension.

• made the obb creation saver
• prevented segfaults in the aabb tree creation, this was very dangerous code
• inserted handshake hack to make the handshake work.

No I will have to get the handshake right so the node works correctly

Location:

branches/proxy/src/util

Files:

• game_rules.cc (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (3 diffs)

branches/proxy/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;
 

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -152 +152 @@
       box->setAbsCoor2D( 300, 100 );
 
-      if( SharedNetworkData::getInstance()->isClient())
+      if( SharedNetworkData::getInstance()->isClient() ||  SharedNetworkData::getInstance()->isProxyServerActive())
       {
         OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
@@ -214 +214 @@
   assignPlayable();
 
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 
@@ -278 +278 @@
 void MultiplayerTeamDeathmatch::checkGameRules()
 {
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;