diff options
author | Travis Howell | 2010-01-23 03:02:56 +0000 |
---|---|---|
committer | Travis Howell | 2010-01-23 03:02:56 +0000 |
commit | ed1de6e2081efc23bcdcc7f94aec9cca043f4a52 (patch) | |
tree | b78c8ad762043e308998cd4aa8b9f4acd42448ca /engines | |
parent | 8508a97adde127b151d80d003b19f73160938f52 (diff) | |
download | scummvm-rg350-ed1de6e2081efc23bcdcc7f94aec9cca043f4a52.tar.gz scummvm-rg350-ed1de6e2081efc23bcdcc7f94aec9cca043f4a52.tar.bz2 scummvm-rg350-ed1de6e2081efc23bcdcc7f94aec9cca043f4a52.zip |
Fix regressions, only the Amiga CD32 version of Simon the Sorcerer 1 used signed sound data.
svn-id: r47460
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agos/sound.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 835851e9c2..c8ff9a6732 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -482,7 +482,7 @@ void Sound::loadVoiceFile(const GameSpecificSettings *gss) { } } - const bool dataIsUnsigned = (_vm->getGameType() == GType_PP); + const bool dataIsUnsigned = true; if (!_hasVoiceFile) { sprintf(filename, "%s.voc", gss->speech_filename); @@ -514,7 +514,7 @@ void Sound::loadSfxFile(const GameSpecificSettings *gss) { _hasEffectsFile = (_effects != 0); } - const bool dataIsUnsigned = (_vm->getGameType() == GType_PP || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32); + const bool dataIsUnsigned = true; if (!_hasEffectsFile) { sprintf(filename, "%s.voc", gss->effects_filename); @@ -534,7 +534,7 @@ void Sound::loadSfxFile(const GameSpecificSettings *gss) { } } -// This method is only used by Simon1 Amiga Talkie & Windows +// This method is only used by Simon1 Amiga CD32 & Windows void Sound::readSfxFile(const Common::String &filename) { if (_hasEffectsFile) return; @@ -548,7 +548,7 @@ void Sound::readSfxFile(const Common::String &filename) { error("readSfxFile: Can't load sfx file %s", filename.c_str()); } - const bool dataIsUnsigned = (_vm->getGameType() == GType_PP || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32); + const bool dataIsUnsigned = (_vm->getGameId() != GID_SIMON1CD32); delete _effects; if (_vm->getGameId() == GID_SIMON1CD32) { @@ -562,14 +562,14 @@ void Sound::loadSfxTable(File *gameFile, uint32 base) { stopAll(); delete _effects; - const bool dataIsUnsigned = false; + const bool dataIsUnsigned = true; if (_vm->getPlatform() == Common::kPlatformWindows) _effects = new WavSound(_mixer, gameFile, base, DisposeAfterUse::NO); else - _effects = new VocSound(_mixer, gameFile, dataIsUnsigned, base, DisposeAfterUse::NO); + _effects = new VocSound(_mixer, gameFile, dataIsUnsigned, base, false, DisposeAfterUse::NO); } -// This method is only used by Simon1 Amiga Talkie +// This method is only used by Simon1 Amiga CD32 void Sound::readVoiceFile(const Common::String &filename) { _mixer->stopHandle(_voiceHandle); @@ -579,7 +579,7 @@ void Sound::readVoiceFile(const Common::String &filename) { if (file->isOpen() == false) error("readVoiceFile: Can't load voice file %s", filename.c_str()); - const bool dataIsUnsigned = (_vm->getGameType() == GType_PP || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32); + const bool dataIsUnsigned = false; delete _voice; _voice = new RawSound(_mixer, file, dataIsUnsigned); |