games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Minor fixes to multiplayer load game support

Browse Source
This commit is contained in:
Patrick Simmons
2014-10-25 19:05:50 -04:00
parent 6aa3c11084
commit 1dabdf7b3a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/Client.cpp
+6 -7
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,17 +707,18 @@ 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();*/
}
}
void CClient::handlePack( CPack * pack )
{
{
CBaseForCLApply *apply = applier->apps[typeList.getTypeID(pack)]; //find the applier
if(apply)
{