Changeset 6230 in orxonox.OLD

Timestamp:

Dec 21, 2005, 2:59:06 PM (18 years ago)

Author:

patrick

Message:

network bla

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (1 diff)
• network_game_manager.h (modified) (3 diffs)
• network_stream.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -30 +30 @@
 /* using namespace std is default, this needs to be here */
 using namespace std;
+
+NetworkManager* NetworkManager::singletonRef = NULL;
 
 /*!

branches/network/src/lib/network/network_game_manager.h

@@ -61 +61 @@
 {
   public:
-    NetworkGameManager();
     ~NetworkGameManager();
+
+    static NetworkGameManager* NetworkGameManager::getInstance() { if (!NetworkGameManager::singletonRef) NetworkGameManager::singletonRef = new NetworkGameManager(); return NetworkGameManager::singletonRef; }
 
     virtual void writeBytes(const byte* data, int length, int sender);
@@ -78 +79 @@
 
   private:
+    NetworkGameManager();
+
     void requestCreateEntity(ClassID classID);
     void executeCreateEntity(ClassID classID, int uniqueID = 0, int owner = 0);
@@ -109 +112 @@
     std::vector<clientBuffer>     outBuffer;
     clientBuffer                  allOutBuffer;
+    static NetworkGameManager*    singletonRef;
 
     int                           newUniqueID;

branches/network/src/lib/network/network_stream.cc

@@ -78 +78 @@
   this->handshakes.push_back( NULL );
   this->bActive = true;
-  this->networkGameManager = new NetworkGameManager();
+  this->networkGameManager = NetworkGameManager::getInstance();
   // setUniqueID( maxCon+2 ) because we need one id for every handshake
   // and one for handshake to reject client maxCon+1
@@ -181 +181 @@
             myHostId = NetworkManager::getInstance()->getHostID();
 
-            this->networkGameManager = new NetworkGameManager();
+            this->networkGameManager = NetworkGameManager::getInstance();
             this->networkGameManager->setUniqueID( handshakes[i]->getNetworkGameManagerId() );
             this->connectSynchronizeable( *(this->networkGameManager) );