Changeset 7882 for code/branches/network6

Timestamp:

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

Author:

scheusso

Message:

improving gamestate processing and generation

Location:

code/branches/network6/src/libraries/network

Files:

• Client.cc (modified) (1 diff)
• GamestateManager.cc (modified) (4 diffs)
• Server.cc (modified) (1 diff)

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

@@ -155 +155 @@
         COUT(4) << "popping partial gamestate: " << std::endl;
 //         packet::Gamestate *gs = GamestateClient::getGamestate();
-        GamestateManager::update();
-        std::vector<packet::Gamestate*> gamestates = GamestateManager::getGamestates();
-        std::vector<packet::Gamestate*>::iterator it;
-        for( it = gamestates.begin(); it != gamestates.end(); ++it )
+        if( GamestateManager::update() )
         {
-          (*it)->send( static_cast<Host*>(this) );
+          std::vector<packet::Gamestate*> gamestates = GamestateManager::getGamestates();
+          std::vector<packet::Gamestate*>::iterator it;
+          for( it = gamestates.begin(); it != gamestates.end(); ++it )
+          {
+            (*it)->send( static_cast<Host*>(this) );
+          }
         }
         //assert(gs); <--- there might be the case that no data has to be sent, so its commented out now

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;

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

@@ -417 +417 @@
     b = w->send( static_cast<Host*>(this) );
     assert(b);
-    packet::Gamestate *g = new packet::Gamestate();
-    g->setPeerID(clientID);
-    b = g->collectData(0,packet::GAMESTATE_MODE_SERVER);
-    assert(b);
-    if(!b)
-      return false; //no data for the client
-//     b = g->compressData();
+//     packet::Gamestate *g = new packet::Gamestate();
+//     g->setPeerID(clientID);
+//     b = g->collectData(0,packet::GAMESTATE_MODE_SERVER);
 //     assert(b);
-    b = g->send( static_cast<Host*>(this) );
-    assert(b);
+//     if(!b)
+//       return false; //no data for the client
+// //     b = g->compressData();
+// //     assert(b);
+//     b = g->send( static_cast<Host*>(this) );
+//     assert(b);
     return true;
   }