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

Crashes realted to illegal access to enemy hero data should be fixed, including #1178.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2013-01-20 20:29:35 +00:00
parent fff7909958
commit a96f03e947
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CBattleCallback.cpp
View File

@ -296,6 +296,15 @@ const CGHeroInstance * CBattleInfoEssentials::battleGetFightingHero(ui8 side) co
return getBattle()->heroes[side];
}
InfoAboutHero CBattleInfoEssentials::battleGetHeroInfo( ui8 side ) const
{
auto hero = getBattle()->heroes[side];
if(!hero)
tlog3 << __FUNCTION__ << ": side " << (int)side << " does not have hero!\n";
return InfoAboutHero(hero, battleDoWeKnowAbout(side));
}
int CBattleInfoEssentials::battleCastSpells(ui8 side) const
{
RETURN_IF_NOT_BATTLE(-1);
@ -2296,10 +2305,7 @@ const CGHeroInstance * CPlayerBattleCallback::battleGetMyHero() const
InfoAboutHero CPlayerBattleCallback::battleGetEnemyHero() const
{
InfoAboutHero ret;
assert(0);
///TODO implement and replace usages of battleGetFightingHero obtaining enemy hero
return ret;
return battleGetHeroInfo(!battleGetMySide());
}
BattleAttackInfo::BattleAttackInfo(const CStack *Attacker, const CStack *Defender, bool Shooting)