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

Optimization to getPlayerTeam functions, not very successful :/

Browse Source
This commit is contained in:
DjWarmonger 2015-08-30 21:42:19 +02:00
parent 70801309bd
commit 904a66764c
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/CGameInfoCallback.cpp
View File

@ -756,18 +756,43 @@ TResources CPlayerSpecificInfoCallback::getResourceAmount() const
const TeamState * CGameInfoCallback::getTeam( TeamID teamID ) const
{
ERROR_RET_VAL_IF(!vstd::contains(gs->teams, teamID), "Cannot find info for team " << teamID, nullptr);
const TeamState *ret = &gs->teams[teamID];
ERROR_RET_VAL_IF(!!player && !vstd::contains(ret->players, *player), "Illegal attempt to access team data!", nullptr);
return ret;
//rewritten by hand, AI calls this function a lot
auto team = gs->teams.find(teamID);
if (team != gs->teams.end())
{
const TeamState *ret = &team->second;
if (!player.is_initialized()) //neutral (or invalid) player
return ret;
else
{
if (vstd::contains(ret->players, *player)) //specific player
return ret;
else
{
logGlobal->errorStream() << boost::format("Illegal attempt to access team data!");
return nullptr;
}
}
}
else
{
logGlobal->errorStream() << boost::format("Cannot find info for team %d") % teamID;
return nullptr;
}
}
const TeamState * CGameInfoCallback::getPlayerTeam( PlayerColor color ) const
{
const PlayerState * ps = getPlayer(color);
if (ps)
return getTeam(ps->team);
return nullptr;
auto player = gs->players.find(color);
if (player != gs->players.end())
{
return getTeam (player->second.team);
}
else
{
return nullptr;
}
}
const CGHeroInstance* CGameInfoCallback::getHeroWithSubid( int subid ) const