Changeset 7882 for code/branches/network6/src/libraries/network/GamestateManager.cc

Timestamp:

Feb 14, 2011, 9:00:48 AM (13 years ago)

Author:

scheusso

Message:

improving gamestate processing and generation

File:

• code/branches/network6/src/libraries/network/GamestateManager.cc (modified) (4 diffs)

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

@@ -57 +57 @@
 
 namespace orxonox
-{
+{ 
   GamestateManager::GamestateManager() :
   currentGamestate_(0), id_(0)
@@ -110 +110 @@
       bool b = processGamestate(it->second);
       assert(b);
-//       sendAck( it->second->getID(), it->second->getPeerID() );
+      sendAck( it->second->getID(), it->second->getPeerID() );
       delete it->second;
     }
@@ -140 +140 @@
     if ( currentGamestate_ != 0 )
       delete currentGamestate_;
-    currentGamestate_ = new packet::Gamestate();
     uint8_t gsMode;
     if( GameMode::isMaster() )
@@ -153 +152 @@
       assert(peerMap_.size()!=0);
       newID = peerMap_[NETWORK_PEER_ID_SERVER].lastReceivedGamestateID;
+      if( newID == GAMESTATEID_INITIAL )
+      {
+        return false;
+      }
     }
     
-    if(!currentGamestate_->collectData(newID, gsMode)){ //we have no data to send
+    currentGamestate_ = new packet::Gamestate();
+    
+    if(!currentGamestate_->collectData(newID, gsMode))
+    { //we have no data to send
       delete currentGamestate_;
       currentGamestate_=0;
+      return false;
     }
     return true;