Changeset 7768 for code/branches/presentation/src/libraries

Timestamp:

Dec 15, 2010, 6:53:02 PM (14 years ago)

Author:

smerkli

Message:

fixes

Location:

code/branches/presentation/src/libraries/network

Files:

• CMakeLists.txt (modified) (1 diff)
• MasterServerComm.cc (modified) (1 diff)
• MasterServerComm.h (modified) (4 diffs)

code/branches/presentation/src/libraries/network/CMakeLists.txt

@@ -80 +80 @@
     LANDiscovery.h
     WANDiscovery.h
+    MasterServerComm.h
   PCH_FILE
     NetworkPrecompiledHeaders.h

code/branches/presentation/src/libraries/network/MasterServerComm.cc

@@ -28 +28 @@
 
 #include "MasterServerComm.h"
+#include "util/ScopedSingletonManager.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
 {
   ManageScopedSingleton(MasterServerComm, ScopeID::Root, true);
- 
+
   MasterServerComm::MasterServerComm()
   { /* nothing anymore, everything's been outsourced to 
      * the initialize method to facilitate debugging
      */
+    /* register object in orxonox */
+    RegisterObject(MasterServerComm);
   } 
 

code/branches/presentation/src/libraries/network/MasterServerComm.h

@@ -35 +35 @@
 #include <cstring>
 #include <enet/enet.h>
+#include "util/Singleton.h"
+#include "core/OrxonoxClass.h"
+#include "core/CoreIncludes.h"
+#include "NetworkPrereqs.h"
 
 // tolua_begin
@@ -40 +44 @@
 {
   class _NetworkExport MasterServerComm 
+  // tolua_end
     : public Singleton<MasterServerComm>, public OrxonoxClass
   { // tolua_export
@@ -92 +97 @@
       int pollForReply( int (*callback)( char*, ENetEvent* ), int delayms );
 
-      /** \return an instance of WANDiscovery
+      /** \return an instance of MasterServerComm 
        * 
-       * Create and return an instance of WANDiscovery.
+       * Create and return an instance of  MasterServerComm.
        */
       static MasterServerComm& getInstance() { return Singleton<MasterServerComm>::getInstance(); } // tolua_export
@@ -112 +117 @@
 
       /** Singleton pointer */
-      static MasterServerComm* singletonPtr_s;
+      static MasterServerComm *singletonPtr_s;
   }; // tolua_export