Changeset 7788 for code/branches/presentation2/src/libraries/network/GamestateHandler.h

Timestamp:

Dec 21, 2010, 6:09:09 PM (13 years ago)

Author:

scheusso

Message:

merged network5 into presentation2 branch (untested)

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/libraries/network/GamestateHandler.h (modified) (3 diffs)

code/branches/presentation2/src/libraries/network/GamestateHandler.h

@@ -32 +32 @@
 #include "NetworkPrereqs.h"
 
+#include <cassert>
+
 namespace orxonox {
 
@@ -37 +39 @@
     @author Oliver Scheuss
 */
-class _NetworkExport GamestateHandler{
+class _NetworkExport GamestateHandler
+{
   private:
-    virtual bool add(packet::Gamestate *gs, unsigned int clientID)=0;
-    virtual bool ack(unsigned int gamestateID, unsigned int clientID)=0;
-
-    static GamestateHandler *instance_;
 
 
@@ -50 +49 @@
 
   public:
-    static bool addGamestate(packet::Gamestate *gs, unsigned int clientID){ return instance_->add(gs, clientID); }
-    static bool ackGamestate(unsigned int gamestateID, unsigned int clientID){ return instance_->ack(gamestateID, clientID); }
+    virtual bool      addGamestate(packet::Gamestate* gs, unsigned int clientID) = 0;
+    virtual bool      ackGamestate(unsigned int gamestateID, unsigned int clientID) = 0;
+    virtual uint32_t  getLastProcessedGamestateID( unsigned int clientID )=0;
+    virtual uint32_t  getCurrentGamestateID()=0;
 };