Changeset 9388 in orxonox.OLD

Timestamp:

Jul 21, 2006, 2:40:01 PM (18 years ago)

Author:

patrick

Message:

working on loading proxy config file from a seperate file

Location:

branches/proxy/src

Files:

• lib/network/proxy/proxy_settings.cc (modified) (4 diffs)
• lib/network/proxy/proxy_settings.h (modified) (2 diffs)
• lib/network/shared_network_data.cc (modified) (1 diff)
• lib/network/shared_network_data.h (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (1 diff)

branches/proxy/src/lib/network/proxy/proxy_settings.cc

@@ -19 +19 @@
 #include "netdefs.h"
 
+#include "loading/resource_manager.h"
 #include "loading/load_param.h"
 
@@ -34 +35 @@
   /* set the class id for the base object */
   this->setClassID(CL_PROXY_SETTINGS, "ProxySettings");
+
   // suggest a good standard max players value
   this->maxPlayer = 10;
+
+  PRINTF(0)("\n\n\n\n");
+
+  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  fileName += "configs/proxy_settings.conf";
+
+
+  PRINTF(0)("trying file %s\n", fileName.c_str());
+  TiXmlDocument doc(fileName);
+  if( !doc.LoadFile(fileName))
+  {
+    PRINTF(0)("Loading file %s failed for Proxy Settings.\n", fileName.c_str());
+    return;
+  }
+  const TiXmlElement* root = doc.RootElement();
+
+  if( strcmp( root->Value(), "ProxySettings"))
+  {
+    // report an error
+    PRINTF(0)("Specified XML File is not an orxonox proxy settings file (ProxySettings element missing)\n");
+    return;
+  }
+  LoadParamXML(root, "ProxySettings", this, ProxySettings, loadProxySettings);
 }
 
@@ -63 +88 @@
 void ProxySettings::loadProxySettings(const TiXmlElement* root)
 {
-
+  PRINTF(0)("lalalallalala\n\n");
   LoadParam(root, "max-player", this, ProxySettings, setMaxPlayer);
 
@@ -69 +94 @@
   {
     element->ToText();
-    // PER-PARTICLE-ATTRIBUTES:
     LoadParam(root, "proxy-addr", this, ProxySettings, setProxyAddr);
   }

branches/proxy/src/lib/network/proxy/proxy_settings.h

@@ -9 +9 @@
 #include "base_object.h"
 #include "netdefs.h"
+
+#include "debug.h"
 
 #include <vector>
@@ -30 +32 @@
 
     /** @param number: sets the max number of players */
-    inline void setMaxPlayer(int number) { this->maxPlayer = number; }
+    inline void setMaxPlayer(int number) { this->maxPlayer = number; PRINTF(0)("maxplayers set to %i\n\n\n", number);}
     /** @returns teh max number of players */
     int getMaxPlayer() { return this->maxPlayer; }

branches/proxy/src/lib/network/shared_network_data.cc

@@ -38 +38 @@
 
 //   if( State::isOnline())
-//     this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
+  this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
 //   else
-  this->newUniqueID = NET_MAX_CONNECTIONS + 2;
+//  this->newUniqueID = NET_MAX_CONNECTIONS + 2;
   this->nodeType = NET_CLIENT;
 }

branches/proxy/src/lib/network/shared_network_data.h

@@ -40 +40 @@
 
     /** @returns the maximum number of players for this server */
-    inline int getMaxPlayer() { return /*ProxySettings::getInstance()->getMaxPlayer()*/NET_MAX_CONNECTIONS; }
+    inline int getMaxPlayer() { return ProxySettings::getInstance()->getMaxPlayer(); }
 
     /** @returns the hostID of the node */

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -281 +281 @@
   GameWorldData::loadScene(root);
 
-  LoadParamXML(root, "ProxySettings", ProxySettings::getInstance(), ProxySettings, loadProxySettings);
+//   LoadParamXML(root, "ProxySettings", ProxySettings::getInstance(), ProxySettings, loadProxySettings);
 
   // create server playable