aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2015-04-09 00:12:18 +0200
committerStrangerke2015-04-09 00:12:18 +0200
commitd45d1672137843d028c4ddf63ccf9b62d5d72976 (patch)
tree53ec365f1c0119b55bacf2c786af1f72d37f63a5
parent49fd689c07be266cf0ad40d3510ac875ac81174c (diff)
downloadscummvm-rg350-d45d1672137843d028c4ddf63ccf9b62d5d72976.tar.gz
scummvm-rg350-d45d1672137843d028c4ddf63ccf9b62d5d72976.tar.bz2
scummvm-rg350-d45d1672137843d028c4ddf63ccf9b62d5d72976.zip
SHERLOCK: Fix regression in image loading
-rw-r--r--engines/sherlock/resources.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 0d66646286..262832c3c3 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -298,8 +298,8 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
frame._width = stream.readUint16LE() + 1;
frame._height = stream.readUint16LE() + 1;
frame._paletteBase = stream.readByte();
- frame._rleEncoded = stream.readByte() == 1;
- frame._offset.x = stream.readByte();
+ frame._offset.x = stream.readUint16LE();
+ frame._rleEncoded = ((frame._offset.x & 0xFF) == 1);
frame._offset.y = stream.readByte();
frame._rleEncoded = !skipPalette && frame._rleEncoded;