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

Timestamp:

Jul 14, 2006, 3:01:37 PM (18 years ago)

Author:

patrick

Message:

redirection flag added, proxy settings as a way to get/save the server settings

Location:

branches/proxy/src/story_entities

Files:

• game_world_data.h (modified) (1 diff)
• multi_player_world_data.cc (modified) (2 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"
@@ -280 +281 @@
   GameWorldData::loadScene(root);
 
+  LoadParamXML(root, "ProxySettings", ProxySettings::getInstance(), ProxySettings, loadProxySettings);
+
   // create server playable
   if ( NetworkManager::getInstance()->isMasterServer() )