[Scummvm-cvs-logs] SF.net SVN: scummvm: [27486] scummvm/branches/branch-0-10-0/engines/gob/ scenery.cpp

[chrilith at users.sourceforge.net]

Revision: 27486
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27486&view=rev
Author:   chrilith
Date:     2007-06-16 13:29:39 -0700 (Sat, 16 Jun 2007)

Log Message:
-----------
Fixed invalid read from odd address in some cases (Gob1 EGA on PalmOS)

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/gob/scenery.cpp

Modified: scummvm/branches/branch-0-10-0/engines/gob/scenery.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/gob/scenery.cpp	2007-06-16 19:29:14 UTC (rev 27485)
+++ scummvm/branches/branch-0-10-0/engines/gob/scenery.cpp	2007-06-16 20:29:39 UTC (rev 27486)
@@ -666,10 +666,10 @@
 
 		pictIndex = (pictIndex & 15) - 1;
 
-		left = FROM_LE_16(pictPtr[pictIndex][pieceIndex].left);
-		right = FROM_LE_16(pictPtr[pictIndex][pieceIndex].right);
-		top = FROM_LE_16(pictPtr[pictIndex][pieceIndex].top);
-		bottom = FROM_LE_16(pictPtr[pictIndex][pieceIndex].bottom);
+		left = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].left);
+		right = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].right);
+		top = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].top);
+		bottom = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].bottom);
 
 		if (flags & 2) {
 			if (destX < _vm->_mult->_animLeft) {


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