aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorChris Apers2007-06-16 20:30:32 +0000
committerChris Apers2007-06-16 20:30:32 +0000
commit546fcc6195a831fd584494f143fa6e7ddcb923a7 (patch)
treed3f39be9b0eaa3e44980972005b4692d2d3486af /engines
parentfe8a7163cdd39c292e46e9713b26c6e07bf7faf0 (diff)
downloadscummvm-rg350-546fcc6195a831fd584494f143fa6e7ddcb923a7.tar.gz
scummvm-rg350-546fcc6195a831fd584494f143fa6e7ddcb923a7.tar.bz2
scummvm-rg350-546fcc6195a831fd584494f143fa6e7ddcb923a7.zip
Fixed invalid read from odd address in some cases (Gob1 EGA on PalmOS)
svn-id: r27487
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/scenery.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp
index 17f3af646a..ae04c220d3 100644
--- a/engines/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
@@ -666,10 +666,10 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
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) {