diff options
| author | Torbjörn Andersson | 2009-04-25 13:58:54 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2009-04-25 13:58:54 +0000 |
| commit | ca3195b1adccc91fbaff7be04f312ac814de1ae7 (patch) | |
| tree | c37a829310cf7e0a1f0710d8224f201321dba0a0 /engines/kyra | |
| parent | ccb64ad81e6c56eaa2350197f964d470d8610ed9 (diff) | |
| download | scummvm-rg350-ca3195b1adccc91fbaff7be04f312ac814de1ae7.tar.gz scummvm-rg350-ca3195b1adccc91fbaff7be04f312ac814de1ae7.tar.bz2 scummvm-rg350-ca3195b1adccc91fbaff7be04f312ac814de1ae7.zip | |
Fixed warning.
svn-id: r40145
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/lol.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/lol.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index a05003ffbd..601846d0de 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -2198,7 +2198,7 @@ int LoLEngine::calcInflictableDamage(int16 attacker, int16 target, int hitType) return res; } -int LoLEngine::inflictDamage(int16 target, int damage, int16 attacker, int skill, int deathFlag) { +int LoLEngine::inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int deathFlag) { MonsterInPlay *m = 0; LoLCharacter *c = 0; diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index ba97167ede..8d4162698b 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -1195,7 +1195,7 @@ private: // fight int battleHitSkillTest(int16 attacker, int16 target, int skill); int calcInflictableDamage(int16 attacker, int16 target, int hitType); - int inflictDamage(int16 target, int damage, int16 attacker, int skill, int deathFlag); + int inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int deathFlag); void characterHitpointsZero(int16 charNum, int a); void resetCharacterState(LoLCharacter *c, int first, int last); int calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 itemMight, int index, int hitType); |