[Scummvm-cvs-logs] SF.net SVN: scummvm:[41106] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 41106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41106&view=rev
Author:   athrxx
Date:     2009-06-01 19:11:56 +0000 (Mon, 01 Jun 2009)

Log Message:
-----------
LOL: fix warning

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-06-01 18:25:43 UTC (rev 41105)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-06-01 19:11:56 UTC (rev 41106)
@@ -2480,7 +2480,7 @@
 			// 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 @@
 	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;
 

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-06-01 18:25:43 UTC (rev 41105)
+++ scummvm/trunk/engines/kyra/lol.h	2009-06-01 19:11:56 UTC (rev 41106)
@@ -1381,7 +1381,7 @@
 	// 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 removeCharacterEffects(LoLCharacter *c, int first, int last);
 	int calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 itemMight, int index, int hitType);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.