aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/lol.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-06-01 19:11:56 +0000
committerFlorian Kagerer2009-06-01 19:11:56 +0000
commita10287e787763fb4d56364fdabbe1365773ea9fb (patch)
tree7199560acb415c98ef8d61ed0227985c97dc0e3f /engines/kyra/lol.cpp
parent8b59d275abc7a044155c361468c5f0308af10e24 (diff)
downloadscummvm-rg350-a10287e787763fb4d56364fdabbe1365773ea9fb.tar.gz
scummvm-rg350-a10287e787763fb4d56364fdabbe1365773ea9fb.tar.bz2
scummvm-rg350-a10287e787763fb4d56364fdabbe1365773ea9fb.zip
LOL: fix warning
svn-id: r41106
Diffstat (limited to 'engines/kyra/lol.cpp')
-rw-r--r--engines/kyra/lol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 7bfec44e02..8c969b2b33 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -2480,7 +2480,7 @@ void LoLEngine::processMagicHandOfFate(int spellLevel) {
// This might be a bug in the original code, but using
// the hand of fate spell won't give any experience points
int dmg = calcInflictableDamagePerItem(-1, t, damage[spellLevel - 2], 0x80, 1);
- inflictDamage(t, dmg, -1, 3, 0x80);
+ inflictDamage(t, dmg, 0xffff, 3, 0x80);
}
}
@@ -2982,7 +2982,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;