Changeset 1769 for code/trunk/src/network/GamestateClient.cc

Timestamp:

Sep 11, 2008, 5:06:24 PM (16 years ago)

Author:

scheusso

Message:

sync frequencies do work now

File:

• code/trunk/src/network/GamestateClient.cc (modified) (5 diffs)

code/trunk/src/network/GamestateClient.cc

@@ -35 +35 @@
 #include "core/Iterator.h"
 #include "Synchronisable.h"
+#include "packet/Acknowledgement.h"
 
 
@@ -70 +71 @@
   }
 
-  int GamestateClient::processGamestates(){
+  bool GamestateClient::processGamestates(){
     if(tempGamestate_==NULL)
-      return 0;
+      return false;
     int id = GAMESTATEID_INITIAL;
     bool b = saveShipCache();
     packet::Gamestate *processed = processGamestate(tempGamestate_);
-    if(!processed)
-      return GAMESTATEID_INITIAL;
+    if(!processed){
+      if(b)
+        loadShipCache();
+      return false;
+    }
 //    assert(processed);
     //successfully loaded data from gamestate. now save gamestate for diff and delete the old gs
-    tempGamestate_=0;
+    tempGamestate_=NULL;
     gamestateMap_[processed->getID()]=processed;
     last_diff_ = processed->getID();
@@ -86 +90 @@
       loadShipCache();
     id = processed->getID();
-    cleanup();
-    return id;
+    sendAck(id);
+    return true;
   }
 
@@ -129 +133 @@
     COUT(4) << std::endl;
 
+  }
+  
+  bool GamestateClient::sendAck(unsigned int gamestateID){
+    packet::Acknowledgement *ack = new packet::Acknowledgement(gamestateID, 0);
+    if(!ack->send()){
+      COUT(3) << "could not ack gamestate: " << gamestateID << std::endl;
+      return false;
+    }
+    else{
+      COUT(3) << "acked a gamestate: " << gamestateID << std::endl;
+      return true;
+    }
   }
 
@@ -169 +185 @@
     if(gs->isDiffed()){
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
-      if(!base)
+      if(!base){
+        delete gs;
         return 0;
+      }
 //      assert(base); //TODO: fix this
       packet::Gamestate *undiffed = gs->undiff(base);