From 9fbfbc7506bc41714a382ae042c700ff25de3e3f Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 29 Apr 2025 12:37:29 +0300 Subject: [PATCH] Fix build --- lib/gameState/CGameStateCampaign.cpp | 2 +- lib/gameState/TavernHeroesPool.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gameState/CGameStateCampaign.cpp b/lib/gameState/CGameStateCampaign.cpp index 19a72bb4c..0e0a924b8 100644 --- a/lib/gameState/CGameStateCampaign.cpp +++ b/lib/gameState/CGameStateCampaign.cpp @@ -505,7 +505,7 @@ void CGameStateCampaign::generateCampaignHeroesToReplace() if (!gameState->players.at(placeholder->getOwner()).isHuman()) continue; - CGHeroInstance * hero = campaignState->crossoverDeserialize(*nodeListIter, gameState->map.get()); + auto hero = campaignState->crossoverDeserialize(*nodeListIter, gameState->map.get()); nodeListIter++; logGlobal->info("Hero crossover: Loading placeholder as %d (%s)", hero->getHeroType(), hero->getNameTranslated()); diff --git a/lib/gameState/TavernHeroesPool.cpp b/lib/gameState/TavernHeroesPool.cpp index 1298ad5fb..fe78f2df1 100644 --- a/lib/gameState/TavernHeroesPool.cpp +++ b/lib/gameState/TavernHeroesPool.cpp @@ -101,7 +101,7 @@ std::vector TavernHeroesPool::getHeroesFor(PlayerColor c for(const auto & slot : currentTavern) { - assert(slot.hero != nullptr); + assert(slot.hero.hasValue()); if (slot.player == color) result.push_back(owner->getMap().tryGetFromHeroPool(slot.hero)); }