diff options
| author | richiesams | 2013-07-17 17:19:59 -0500 |
|---|---|---|
| committer | richiesams | 2013-08-04 13:32:24 -0500 |
| commit | e897a1bb2ae444cf812f2c11060585ccd2b48e4c (patch) | |
| tree | cc8db31ee811fe88967f485301ad99bff102ce39 | |
| parent | 134f8fda173731d744bd814d68850ce14fa4fd94 (diff) | |
| download | scummvm-rg350-e897a1bb2ae444cf812f2c11060585ccd2b48e4c.tar.gz scummvm-rg350-e897a1bb2ae444cf812f2c11060585ccd2b48e4c.tar.bz2 scummvm-rg350-e897a1bb2ae444cf812f2c11060585ccd2b48e4c.zip | |
ZVISION: Fix logic concerning whether a stream is packed or not
It was accidentally returning a raw stream for a ZorkStream and a ZorkStream for a raw
| -rw-r--r-- | engines/zvision/zork_raw.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp index cb031d6214..2ffe8eb3a6 100644 --- a/engines/zvision/zork_raw.cpp +++ b/engines/zvision/zork_raw.cpp @@ -178,13 +178,14 @@ Audio::AudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *e } if (soundParams.packed) { + return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES); + } else { byte flags = 0; if (soundParams.stereo) flags |= Audio::FLAG_STEREO; + return Audio::makeRawStream(file, soundParams.rate, flags, DisposeAfterUse::YES); } - else - return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES); } } // End of namespace ZVision |