Changeset 7780 for code/branches/network5/src/libraries/network/GamestateManager.cc

Timestamp:

Dec 19, 2010, 9:41:57 PM (14 years ago)

Author:

scheusso

Message:

some fixes
reactivating acking and gamestate diffing

File:

• code/branches/network5/src/libraries/network/GamestateManager.cc (modified) (5 diffs)

code/branches/network5/src/libraries/network/GamestateManager.cc

@@ -110 +110 @@
       bool b = processGamestate(it->second);
       assert(b);
+      sendAck( it->second->getID(), it->second->getPeerID() );
       delete it->second;
     }
@@ -117 +118 @@
     NetworkCallbackManager::callCallbacks();
     return true;
+  }
+  
+  bool GamestateManager::sendAck(unsigned int gamestateID, uint32_t peerID)
+  {
+    packet::Acknowledgement *ack = new packet::Acknowledgement(gamestateID, peerID);
+    if( !this->sendPacket(ack))
+    {
+      COUT(3) << "could not ack gamestate: " << gamestateID << std::endl;
+      return false;
+    }
+    else
+    {
+      COUT(5) << "acked a gamestate: " << gamestateID << std::endl;
+      return true;
+    }
   }
 
@@ -173 +189 @@
       peerGamestates.push_back(0);  // insert an empty gamestate* to change
       finishGamestate( peerID, peerGamestates.back(), baseGamestate, currentGamestate_ );
+      if( peerGamestates.back()==0 )
+        // nothing to send to remove pointer from vector
+        peerGamestates.pop_back();
       //FunctorMember<GamestateManager>* functor =
 //       ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate, this) );
@@ -236 +255 @@
 
 
-  bool GamestateManager::ackGamestate(unsigned int gamestateID, unsigned int peerID) {
+  bool GamestateManager::ackGamestate(unsigned int gamestateID, unsigned int peerID)
+  {
 //     ClientInformation *temp = ClientInformation::findClient(peerID);
 //     assert(temp);
@@ -255 +275 @@
     }
 
-    assert(curid==GAMESTATEID_INITIAL || curid<gamestateID);
+    assert(curid==GAMESTATEID_INITIAL || curid<=gamestateID);
     COUT(5) << "acking gamestate " << gamestateID << " for peerID: " << peerID << " curid: " << curid << std::endl;
     std::map<uint32_t, packet::Gamestate*>::iterator it2;