diff options
| author | vanfanel | 2015-11-11 17:56:12 +0100 |
|---|---|---|
| committer | vanfanel | 2015-11-11 17:56:12 +0100 |
| commit | 99739a13fe844c807d3cdd87e67e207e888fd48a (patch) | |
| tree | 6afbf4763326277efbf528f0bb9e587bf7a01788 /engines/zvision/sound | |
| parent | 37e157a11c3fc731dfdcf6ec6b6a5a448550219b (diff) | |
| parent | 7e44493fe8877a3c6a65f83b9ed84a5f59169005 (diff) | |
| download | scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.gz scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.bz2 scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.zip | |
Merge branch 'master' into dispmanx
Diffstat (limited to 'engines/zvision/sound')
| -rw-r--r-- | engines/zvision/sound/zork_raw.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp index 0ef5de2f55..124235e0e0 100644 --- a/engines/zvision/sound/zork_raw.cpp +++ b/engines/zvision/sound/zork_raw.cpp @@ -33,7 +33,6 @@ #include "zvision/sound/zork_raw.h" #include "zvision/zvision.h" -#include "zvision/detection.h" namespace ZVision { @@ -136,7 +135,8 @@ int RawChunkStream::readBuffer(int16 *buffer, Common::SeekableReadStream *stream return bytesRead; } -const SoundParams RawZorkStream::_zNemSoundParamLookupTable[32] = {{'0', 0x1F40, false, false, false}, +const SoundParams RawZorkStream::_zNemSoundParamLookupTable[32] = { + {'0', 0x1F40, false, false, false}, {'1', 0x1F40, true, false, false}, {'2', 0x1F40, false, false, true}, {'3', 0x1F40, true, false, true}, @@ -170,7 +170,8 @@ const SoundParams RawZorkStream::_zNemSoundParamLookupTable[32] = {{'0', 0x1F40, {'x', 0xAC44, true, true, true} }; -const SoundParams RawZorkStream::_zgiSoundParamLookupTable[24] = {{'4', 0x2B11, false, false, false}, +const SoundParams RawZorkStream::_zgiSoundParamLookupTable[24] = { + {'4', 0x2B11, false, false, false}, {'5', 0x2B11, true, false, false}, {'6', 0x2B11, false, false, true}, {'7', 0x2B11, true, false, true}, @@ -256,9 +257,9 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, actualName.setChar('c', actualName.size() - 1); if (!engine->getSearchManager()->openFile(*file, actualName)) - error("File not found: %s", actualName.c_str()); + return NULL; } else if (!found && !isRaw) { - error("File not found: %s", actualName.c_str()); + return NULL; } // Get the file name |