Minor fixes to multiplayer load game support

This commit is contained in:
Patrick Simmons
2014-10-25 19:05:50 -04:00
parent 6aa3c11084
commit 1dabdf7b3a
+5 -6
View File
@@ -399,8 +399,6 @@ void CClient::loadGame(const std::string & fname, const bool server, const std::
logNetwork->infoStream() << "Server opened savegame properly.";
}
player = PlayerColor(player_);
if(server)
{
for(auto & elem : gs->scenarioOps->playerInfos)
@@ -709,12 +707,13 @@ void CClient::serialize( Handler &h, const int version, const std::set<PlayerCol
nInt->playerID = pid;
if(playerIDs.count(pid))
installNewPlayerInterface(nInt, pid);
nInt->loadGame(dynamic_cast<CISer<CLoadFile>&>(h), version); //another evil cast, check above
installNewPlayerInterface(nInt, pid);
nInt->loadGame(dynamic_cast<CISer<CLoadFile>&>(h), version); //another evil cast, check above
}
if(!vstd::contains(battleints, PlayerColor::NEUTRAL))
loadNeutralBattleAI();
/* if(!vstd::contains(battleints, PlayerColor::NEUTRAL))
loadNeutralBattleAI();*/
}
}