Changeset 2371 for code/branches/presentation/src/network/GamestateManager.cc

Timestamp:

Dec 10, 2008, 12:50:05 PM (15 years ago)

Author:

scheusso

Message:

merged network branch to presentation branch

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/network/GamestateManager.cc (modified) (3 diffs)

code/branches/presentation/src/network/GamestateManager.cc

@@ -49 +49 @@
 #include "core/BaseObject.h"
 #include "ClientInformation.h"
-#include "Synchronisable.h"
+#include "synchronisable/Synchronisable.h"
+#include "synchronisable/NetworkCallbackManager.h"
 
 namespace orxonox
@@ -86 +87 @@
     // now clear the queue
     gamestateQueue.clear();
+    //and call all queued callbacks
+    NetworkCallbackManager::callCallbacks();
     return true;
   }
@@ -134 +137 @@
     if(!reference)
       return 0;
-    gs = reference->doSelection(clientID);
-//     gs = new packet::Gamestate(*reference);
+    gs = reference->doSelection(clientID, 10000);
 //     gs = new packet::Gamestate(*reference);
     // save the (undiffed) gamestate in the clients gamestate map