libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 18:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: FROTZ: Fix reading placeholder rects from Blorb files

Browse Source
This commit is contained in:
Paul Gilbert 2019-07-27 19:57:37 -07:00
parent 3457d3155e
commit f515394e78
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/glk/frotz/pics.cpp
View File

@ -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();

4
engines/glk/picture.cpp
View File

@ -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