Changeset 620 for code/branches/FICN/src/network/GameStateManager.cc
- Timestamp:
- Dec 18, 2007, 5:51:47 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/network/GameStateManager.cc
r599 r620 61 61 GameStateCompressed GameStateManager::popGameState(int clientID){ 62 62 int gID = head_->findClient(clientID)->getGamestateID(); 63 std::cout << "popgamestate: sending gstate id: " << gID << std::endl; 63 64 if(gID!=GAMESTATEID_INITIAL){ 64 65 GameState *client = gameStateMap[gID]; 65 66 GameState *server = reference; 66 67 return encode(client, server); 67 } 68 GameState *server = reference; 69 return encode(server); 70 // return an undiffed gamestate and set appropriate flags 68 } else { 69 GameState *server = reference; 70 head_->findClient(clientID)->setGamestateID(id); 71 return encode(server); 72 // return an undiffed gamestate and set appropriate flags 73 } 71 74 } 72 75 … … 101 104 // go through all Synchronisables 102 105 for(it = orxonox::ObjectList<Synchronisable>::start(); it != 0; ++it){ 106 //std::cout << "gamestatemanager: in for loop" << std::endl; 103 107 //get size of the synchronisable 104 108 tempsize=it->getSize(); … … 127 131 128 132 GameStateCompressed GameStateManager::encode(GameState *a, GameState *b){ 129 GameState r = diff(a,b); 130 r.diffed = true; 133 //GameState r = diff(a,b); 134 //r.diffed = true; 135 GameState r = *b; 136 r.diffed = false; 131 137 return compress_(&r); 132 138 } … … 170 176 171 177 GameStateCompressed GameStateManager::compress_(GameState *a) { 172 COUT(2) << "compressing gamestate" << std::endl;178 //COUT(2) << "compressing gamestate" << std::endl; 173 179 int size = a->size; 174 180 uLongf buffer = (uLongf)((a->size + 12)*1.01)+1; … … 181 187 case Z_MEM_ERROR: std::cout << "not enough memory available" << std::endl; break; 182 188 case Z_BUF_ERROR: std::cout << "not enough memory available in the buffer" << std::endl; break; 183 case Z_DATA_ERROR: std::cout << "d ata corrupted" << std::endl; break;189 case Z_DATA_ERROR: std::cout << "decompress: data corrupted" << std::endl; break; 184 190 } 185 191
Note: See TracChangeset
for help on using the changeset viewer.