games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Merge pull request #2422 from IvanSavenko/hero_pool_fix

Browse Source 
Fix errors about "hero has no army" for defeated heroes
This commit is contained in:
Ivan Savenko 2023-07-28 13:43:50 +03:00 committed by GitHub
commit 6153c1b203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gameState/TavernHeroesPool.cpp
View File

@ -109,12 +109,18 @@ CGHeroInstance * TavernHeroesPool::takeHeroFromPool(HeroTypeID hero)
void TavernHeroesPool::onNewDay() void TavernHeroesPool::onNewDay()
{ {
auto unusedHeroes = unusedHeroesFromPool();
for(auto & hero : heroesPool) for(auto & hero : heroesPool)
{ {
assert(hero.second); assert(hero.second);
if(!hero.second) if(!hero.second)
continue; continue;
// do not access heroes who are not present in tavern of any players
if (vstd::contains(unusedHeroes, hero.first))
continue;
hero.second->setMovementPoints(hero.second->movementPointsLimit(true)); hero.second->setMovementPoints(hero.second->movementPointsLimit(true));
hero.second->mana = hero.second->manaLimit(); hero.second->mana = hero.second->manaLimit();
} }