aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-05-01 22:26:30 +0000
committerMax Horn2003-05-01 22:26:30 +0000
commit73ab9b26ad1ce3966f6e6fd1f4cc34404002d400 (patch)
treee454590242a7352e52fadd7d414c720d8418e514 /scumm
parent0b265f8608ba203c002280d3c85dbc1c51237f6b (diff)
downloadscummvm-rg350-73ab9b26ad1ce3966f6e6fd1f4cc34404002d400.tar.gz
scummvm-rg350-73ab9b26ad1ce3966f6e6fd1f4cc34404002d400.tar.bz2
scummvm-rg350-73ab9b26ad1ce3966f6e6fd1f4cc34404002d400.zip
umpf
svn-id: r7256
Diffstat (limited to 'scumm')
-rw-r--r--scumm/resource.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index be9dc63f10..085c1f3701 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -485,8 +485,8 @@ void Scumm::readResTypeList(int id, uint32 tag, const char *name) {
}
for (i = 0; i < num; i++) {
res.roomoffs[id][i] = _fileHandle.readUint16LE();
- if (roomoffs[id][i] == 0xFFFF)
- roomoffs[id][i] = 0xFFFFFFFF;
+ if (res.roomoffs[id][i] == 0xFFFF)
+ res.roomoffs[id][i] = 0xFFFFFFFF;
}
} else if (_features & GF_SMALL_HEADER) {
@@ -623,6 +623,9 @@ int Scumm::loadResource(int type, int idx) {
openRoom(roomNr);
_fileHandle.seek(fileOffs + _fileOffset, SEEK_SET);
+if (type == rtSound) {
+ printf("fileOffs = %d, _fileOffset = %d\n", fileOffs, _fileOffset);
+}
if (_features & GF_OLD_BUNDLE) {
size = _fileHandle.readUint16LE();
@@ -661,6 +664,10 @@ int Scumm::loadResource(int type, int idx) {
dumpResource("script-", idx, getResourceAddress(rtScript, idx));
}
+ if (type == rtSound) {
+ dumpResource("sound-", idx, getResourceAddress(rtScript, idx));
+ }
+
if (!_fileHandle.ioFailed()) {
return 1;
}