[Scummvm-cvs-logs] scummvm master -> 2e8fd745480e545ffdd6f653a5db48ff033b3fb8
Kirben
kirben at optusnet.com.au
Sun Jun 21 11:16:22 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2e8fd74548 AGOS: Allow digital sound effects file to be used in PC version of Elvira 2.
Commit: 2e8fd745480e545ffdd6f653a5db48ff033b3fb8
https://github.com/scummvm/scummvm/commit/2e8fd745480e545ffdd6f653a5db48ff033b3fb8
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-06-21T19:14:54+10:00
Commit Message:
AGOS: Allow digital sound effects file to be used in PC version of Elvira 2.
Changed paths:
engines/agos/sound.cpp
engines/agos/zones.cpp
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 812f465..78c67b2 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 1644213..5a753d9 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;
More information about the Scummvm-git-logs
mailing list