GLK: FROTZ: Fix reading placeholder rects from Blorb files

scummvm · Jul 28, 2019 · f515394 · f515394
1 parent 3457d31
commit f515394
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/engines/glk/frotz/pics.cpp b/engines/glk/frotz/pics.cpp
@@ -156,10 +156,10 @@ Common::SeekableReadStream *Pics::createReadStreamForMember(const Common::String
 				dest = decoder.decode(*src, e._flags, *_palette, kMCGA, e._width, e._height);
 				delete src;
 			} else {
-				byte *rect = (byte *)malloc(2 * sizeof(uint16));
-				WRITE_LE_UINT16(rect, e._width);
-				WRITE_LE_UINT16(rect + 2, e._height);
-				dest = new Common::MemoryReadStream(rect, 2 * sizeof(uint16), DisposeAfterUse::YES);
+				byte *rect = (byte *)malloc(2 * sizeof(uint32));
+				WRITE_BE_UINT32(rect, e._width);
+				WRITE_BE_UINT32(rect + 4, e._height);
+				dest = new Common::MemoryReadStream(rect, 2 * sizeof(uint32), DisposeAfterUse::YES);
 			}
 
 			f.close();

diff --git a/engines/glk/picture.cpp b/engines/glk/picture.cpp
@@ -135,8 +135,8 @@ Picture *Pictures::load(uint32 id) {
 		palCount = raw.getPaletteColorCount();
 		transColor = raw.getTransparentColor();
 	} else if (f.open(Common::String::format("pic%u.rect", id))) {
-		rectImg.w = f.readUint16LE();
-		rectImg.h = f.readUint16LE();
+		rectImg.w = f.readUint32BE();
+		rectImg.h = f.readUint32BE();
 		img = &rectImg;
 	} else {
 		// No such picture