diff options
| author | Max Horn | 2007-04-01 15:58:34 +0000 |
|---|---|---|
| committer | Max Horn | 2007-04-01 15:58:34 +0000 |
| commit | 2447752a51ded9f6f70d392c8f572dd94eb5d65c (patch) | |
| tree | 20c8077f00513839eed5e3fa949e204abb21898f /engines/scumm/sound.cpp | |
| parent | a97ab92dd95ead2bda8f99db163896d479adf886 (diff) | |
| download | scummvm-rg350-2447752a51ded9f6f70d392c8f572dd94eb5d65c.tar.gz scummvm-rg350-2447752a51ded9f6f70d392c8f572dd94eb5d65c.tar.bz2 scummvm-rg350-2447752a51ded9f6f70d392c8f572dd94eb5d65c.zip | |
Reverted my roomoffs changes (broke the Loom intro), and instead added the constant RES_INVALID_OFFSET to indicate an invalid room offset
svn-id: r26353
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index c2fb48a653..9f29418ca6 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1221,7 +1221,7 @@ int ScummEngine::readSoundResource(int type, int idx) { debugC(DEBUG_SOUND, "FMUS file %s", buffer); if (dmuFile.open(buffer) == false) { error("Can't open music file %s*", buffer); - _res->roomoffs[type][idx] = -1; + _res->roomoffs[type][idx] = RES_INVALID_OFFSET; return 0; } dmuFile.seek(4, SEEK_SET); @@ -1245,7 +1245,7 @@ int ScummEngine::readSoundResource(int type, int idx) { } error("Unrecognized base tag 0x%08x in sound %d", basetag, idx); } - _res->roomoffs[type][idx] = -1; + _res->roomoffs[type][idx] = RES_INVALID_OFFSET; return 0; } @@ -2107,7 +2107,7 @@ int ScummEngine::readSoundResourceSmallHeader(int type, int idx) { _fileHandle->read(_res->createResource(type, idx, ro_size - 4), ro_size - 4); return 1; } - _res->roomoffs[type][idx] = -1; + _res->roomoffs[type][idx] = RES_INVALID_OFFSET; return 0; } |