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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Apr 26 01:57:26 CEST 2009


Revision: 40149
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40149&view=rev
Author:   thebluegr
Date:     2009-04-25 23:57:26 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Changed the attacker parameter from 0 to 0xFFFF in inflictDamage() (which was probably the original intended value) and added a FIXME

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sprites_lol.cpp

Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp	2009-04-25 23:42:47 UTC (rev 40148)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp	2009-04-25 23:57:26 UTC (rev 40149)
@@ -1242,7 +1242,9 @@
 				if (item)
 					setItemPosition(item, _partyPosX, _partyPosY, 0, 1);
 
-				inflictDamage(i, 20, 0, 0, 2);
+				// FIXME: attacker is a uint16, and -1 was used here. It has been substituted with 0xFFFF, which could
+				// be the original intended value
+				inflictDamage(i, 20, 0xFFFF, 0, 2);
 			}
 
 		} else if (flyingObject == 3) {


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




More information about the Scummvm-git-logs mailing list