Changeset 9347 in orxonox.OLD for branches/proxy/src/story_entities

Timestamp:

Jul 20, 2006, 11:43:27 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

Location:

branches/proxy/src/story_entities

Files:

• game_world_data.h (modified) (1 diff)
• multi_player_world_data.cc (modified) (6 diffs)

branches/proxy/src/story_entities/game_world_data.h

@@ -42 +42 @@
     void loadGameRule(const TiXmlElement* root);
 
+
   protected:
     virtual ErrorMessage loadGUI(const TiXmlElement* root);

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -47 +47 @@
 #include "player_stats.h"
 
+#include "proxy/proxy_settings.h"
 
 #include "glmenu_imagescreen.h"
@@ -110 +111 @@
 {
   const TiXmlElement* element = NULL;
-  
-  if( NetworkManager::getInstance()->isGameServer() )
+
+  if( NetworkManager::getInstance()->isMasterServer() )
   {
     /* load the spawning points */
@@ -147 +148 @@
     element = element->FirstChildElement();
 
-    if( NetworkManager::getInstance()->isGameServer() )
+    if( NetworkManager::getInstance()->isMasterServer() )
     {
       while( element != NULL)
@@ -205 +206 @@
 
 
-    if( NetworkManager::getInstance()->isGameServer())
+    if( NetworkManager::getInstance()->isMasterServer())
     {
       this->localPlayer = new Player();
@@ -280 +281 @@
   GameWorldData::loadScene(root);
 
+  LoadParamXML(root, "ProxySettings", ProxySettings::getInstance(), ProxySettings, loadProxySettings);
+
   // create server playable
-  if ( NetworkManager::getInstance()->isGameServer() )
+  if ( NetworkManager::getInstance()->isMasterServer() )
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );
@@ -296 +299 @@
 ErrorMessage MultiPlayerWorldData::unloadScene()
 {
+  // delete the proxy settings
+  delete ProxySettings::getInstance();
+
   /* call underlying function */
   return GameWorldData::unloadScene();