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

[eriktorbjorn at users.sourceforge.net]

Revision: 40145
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40145&view=rev
Author:   eriktorbjorn
Date:     2009-04-25 13:58:54 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Fixed 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-04-25 13:15:05 UTC (rev 40144)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-04-25 13:58:54 UTC (rev 40145)
@@ -2198,7 +2198,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-04-25 13:15:05 UTC (rev 40144)
+++ scummvm/trunk/engines/kyra/lol.h	2009-04-25 13:58:54 UTC (rev 40145)
@@ -1195,7 +1195,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 resetCharacterState(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.