1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

gcc-4.5 compatibility

This commit is contained in:
Ivan Savenko
2012-06-23 17:19:50 +00:00
parent 770a6e077c
commit 47945383da
7 changed files with 10 additions and 9 deletions

View File

@@ -416,7 +416,7 @@ const CGHeroInstance * CBattleInfoCallback::battleGetFightingHero(ui8 side) cons
shared_ptr<const CObstacleInstance> CBattleInfoCallback::battleGetObstacleOnPos(BattleHex tile, bool onlyBlocking /*= true*/)
{
if(!gs->curB)
return NULL;
return shared_ptr<const CObstacleInstance>();
BOOST_FOREACH(auto &obs, battleGetAllObstacles())
{
@@ -426,7 +426,7 @@ shared_ptr<const CObstacleInstance> CBattleInfoCallback::battleGetObstacleOnPos(
return obs;
}
}
return NULL;
return shared_ptr<const CObstacleInstance>();
}
int CBattleInfoCallback::battleGetMoatDmg()