Changeset 1574 for code/branches/core3/src/network/GameStateManager.cc

Timestamp:

Jun 9, 2008, 4:35:38 AM (16 years ago)

Author:

landauf

Message:

big change in ObjectList: separated the class into a non-template base and a template wrapper for the base. this also changes the Iterator, there is now a non-template IteratorBase. this brings much more flexibility, like iterating through all objects of a given identifier without knowing the type. however this needs a dynamic_cast, which isn't quite optimal, but I think there are much worser things than that out there.

there isn't much you have to know about this, except there is no more ObjectList<myClass>::start() function but a ObjectList<myClass>::begin() to be more STLish. another thing: ObjectList<myClass>::end() points now to the element _after_ the last element, so it's possible to iterate in a for-loop until (it != ObjectList<myClass>::end()). the reason is the same as above. however, (it) as a boolean still works perfectly fine.

File:

• code/branches/core3/src/network/GameStateManager.cc (modified) (15 diffs)

code/branches/core3/src/network/GameStateManager.cc

@@ -70 +70 @@
     return;
   }
-  
+
   void GameStateManager::addGameState(GameStateCompressed *gs, int clientID){
     if(!gs)
@@ -83 +83 @@
     return;
   }
-  
+
   void GameStateManager::processGameStates(){
     std::map<int, GameStateCompressed*>::iterator it;
@@ -93 +93 @@
     gameStateQueue.clear();
   }
-  
-  
+
+
   /**
    * this function is used to keep the memory usage low
    * it tries to delete all the unused gamestates
-   * 
-   * 
+   *
+   *
    */
   void GameStateManager::cleanup(){
@@ -155 +155 @@
     }
   }
-  
+
   bool GameStateManager::pushGameState( GameStateCompressed *gs, int clientID ){
     GameState *ugs = decompress(gs);
@@ -190 +190 @@
     int offset=0, size=0;
     // get total size of gamestate
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
       size+=it->getSize(); // size of the actual data of the synchronisable
       size+=3*sizeof(int); // size of datasize, classID and objectID
@@ -204 +204 @@
     memsize=size;
     // go through all Synchronisables
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
       //get size of the synchronisable
       tempsize=it->getSize();
@@ -246 +246 @@
     COUT(4) << "loadSnapshot: loading gs: " << state->id << std::endl;
     // get the start of the Synchronisable list
-    orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
+    orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::begin();
     syncData sync;
     /*ClientInformation *client = head_->findClient(clientID);
@@ -308 +308 @@
     return true;
   }
-  
-  
+
+
   //##### ADDED FOR TESTING PURPOSE #####
   GameStateCompressed* GameStateManager::testCompress( GameState* g ) {
@@ -405 +405 @@
     switch ( retval ) {
       case Z_OK: COUT(5) << "G.St.Man: compress: successfully compressed" << std::endl; break;
-      case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl; 
+      case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl;
       return NULL;
       case Z_BUF_ERROR: COUT(2) << "G.St.Man: compress: not enough memory available in the buffer in gamestate.compress" << std::endl;
@@ -426 +426 @@
     return compressedGamestate;
   }
-  
+
   GameState *GameStateManager::decompress(GameStateCompressed *a) {
     //COUT(4) << "GameStateClient: uncompressing gamestate. id: " << a->id << ", baseid: " << a->base_id << ", normsize: " << a->normsize << ", compsize: " << a->compsize << std::endl;
@@ -464 +464 @@
     return gamestate;
   }
-  
+
 
   void GameStateManager::ackGameState(int clientID, int gamestateID) {
@@ -471 +471 @@
       return;
     int curid = temp->getGamestateID();
-    
+
     if(gamestateID == GAMESTATEID_INITIAL){
       temp->setGameStateID(GAMESTATEID_INITIAL);
@@ -481 +481 @@
     }
     if(curid > gamestateID)
-      // the network packets got messed up 
+      // the network packets got messed up
       return;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
@@ -512 +512 @@
     return true;
   }
-  
+
   bool GameStateManager::checkAccess(int clientID, int objectID){
     // currently we only check, wheter the object is the clients spaceship
@@ -518 +518 @@
     return true; // TODO: change this
   }
-  
+
   void GameStateManager::removeClient(ClientInformation* client){
     if(!client)