Changeset 1098 for code/branches/network2/src/network/GameStateClient.h

Timestamp:

Apr 17, 2008, 2:35:51 PM (16 years ago)

Author:

rgrieder

Message:

merged network branch into new network2 branch (from trunk)

File:

• code/branches/network2/src/network/GameStateClient.h (modified) (3 diffs)

code/branches/network2/src/network/GameStateClient.h

@@ -41 +41 @@
 #define _GameStateClient_H__
 
+#include <queue>
+
 #include "NetworkPrereqs.h"
 #include "core/CorePrereqs.h"
-#include "GameStateManager.h"
+#include "PacketTypes.h"
 
 namespace network
@@ -52 +54 @@
     GameStateClient();
     ~GameStateClient();
+    //#### ADDED FOR TESTING PURPOSE ####
+    GameState* testDecompress( GameStateCompressed* gc );
+    GameState* testUndiff( GameState* g_old, GameState* g_diffed );
+    //#### END TESTING PURPOSE ####
     bool pushGameState(GameStateCompressed *compstate);
   private:
@@ -61 +67 @@
     void removeObject(orxonox::Iterator<Synchronisable> &it);
 
-    GameState *reference;
+    GameState     *reference;
+    std::queue<GameState *> gameStateList;
   };