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

NKAI: fix crash

Browse Source
This commit is contained in:
Andrii Danylchenko
2023-03-11 13:54:05 +02:00
parent 4bf570763a
commit fa9e1d2d83
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AI/Nullkiller/Analyzers/ArmyManager.cpp
View File

@@ -182,8 +182,10 @@ std::vector<SlotInfo> ArmyManager::getBestArmy(const IBonusBearer * armyCarrier,
{ {
auto weakest = getWeakestCreature(resultingArmy); auto weakest = getWeakestCreature(resultingArmy);
if(weakest != resultingArmy.end() && weakest->count == 1) //we check iterator validity for playing with settings that allow 0 stacks armies if(weakest->count == 1)
{ {
assert(resultingArmy.size() > 1);
resultingArmy.erase(weakest); resultingArmy.erase(weakest);
} }
else else

7
AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp
View File

@@ -250,10 +250,13 @@ Goals::TGoalVec GatherArmyBehavior::upgradeArmy(const CGTownInstance * upgrader)
auto upgrade = ai->nullkiller->armyManager->calculateCreaturesUpgrade(path.heroArmy, upgrader, availableResources); auto upgrade = ai->nullkiller->armyManager->calculateCreaturesUpgrade(path.heroArmy, upgrader, availableResources);
if(ai->nullkiller->heroManager->getHeroRole(path.targetHero) == HeroRole::MAIN) if(!upgrader->garrisonHero && ai->nullkiller->heroManager->getHeroRole(path.targetHero) == HeroRole::MAIN)
{ {
upgrade.upgradeValue += upgrade.upgradeValue +=
ai->nullkiller->armyManager->howManyReinforcementsCanGet(path.targetHero, path.heroArmy, upgrader); ai->nullkiller->armyManager->howManyReinforcementsCanGet(
path.targetHero,
path.heroArmy,
upgrader->getUpperArmy());
} }
auto armyValue = (float)upgrade.upgradeValue / path.getHeroStrength(); auto armyValue = (float)upgrade.upgradeValue / path.getHeroStrength();

9
AI/Nullkiller/Pathfinding/Actors.cpp
View File

@@ -303,7 +303,12 @@ ExchangeResult HeroExchangeMap::tryExchangeNoLock(const ChainActor * other)
if(!newArmy) return result; if(!newArmy) return result;
auto reinforcement = newArmy->getArmyStrength() - actor->creatureSet->getArmyStrength(); auto newArmyStrength = newArmy->getArmyStrength();
auto oldArmyStrength = actor->creatureSet->getArmyStrength();
if(newArmyStrength <= oldArmyStrength) return result;
auto reinforcement = newArmyStrength - oldArmyStrength;
#if NKAI_PATHFINDER_TRACE_LEVEL >= 2 #if NKAI_PATHFINDER_TRACE_LEVEL >= 2
logAi->trace( logAi->trace(
@@ -365,7 +370,7 @@ HeroExchangeArmy * HeroExchangeMap::tryUpgrade(
{ {
auto buyArmy = ai->armyManager->getArmyAvailableToBuy(target, ai->cb->getTown(upgrader->id), resources); auto buyArmy = ai->armyManager->getArmyAvailableToBuy(target, ai->cb->getTown(upgrader->id), resources);
for(auto creatureToBuy : buyArmy) for(auto & creatureToBuy : buyArmy)
{ {
auto targetSlot = target->getSlotFor(creatureToBuy.cre); auto targetSlot = target->getSlotFor(creatureToBuy.cre);