Changeset 2176 for code/branches/objecthierarchy2/src

Timestamp:

Nov 11, 2008, 12:04:27 AM (16 years ago)

Author:

scheusso

Message:

(re)implemented NACKing for gamestates

Location:

code/branches/objecthierarchy2/src/network

Files:

• GamestateClient.cc (modified) (1 diff)
• GamestateManager.cc (modified) (2 diffs)
• packet/Acknowledgement.h (modified) (1 diff)

code/branches/objecthierarchy2/src/network/GamestateClient.cc

@@ -77 +77 @@
     packet::Gamestate *processed = processGamestate(tempGamestate_);
 //    assert(processed);
-    if (!processed)
-        return false;
+    if (!processed){
+      sendAck(0);
+      return false;
+    }
     //successfully loaded data from gamestate. now save gamestate for diff and delete the old gs
     tempGamestate_=NULL;

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

@@ -50 +50 @@
 #include "ClientInformation.h"
 #include "Synchronisable.h"
+#include "packet/Acknowledgement.h"
 
 namespace orxonox
@@ -168 +169 @@
     unsigned int curid = temp->getGamestateID();
 
-    if(gamestateID == 0){
+    if(gamestateID == ACKID_NACK){
       temp->setGamestateID(GAMESTATEID_INITIAL);
       return true;

code/branches/objecthierarchy2/src/network/packet/Acknowledgement.h

@@ -32 +32 @@
 #include "Packet.h"
 
+const unsigned int ACKID_NACK = 0;
 
 namespace orxonox {