libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 14:51:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI32: Add support for raw reading of array structures

Browse Source 
These are structures which are stored in the ARC files of the Behind
the Developer's Shield and Inside the Chest demos, included in several
editions of the King's Quest Collection.

The number of elements and element size of each array element are
stored with each array, and are read as raw bytes. We don't need these
in ScummVM, so we skip them.

This change allows the two demos to function fully and correctly now.

Special thanks to sluicebox for working on these files and their
associated game scripts, and figuring out these extra bytes, which
have remained a mystery up to now.
This commit is contained in:
Filippos Karapetis 2020-01-21 00:57:44 +02:00
parent 54f42fb532
commit 3f53bd05f1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/sci/engine/kfile.cpp
View File

@ -584,17 +584,29 @@ reg_t kFileIOClose(EngineState *s, int argc, reg_t *argv) {
reg_t kFileIOReadRaw(EngineState *s, int argc, reg_t *argv) {
uint16 handle = argv[0].toUint16();
reg_t dest = argv[1];
uint16 size = argv[2].toUint16();
int bytesRead = 0;
byte *buf = new byte[size];
debugC(kDebugLevelFile, "kFileIO(readRaw): %d, %d", handle, size);
FileHandle *f = getFileFromHandle(s, handle);
if (f)
if (f) {
SegmentRef destReference = s->_segMan->dereference(dest);
if (destReference.maxSize == size - 4) {
// This is an array structure, which starts with the number of
// elements in the array and the size of each element. Skip
// these bytes. These structures are stored in the ARC files of
// the Behind the Developer's Shield and Inside the Chest demos.
f->_in->skip(4);
size -= 4;
}
bytesRead = f->_in->read(buf, size);
}
if (bytesRead > 0)
s->_segMan->memcpy(argv[1], buf, bytesRead);
s->_segMan->memcpy(dest, buf, bytesRead);
delete[] buf;
return make_reg(0, bytesRead);