diff options
| author | Eugene Sandulenko | 2017-03-21 23:24:06 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-03-21 23:44:51 +0100 |
| commit | 71b4514281a735f3534fcf8bb582314c406f9149 (patch) | |
| tree | 89773fee06a6478f4b962ef6cd57a513ac2801f7 /engines | |
| parent | 0e345845730371a12930dde13db1da1e9c00901b (diff) | |
| download | scummvm-rg350-71b4514281a735f3534fcf8bb582314c406f9149.tar.gz scummvm-rg350-71b4514281a735f3534fcf8bb582314c406f9149.tar.bz2 scummvm-rg350-71b4514281a735f3534fcf8bb582314c406f9149.zip | |
DIRECTOR: Fix loading from built-in movie
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/director/archive.cpp | 2 | ||||
| -rw-r--r-- | engines/director/resource.cpp | 2 |
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); |