[Scummvm-cvs-logs] SF.net SVN: scummvm:[33288] scummvm/trunk/engines/tinsel

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Fri Jul 25 14:59:46 CEST 2008


Revision: 33288
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33288&view=rev
Author:   drmccoy
Date:     2008-07-25 12:59:46 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
Fixed the inventory bug that's been reported in the forums

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/cursor.cpp
    scummvm/trunk/engines/tinsel/object.cpp

Modified: scummvm/trunk/engines/tinsel/cursor.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/cursor.cpp	2008-07-25 11:39:58 UTC (rev 33287)
+++ scummvm/trunk/engines/tinsel/cursor.cpp	2008-07-25 12:59:46 UTC (rev 33288)
@@ -368,8 +368,8 @@
 	assert(BackPal()); // no background palette
 	pim->hImgPal = TO_LE_32(BackPal());			// Poke in the background palette
 
-	ACoX = (short)(FROM_LE_16(pim->imgWidth)/2 - FROM_LE_16(pim->anioffX));
-	ACoY = (short)(FROM_LE_16(pim->imgHeight)/2 - FROM_LE_16(pim->anioffY));
+	ACoX = (short)(FROM_LE_16(pim->imgWidth)/2 - ((int16) FROM_LE_16(pim->anioffX)));
+	ACoY = (short)(FROM_LE_16(pim->imgHeight)/2 - ((int16) FROM_LE_16(pim->anioffY)));
 
 	// Initialise and insert the auxillary cursor object
 	AcurObj = MultiInitObject(pmi);

Modified: scummvm/trunk/engines/tinsel/object.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/object.cpp	2008-07-25 11:39:58 UTC (rev 33287)
+++ scummvm/trunk/engines/tinsel/object.cpp	2008-07-25 12:59:46 UTC (rev 33288)
@@ -297,10 +297,10 @@
 		const IMAGE *pImg = (const IMAGE *)LockMem(hImg);
 
 		// set ani X
-		*pAniX = FROM_LE_16(pImg->anioffX);
+		*pAniX = (int16) FROM_LE_16(pImg->anioffX);
 
 		// set ani Y
-		*pAniY = FROM_LE_16(pImg->anioffY);
+		*pAniY = (int16) FROM_LE_16(pImg->anioffY);
 
 		if (flags & DMA_FLIPH) {
 			// we are flipped horizontally


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