mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 23:21:19 +02:00
Code Issues Projects Releases Wiki Activity

- show more friendly message when out of synch detected.

Browse Source
This commit is contained in:
Mark Vejvoda
2010-12-28 02:57:36 +00:00
parent 33aa51b5b5
commit ba995d1131
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/glest_game/game/commander.cpp
View File

@@ -143,7 +143,7 @@ CommandResult Commander::tryGiveCommand(const Unit* unit, const CommandType *com
} }
CommandResult Commander::tryGiveCommand(const Selection *selection, CommandClass commandClass, const Vec2i &pos, const Unit *targetUnit, bool tryQueue) const{ CommandResult Commander::tryGiveCommand(const Selection *selection, CommandClass commandClass, const Vec2i &pos, const Unit *targetUnit, bool tryQueue) const{
if(!selection->isEmpty()){ if(!selection->isEmpty()){
Vec2i refPos, currPos; Vec2i refPos, currPos;
CommandResultContainer results; CommandResultContainer results;
@@ -503,7 +503,8 @@ Command* Commander::buildCommand(const NetworkCommand* networkCommand) const {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s\n",szBuf); SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s\n",szBuf);
std::string worldLog = world->DumpWorldToLog(); std::string worldLog = world->DumpWorldToLog();
std::string sError = "worldLog = " + worldLog + " " + string(szBuf); //std::string sError = "worldLog = " + worldLog + " " + string(szBuf);
std::string sError = "Error [#1]: Game is out of sync, please check log files for details.";
throw runtime_error(sError); throw runtime_error(sError);
} }
@@ -522,7 +523,8 @@ Command* Commander::buildCommand(const NetworkCommand* networkCommand) const {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s\n",szBuf); SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s\n",szBuf);
std::string worldLog = world->DumpWorldToLog(); std::string worldLog = world->DumpWorldToLog();
std::string sError = "worldLog = " + worldLog + " " + string(szBuf); //std::string sError = "worldLog = " + worldLog + " " + string(szBuf);
std::string sError = "Error [#2]: Game is out of sync, please check log files for details.";
throw runtime_error(sError); throw runtime_error(sError);
} }