diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 29218168..62b7d3e9 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -27,7 +27,7 @@ using namespace Shared::Platform; namespace Glest { namespace Game { const char *mailString = " http://bugs.megaglest.org"; -const string glestVersionString = "v3.7.0-beta1"; +const string glestVersionString = "v3.7.0-dev"; #if defined(SVNVERSION) const string SVN_Rev = string("Rev: ") + string(SVNVERSION); #elif defined(SVNVERSIONHEADER) diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp index 8a16cc79..3429dc4d 100644 --- a/source/glest_game/game/commander.cpp +++ b/source/glest_game/game/commander.cpp @@ -896,9 +896,12 @@ void Commander::giveNetworkCommand(NetworkCommand* networkCommand) const { //printf("nctPlayerStatusChange -> faction->getPersonalityType() = %d index [%d] control [%d] networkstatus [%d]\n", // world->getFaction(factionIndex)->getPersonalityType(),world->getFaction(factionIndex)->getIndex(),world->getFaction(factionIndex)->getControlType(),settings->getNetworkPlayerStatuses(factionIndex)); + settings->setFactionControl(factionIndex,ctCpuUltra); + settings->setResourceMultiplierIndex(factionIndex,settings->getFallbackCpuMultiplier()); + if(!world->getGame()->getGameOver()&& !this->world->getGame()->factionLostGame(factionIndex)){ // use the fallback multiplier here - settings->setResourceMultiplierIndex(factionIndex,settings->getFallbackCpuMultiplier()); + // mark player as "leaver" this->world->getStats()->setPlayerLeftBeforeEnd(factionIndex,true); // set disconnect time for endgame stats diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index 0f652bf0..175a721f 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -1903,7 +1903,7 @@ void Game::ReplaceDisconnectedNetworkPlayersWithAI(bool isNetworkGame, NetworkRo char szBuf[4096]=""; if(faction->getPersonalityType() != fpt_Observer) { - faction->setControlType(ctCpuUltra); + //faction->setControlType(ctCpuUltra); aiInterfaces[i] = new AiInterface(*this, i, faction->getTeam(), faction->getStartLocationIndex()); sprintf(szBuf,Lang::getInstance().get("LogScreenGameLoadingCreatingAIFaction","",true).c_str(),i);