diff options
| author | Florian Kagerer | 2009-06-07 18:51:03 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-06-07 18:51:03 +0000 |
| commit | 4dd29a5985a4190f99446865209850a40f12e2e4 (patch) | |
| tree | e949977a762537195555ec386f7e682731778b84 /engines/kyra/lol.h | |
| parent | ee21d82948d55518da2f09443d0113f942f9895f (diff) | |
| download | scummvm-rg350-4dd29a5985a4190f99446865209850a40f12e2e4.tar.gz scummvm-rg350-4dd29a5985a4190f99446865209850a40f12e2e4.tar.bz2 scummvm-rg350-4dd29a5985a4190f99446865209850a40f12e2e4.zip | |
LOL: minor bug fix in battle system
svn-id: r41348
Diffstat (limited to 'engines/kyra/lol.h')
| -rw-r--r-- | engines/kyra/lol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index 1c7c9df18d..4544faf499 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -1396,14 +1396,14 @@ private: // fight int battleHitSkillTest(int16 attacker, int16 target, int skill); int calcInflictableDamage(int16 attacker, int16 target, int hitType); - int inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int deathFlag); + int inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int flags); void characterHitpointsZero(int16 charNum, int a); void removeCharacterEffects(LoLCharacter *c, int first, int last); int calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 itemMight, int index, int hitType); void checkForPartyDeath(); void applyMonsterAttackSkill(MonsterInPlay *monster, int16 target, int16 damage); - void applyMonsterDefenseSkill(MonsterInPlay *monster, int16 attacker, int deathFlag, int skill, int damage); + void applyMonsterDefenseSkill(MonsterInPlay *monster, int16 attacker, int flags, int skill, int damage); int removeCharacterItem(int charNum, int itemFlags); int paralyzePoisonCharacter(int charNum, int typeFlag, int immunityFlags, int hitChance, int redraw); void paralyzePoisonAllCharacters(int typeFlag, int immunityFlags, int hitChance); @@ -1420,7 +1420,7 @@ private: uint16 getNearestMonsterFromPos(int x, int y); uint16 getNearestPartyMemberFromPos(int x, int y); - int _partyDeathFlag; + int _partyDamageFlags; // magic atlas void displayAutomap(); |