aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
authorKirben2015-06-21 19:14:54 +1000
committerKirben2015-06-21 19:14:54 +1000
commit2e8fd745480e545ffdd6f653a5db48ff033b3fb8 (patch)
treec46ecdb1904c89f95cabb8617407c711909276ee /engines/agos
parent5f77bcc74c1aac5179c78c53c69e73b0fdf37858 (diff)
downloadscummvm-rg350-2e8fd745480e545ffdd6f653a5db48ff033b3fb8.tar.gz
scummvm-rg350-2e8fd745480e545ffdd6f653a5db48ff033b3fb8.tar.bz2
scummvm-rg350-2e8fd745480e545ffdd6f653a5db48ff033b3fb8.zip
AGOS: Allow digital sound effects file to be used in PC version of Elvira 2.
Diffstat (limited to 'engines/agos')
-rw-r--r--engines/agos/sound.cpp2
-rw-r--r--engines/agos/zones.cpp3
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;