games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +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
lib/CGameInfoCallback.cpp
View File

@ -721,7 +721,7 @@ int CGameInfoCallback::getHeroCount( PlayerColor player, bool includeGarrisoned
return static_cast<int>(p->getHeroes().size());
else
for(const auto & elem : p->getHeroes())
if(!elem->inTownGarrison)
if(!elem->isGarrisoned())
ret++;
return ret;
}
@ -792,7 +792,7 @@ std::vector < const CGHeroInstance *> CPlayerSpecificInfoCallback::getHeroesInfo
int CPlayerSpecificInfoCallback::getHeroSerial(const CGHeroInstance * hero, bool includeGarrisoned) const
{
if (hero->inTownGarrison && !includeGarrisoned)
if (hero->isGarrisoned() && !includeGarrisoned)
return -1;
size_t index = 0;
@ -800,7 +800,7 @@ int CPlayerSpecificInfoCallback::getHeroSerial(const CGHeroInstance * hero, bool
for (auto & possibleHero : heroes)
{
if (includeGarrisoned || !(possibleHero)->inTownGarrison)
if (includeGarrisoned || !(possibleHero)->isGarrisoned())
index++;
if (possibleHero == hero)
@ -853,7 +853,7 @@ const CGHeroInstance* CPlayerSpecificInfoCallback::getHeroBySerial(int serialId,
if (!includeGarrisoned)
{
for(ui32 i = 0; i < p->getHeroes().size() && static_cast<int>(i) <= serialId; i++)
if(p->getHeroes()[i]->inTownGarrison)
if(p->getHeroes()[i]->isGarrisoned())
serialId++;
}
ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->getHeroes().size(), "No player info", nullptr);