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

vcmi: massive refactoring v1

Browse Source
This commit is contained in:
Konstantin
2023-04-05 03:26:29 +03:00
parent ee489f18d2
commit 11b237a23c
129 changed files with 803 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CGameInfoCallback.cpp
View File

@ -37,7 +37,7 @@ PlayerColor CGameInfoCallback::getOwner(ObjectInstanceID heroID) const
return obj->tempOwner;
}
int CGameInfoCallback::getResource(PlayerColor Player, Res::ERes which) const
int CGameInfoCallback::getResource(PlayerColor Player, GameResID which) const
{
const PlayerState *p = getPlayerState(Player);
ERROR_RET_VAL_IF(!p, "No player info!", -1);
@ -323,9 +323,9 @@ bool CGameInfoCallback::getHeroInfo(const CGObjectInstance * hero, InfoAboutHero
for(auto & elem : info.army)
{
if(static_cast<int>(elem.second.type->AIValue) > maxAIValue)
if(static_cast<int>(elem.second.type->getAIValue()) > maxAIValue)
{
maxAIValue = elem.second.type->AIValue;
maxAIValue = elem.second.type->getAIValue();
mostStrong = elem.second.type;
}
}
@ -359,9 +359,9 @@ bool CGameInfoCallback::getHeroInfo(const CGObjectInstance * hero, InfoAboutHero
for(auto creature : VLC->creh->objects)
{
if(static_cast<si16>(creature->faction) == factionIndex && static_cast<int>(creature->AIValue) > maxAIValue)
if(static_cast<si16>(creature->getFactionIndex()) == factionIndex && static_cast<int>(creature->getAIValue()) > maxAIValue)
{
maxAIValue = creature->AIValue;
maxAIValue = creature->getAIValue();
mostStrong = creature;
}
}
@ -860,7 +860,7 @@ const CGTownInstance* CPlayerSpecificInfoCallback::getTownBySerial(int serialId)
return p->towns[serialId];
}
int CPlayerSpecificInfoCallback::getResourceAmount(Res::ERes type) const
int CPlayerSpecificInfoCallback::getResourceAmount(GameResID type) const
{
//boost::shared_lock<boost::shared_mutex> lock(*gs->mx);
ERROR_RET_VAL_IF(!player, "Applicable only for player callbacks", -1);