1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

- Fix to previous commit (keep heroes which are in heroes pool too)

This commit is contained in:
beegee1 2014-02-23 16:21:30 +00:00
parent d0a5a6eab4
commit 674c8bc591

View File

@ -5160,6 +5160,15 @@ void CGameHandler::checkVictoryLossConditionsForPlayer(PlayerColor player)
crossoverHeroes.push_back(hero);
}
}
// keep lost heroes which are in heroes pool
for(auto & heroPair : gs->hpool.heroesPool)
{
if(vstd::contains(gs->scenarioOps->campState->getCurrentScenario().keepHeroes, HeroTypeID(heroPair.first)))
{
crossoverHeroes.push_back(heroPair.second.get());
}
}
gs->scenarioOps->campState->setCurrentMapAsConquered(crossoverHeroes);
//Request clients to change connection mode