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

Merge pull request #4599 from MichalZr6/fix_hero_access_check

Browse Source 
Fix error "hero access check" flooding console during quick-battle
This commit is contained in:
Ivan Savenko 2024-09-20 13:01:49 +03:00 committed by GitHub
commit 6832a5c4be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AI/BattleAI/AttackPossibility.cpp
View File

@ -44,24 +44,30 @@ void DamageCache::buildObstacleDamageCache(std::shared_ptr<HypotheticBattle> hb,
if(!triggerIsNegative) if(!triggerIsNegative)
continue; continue;
std::unique_ptr<spells::BattleCast> cast = nullptr;
if(spellObstacle->obstacleType == SpellCreatedObstacle::EObstacleType::SPELL_CREATED)
{
const auto * hero = hb->battleGetFightingHero(spellObstacle->casterSide); const auto * hero = hb->battleGetFightingHero(spellObstacle->casterSide);
auto caster = spells::ObstacleCasterProxy(hb->getSidePlayer(spellObstacle->casterSide), hero, *spellObstacle); auto caster = spells::ObstacleCasterProxy(hb->getSidePlayer(spellObstacle->casterSide), hero, *spellObstacle);
cast = std::make_unique<spells::BattleCast>(spells::BattleCast(hb.get(), &caster, spells::Mode::PASSIVE, obst->getTrigger().toSpell()));
}
auto affectedHexes = obst->getAffectedTiles(); auto affectedHexes = obst->getAffectedTiles();
auto stacks = hb->battleGetUnitsIf([](const battle::Unit * u) -> bool { auto stacks = hb->battleGetUnitsIf([](const battle::Unit * u) -> bool {
return u->alive() && !u->isTurret() && u->getPosition().isValid(); return u->alive() && !u->isTurret() && u->getPosition().isValid();
}); });
std::shared_ptr<HypotheticBattle> inner = std::make_shared<HypotheticBattle>(hb->env, hb);
for(auto stack : stacks) for(auto stack : stacks)
{ {
std::shared_ptr<HypotheticBattle> inner = std::make_shared<HypotheticBattle>(hb->env, hb);
auto cast = spells::BattleCast(hb.get(), &caster, spells::Mode::PASSIVE, obst->getTrigger().toSpell());
auto updated = inner->getForUpdate(stack->unitId()); auto updated = inner->getForUpdate(stack->unitId());
spells::Target target; spells::Target target;
target.push_back(spells::Destination(updated.get())); target.push_back(spells::Destination(updated.get()));
cast.castEval(inner->getServerCallback(), target); if(cast)
cast->castEval(inner->getServerCallback(), target);
auto damageDealt = stack->getAvailableHealth() - updated->getAvailableHealth(); auto damageDealt = stack->getAvailableHealth() - updated->getAvailableHealth();