[Scummvm-cvs-logs] scummvm master -> 84d1d28373d782464bd46b10abd6b092f7eb6367

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
84d1d28373 SCUMM: Read the SMAP size, not the SMAP tag itself


Commit: 84d1d28373d782464bd46b10abd6b092f7eb6367
    https://github.com/scummvm/scummvm/commit/84d1d28373d782464bd46b10abd6b092f7eb6367
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-18T00:28:54-07:00

Commit Message:
SCUMM: Read the SMAP size, not the SMAP tag itself

This will obviously make 'smapLen' a lot smaller in most cases, so
there may be regressions. But I hope this is correct, though I
don't know why the size is big-endian while the offset is little-
endian.

Changed paths:
    engines/scumm/gfx.cpp



diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 4c1fdaf..4d65ccc 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -1888,7 +1888,7 @@ bool Gdi::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width,
 		if (stripnr * 4 + 4 < smapLen)
 			offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 4);
 	} else {
-		smapLen = READ_BE_UINT32(smap_ptr);
+		smapLen = READ_BE_UINT32(smap_ptr + 4);
 		if (stripnr * 4 + 8 < smapLen)
 			offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 8);
 	}