diff options
| author | Martin Kiewitz | 2015-06-21 11:20:01 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-06-21 11:20:01 +0200 |
| commit | 371d5e1d904898a01292db26703d38ee90558bbd (patch) | |
| tree | 406e96a1487b976c982de7b7ea6b91db38c0a828 /engines | |
| parent | 155d5541834d220a7b7fe8b73dcf12c65dff6cc3 (diff) | |
| parent | 2e8fd745480e545ffdd6f653a5db48ff033b3fb8 (diff) | |
| download | scummvm-rg350-371d5e1d904898a01292db26703d38ee90558bbd.tar.gz scummvm-rg350-371d5e1d904898a01292db26703d38ee90558bbd.tar.bz2 scummvm-rg350-371d5e1d904898a01292db26703d38ee90558bbd.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/zones.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 812f46504f..78c67b2080 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -684,7 +684,7 @@ void Sound::playRawData(byte *soundData, uint sound, uint size, uint freq) { memcpy(buffer, soundData, size); byte flags = 0; - if (_vm->getPlatform() == Common::kPlatformDOS) + if (_vm->getPlatform() == Common::kPlatformDOS && _vm->getGameId() != GID_ELVIRA2) flags = Audio::FLAG_UNSIGNED; Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, freq, flags); diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp index 1644213579..5a753d9b4b 100644 --- a/engines/agos/zones.cpp +++ b/engines/agos/zones.cpp @@ -94,8 +94,7 @@ void AGOSEngine::loadZone(uint16 zoneNum, bool useError) { vpe->sfxFile = NULL; - if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) && - getGameType() == GType_ELVIRA2) { + if (getGameType() == GType_ELVIRA2) { // A singe sound file is used for Amiga and AtariST versions if (loadVGASoundFile(1, 3)) { vpe->sfxFile = _block; |