mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-25 20:22:31 +01:00
Code Issues Projects Releases Wiki Activity

- bugfixes for save / load game bugs reported

Browse Source
This commit is contained in:
Mark Vejvoda 2012-04-02 15:02:44 +00:00
parent f80e440713
commit 5b5d753341
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/game/game.cpp
View File

@ -3222,6 +3222,9 @@ void Game::checkWinner() {
} }
void Game::checkWinnerStandard() { void Game::checkWinnerStandard() {
if(world.getFactionCount() <= 0) {
return;
}
if(this->masterserverMode == true || world.getThisFaction()->getPersonalityType() == fpt_Observer) { if(this->masterserverMode == true || world.getThisFaction()->getPersonalityType() == fpt_Observer) {
// lookup int is team #, value is players alive on team // lookup int is team #, value is players alive on team
std::map<int,int> teamsAlive; std::map<int,int> teamsAlive;

2
source/glest_game/main/program.cpp
View File

@ -590,7 +590,7 @@ void Program::setState(ProgramState *programStateNew, bool cleanupOldState) {
sprintf(szBuf,"In [%s::%s Line: %d]\nError [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,e.what()); sprintf(szBuf,"In [%s::%s Line: %d]\nError [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,e.what());
SystemFlags::OutputDebug(SystemFlags::debugError,szBuf); SystemFlags::OutputDebug(SystemFlags::debugError,szBuf);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,szBuf); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,szBuf);
//abort(); abort();
messageBoxIsSystemError = true; messageBoxIsSystemError = true;

2
source/shared_lib/sources/lua/lua_script.cpp
View File

@ -343,7 +343,7 @@ void LuaScript::loadGame(const XmlNode *rootNode) {
lua_pushnumber( luaState, node->getAttribute("value")->getIntValue() ); lua_pushnumber( luaState, node->getAttribute("value")->getIntValue() );
break; break;
case LUA_TBOOLEAN: case LUA_TBOOLEAN:
lua_pushboolean( luaState, node->getAttribute("value")->getIntValue() ); lua_pushboolean( luaState, node->getAttribute("value")->getBoolValue() );
break; break;
case LUA_TTABLE: case LUA_TTABLE:
{ {