aboutsummaryrefslogtreecommitdiff
path: root/engines/director
diff options
context:
space:
mode:
Diffstat (limited to 'engines/director')
-rw-r--r--engines/director/archive.cpp2
-rw-r--r--engines/director/resource.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index d35f6b6803..340db3d9c1 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -293,7 +293,7 @@ bool RIFFArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
ResourceMap &resMap = _types[tag];
Resource &res = resMap[id];
- res.offset = offset;
+ res.offset = offset + startOffset;
res.size = size;
res.name = name;
}
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index d0a1ce8289..dc961b86eb 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -143,6 +143,8 @@ void DirectorEngine::loadEXEv3(Common::SeekableReadStream *stream) {
if (!_mainArchive->openStream(stream, riffOffset))
error("Failed to load RIFF from EXE");
+
+ return;
}
openMainArchive(mmmFileName);