From ca4789c2ffff32213aaf90f656524f44f83d5830 Mon Sep 17 00:00:00 2001 From: James Brown Date: Tue, 20 Aug 2002 09:58:35 +0000 Subject: Fix lighting on actors in V6+ games (eg, Sam and Max) Move boxflags debug to debug level 2 (we default to 1) Apply patches: 595414: Simon 2 lockup workarounds 595875: Simon 2 save/load dialog fix 597422: Preliminary support for CREA sound format (for FT) 597627: Use savedir for save/load-string opcodes svn-id: r4779 --- resource.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'resource.cpp') diff --git a/resource.cpp b/resource.cpp index 5a214f282f..89e825481f 100644 --- a/resource.cpp +++ b/resource.cpp @@ -721,6 +721,11 @@ int Scumm::readSoundResource(int type, int idx) debug(1, "Found base tag DIGI in sound %d, size %d", idx, total_size); debug(1, "It was at position %d", filePos(_fileHandle)); + fileSeek(_fileHandle, -12, SEEK_CUR); + total_size = fileReadDwordBE(); + fileRead(_fileHandle, createResource(type, idx, total_size), total_size - 8); + return 1; + } else if (basetag == MKID('Crea')) { fileSeek(_fileHandle, -12, SEEK_CUR); total_size = fileReadDwordBE(); fileRead(_fileHandle, createResource(type, idx, total_size), total_size - 8); @@ -837,7 +842,6 @@ void Scumm::nukeResource(int type, int idx) { byte *ptr; - debug(9, "nukeResource(%s,%d)", resTypeFromId(type), idx); CHECK_HEAP if (!res.address[type]) return; @@ -845,6 +849,7 @@ void Scumm::nukeResource(int type, int idx) assert(idx >= 0 && idx < res.num[type]); if ((ptr = res.address[type][idx]) != NULL) { + debug(9, "nukeResource(%s,%d)", resTypeFromId(type), idx); res.address[type][idx] = 0; res.flags[type][idx] = 0; _allocatedSize -= ((MemBlkHeader *)ptr)->size; -- cgit v1.2.3