Changeset 7737 for code/branches/masterserver/src/libraries/network/WANDiscovery.h

Timestamp:

Dec 8, 2010, 4:08:22 PM (13 years ago)

Author:

smerkli

Message:

pre-merge

File:

• code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) (4 diffs)

code/branches/masterserver/src/libraries/network/WANDiscovery.h

@@ -32 +32 @@
 #include "NetworkPrereqs.h"
 #include "packet/ServerInformation.h"
+#include "core/ConfigFileManager.h"
 #include "util/Singleton.h"
+#include "core/OrxonoxClass.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "MasterServerComm.h"
 #include "MasterServerProtocol.h"
@@ -46 +50 @@
   class _NetworkExport WANDiscovery
 // tolua_end
-    : public Singleton<WANDiscovery>
+    : public Singleton<WANDiscovery>, public OrxonoxClass
   { // tolua_export
     friend class Singleton<WANDiscovery>;
@@ -84 +88 @@
       /** game server list */
       std::vector<packet::ServerInformation> servers_;
+
+      /** Function used for the configuration file parameter update */
+      void setConfigValues();
       
     private:
@@ -92 +99 @@
       MasterServerComm msc;
 
+      /** master server address */
+      std::string msaddr;
+
   }; // tolua_export