games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-29 12:37:29 +03:00
parent dca5a099d5
commit 9fbfbc7506
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gameState/CGameStateCampaign.cpp
View File

@@ -505,7 +505,7 @@ void CGameStateCampaign::generateCampaignHeroesToReplace()
if (!gameState->players.at(placeholder->getOwner()).isHuman()) if (!gameState->players.at(placeholder->getOwner()).isHuman())
continue; continue;
CGHeroInstance * hero = campaignState->crossoverDeserialize(*nodeListIter, gameState->map.get()); auto hero = campaignState->crossoverDeserialize(*nodeListIter, gameState->map.get());
nodeListIter++; nodeListIter++;
logGlobal->info("Hero crossover: Loading placeholder as %d (%s)", hero->getHeroType(), hero->getNameTranslated()); logGlobal->info("Hero crossover: Loading placeholder as %d (%s)", hero->getHeroType(), hero->getNameTranslated());

2
lib/gameState/TavernHeroesPool.cpp
View File

@@ -101,7 +101,7 @@ std::vector<const CGHeroInstance *> TavernHeroesPool::getHeroesFor(PlayerColor c
for(const auto & slot : currentTavern) for(const auto & slot : currentTavern)
{ {
assert(slot.hero != nullptr); assert(slot.hero.hasValue());
if (slot.player == color) if (slot.player == color)
result.push_back(owner->getMap().tryGetFromHeroPool(slot.hero)); result.push_back(owner->getMap().tryGetFromHeroPool(slot.hero));
} }