thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZVISION: Fix logic concerning whether a stream is packed or not

Browse source 
It was accidentally returning a raw stream for a ZorkStream and a ZorkStream for a raw
This commit is contained in:
richiesams 2013-07-17 17:19:59 -05:00
parent 134f8fda17
commit e897a1bb2a
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/zvision/zork_raw.cpp
View file

@ -178,13 +178,14 @@ Audio::AudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *e
} }
if (soundParams.packed) { if (soundParams.packed) {
return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES);
} else {
byte flags = 0; byte flags = 0;
if (soundParams.stereo) if (soundParams.stereo)
flags |= Audio::FLAG_STEREO; flags |= Audio::FLAG_STEREO;
return Audio::makeRawStream(file, soundParams.rate, flags, DisposeAfterUse::YES); 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 } // End of namespace ZVision