Changeset 8858 for code/trunk/src/libraries/network/GamestateManager.cc
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/libraries/network/GamestateManager.cc
r8407 r8858 52 52 #include "core/command/Executor.h" 53 53 #include "core/GameMode.h" 54 #include "util/ Debug.h"54 #include "util/Output.h" 55 55 #include "util/Clock.h" 56 56 #include "util/OrxAssert.h" … … 128 128 if( !this->sendPacket(ack)) 129 129 { 130 COUT(3) << "could not ack gamestate: " << gamestateID << std::endl;130 orxout(internal_warning, context::network) << "could not ack gamestate: " << gamestateID << endl; 131 131 return false; 132 132 } 133 133 else 134 134 { 135 COUT(5) << "acked a gamestate: " << gamestateID << std::endl;135 orxout(verbose_more, context::network) << "acked a gamestate: " << gamestateID << endl; 136 136 return true; 137 137 } … … 182 182 if( !peerIt->second.isSynched ) 183 183 { 184 COUT(5) << "Server: not sending gamestate" << std::endl;184 orxout(verbose_more, context::network) << "Server: not sending gamestate" << endl; 185 185 continue; 186 186 } 187 COUT(5) << "client id: " << peerIt->first << std::endl;188 COUT(5) << "Server: doing gamestate gamestate preparation" << std::endl;187 orxout(verbose_more, context::network) << "client id: " << peerIt->first << endl; 188 orxout(verbose_more, context::network) << "Server: doing gamestate gamestate preparation" << endl; 189 189 int peerID = peerIt->first; //get client id 190 190 … … 256 256 // OrxVerify(gs->compressData(), ""); 257 257 clock.capture(); 258 COUT(5) << "diff and compress time: " << clock.getDeltaTime() << endl;259 // COUT(5) << "sending gamestate with id " << gs->getID();258 orxout(verbose_more, context::network) << "diff and compress time: " << clock.getDeltaTime() << endl; 259 // orxout(verbose_more, context::network) << "sending gamestate with id " << gs->getID(); 260 260 // if(gamestate->isDiffed()) 261 // COUT(5) << " and baseid " << gs->getBaseID() << endl;261 // orxout(verbose_more, context::network) << " and baseid " << gs->getBaseID() << endl; 262 262 // else 263 // COUT(5) << endl;263 // orxout(verbose_more, context::network) << endl; 264 264 gs->setPeerID(peerID); 265 265 destgamestate = gs; … … 291 291 if( gamestateID <= curid && curid != GAMESTATEID_INITIAL ) 292 292 return true; 293 COUT(4) << "acking gamestate " << gamestateID << " for peerID: " << peerID << " curid: " << curid << std::endl;293 orxout(verbose, context::network) << "acking gamestate " << gamestateID << " for peerID: " << peerID << " curid: " << curid << endl; 294 294 std::map<uint32_t, packet::Gamestate*>::iterator it2; 295 295 for( it2=it->second.gamestates.begin(); it2!=it->second.gamestates.end(); )
Note: See TracChangeset
for help on using the changeset viewer.