Changeset 9869 in orxonox.OLD for trunk/src/lib/network/proxy/network_settings.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/network/proxy/network_settings.cc (modified) (3 diffs)

trunk/src/lib/network/proxy/network_settings.cc

@@ -21 +21 @@
 #include "shared_network_data.h"
 
+#include "loading/load_param.h"
 #include "loading/resource_manager.h"
-#include "loading/load_param.h"
-
 #include "debug.h"
 
 
+ObjectListDefinition(NetworkSettings);
 
 NetworkSettings* NetworkSettings::singletonRef = NULL;
@@ -36 +36 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_SETTINGS, "NetworkSettings");
+  this->registerObject(this, NetworkSettings::_objectList);
 
   // suggest a good standard max players value
@@ -64 +64 @@
 void NetworkSettings::loadData()
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "configs/network_settings.conf";