diff options
author | Filippos Karapetis | 2014-12-25 21:19:19 +0200 |
---|---|---|
committer | Filippos Karapetis | 2014-12-25 21:19:19 +0200 |
commit | 11cf9b53ba138b5e069d7ffbd6af7f36b26a9add (patch) | |
tree | 64eedceb267d6bf3114c98d80139b903af693dea /engines/zvision/sound/zork_raw.cpp | |
parent | dbbcf641874ace35b871226664370413de176c37 (diff) | |
download | scummvm-rg350-11cf9b53ba138b5e069d7ffbd6af7f36b26a9add.tar.gz scummvm-rg350-11cf9b53ba138b5e069d7ffbd6af7f36b26a9add.tar.bz2 scummvm-rg350-11cf9b53ba138b5e069d7ffbd6af7f36b26a9add.zip |
ZVISION: Remove dead code, and fix bad usage of assert()
Since some compilers, like MSVC, strip out asserts in non-debug builds,
it's a bad idea to perform active commands within assert() statements.
In this particular case, the engine would attempt to open a file in an
assert statement
Diffstat (limited to 'engines/zvision/sound/zork_raw.cpp')
-rw-r--r-- | engines/zvision/sound/zork_raw.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp index b2c88b34df..6d1980b1af 100644 --- a/engines/zvision/sound/zork_raw.cpp +++ b/engines/zvision/sound/zork_raw.cpp @@ -213,7 +213,6 @@ RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag dis } int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) { - int32 bytesRead = _streamReader.readBuffer(buffer, _stream.get(), numSamples); if (_stream->eos()) @@ -241,16 +240,10 @@ Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stre return new RawZorkStream(rate, stereo, disposeAfterUse, stream); } -Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size, - int rate, - bool stereo, - DisposeAfterUse::Flag disposeAfterUse) { - return makeRawZorkStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, stereo, DisposeAfterUse::YES); -} - Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine) { Common::File *file = new Common::File(); - assert(engine->getSearchManager()->openFile(*file, filePath)); + if (!engine->getSearchManager()->openFile(*file, filePath)) + error("File not found: %s", filePath.c_str()); // Get the file name Common::StringTokenizer tokenizer(filePath, "/\\"); |