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

Remove ConstTransitivePtr from hero and town instances

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-09 21:51:33 +00:00
parent 62234fcf92
commit 417ea6451a
57 changed files with 436 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AI/Nullkiller/Engine/FuzzyHelper.cpp
View File

@ -47,16 +47,16 @@ ui64 FuzzyHelper::evaluateDanger(const int3 & tile, const CGHeroInstance * visit
{
auto hero = dynamic_cast<const CGHeroInstance *>(dangerousObject);
if(hero->visitedTown && !hero->visitedTown->garrisonHero)
if(hero->getVisitedTown() && !hero->getVisitedTown()->getGarrisonHero())
{
objectDanger += evaluateDanger(hero->visitedTown.get());
objectDanger += evaluateDanger(hero->getVisitedTown());
}
objectDanger *= ai->heroManager->getFightingStrengthCached(hero);
}
if (objWithID<Obj::TOWN>(dangerousObject))
{
auto town = dynamic_cast<const CGTownInstance*>(dangerousObject);
auto hero = town->garrisonHero;
auto hero = town->getGarrisonHero();
if (hero)
objectDanger *= ai->heroManager->getFightingStrengthCached(hero);
@ -121,7 +121,7 @@ ui64 FuzzyHelper::evaluateDanger(const CGObjectInstance * obj)
const CGTownInstance * town = dynamic_cast<const CGTownInstance *>(obj);
auto danger = town->getUpperArmy()->getArmyStrength();
if(danger || town->visitingHero)
if(danger || town->getVisitingHero())
{
auto fortLevel = town->fortLevel();