diff options
| author | James Brown | 2002-08-20 09:58:35 +0000 |
|---|---|---|
| committer | James Brown | 2002-08-20 09:58:35 +0000 |
| commit | ca4789c2ffff32213aaf90f656524f44f83d5830 (patch) | |
| tree | a752532146bea5e2d8d1a319801e3b09c5a0e782 /resource.cpp | |
| parent | f3ceaf7f81246a3ddc5e09b2710d2627a3a412ba (diff) | |
| download | scummvm-rg350-ca4789c2ffff32213aaf90f656524f44f83d5830.tar.gz scummvm-rg350-ca4789c2ffff32213aaf90f656524f44f83d5830.tar.bz2 scummvm-rg350-ca4789c2ffff32213aaf90f656524f44f83d5830.zip | |
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
Diffstat (limited to 'resource.cpp')
| -rw-r--r-- | resource.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/resource.cpp b/resource.cpp index 5a214f282f..89e825481f 100644 --- a/resource.cpp +++ b/resource.cpp @@ -725,6 +725,11 @@ int Scumm::readSoundResource(int type, int idx) 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); + return 1; } else { fprintf(stderr, "WARNING: Unrecognized base tag 0x%08lx in sound %d\n", basetag, idx); } @@ -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; |