aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2012-11-23 02:43:38 +0100
committerJohannes Schickel2012-11-23 02:43:38 +0100
commitf5a3260ee8b31c7ff5d63fe8d5ac551cc30d14d5 (patch)
tree8dfbc6d01bbd604f80e435d99473e552b0cafa9f
parent7c2f5e2d0e1df26de3d18e12d1cf644fb80f20e6 (diff)
downloadscummvm-rg350-f5a3260ee8b31c7ff5d63fe8d5ac551cc30d14d5.tar.gz
scummvm-rg350-f5a3260ee8b31c7ff5d63fe8d5ac551cc30d14d5.tar.bz2
scummvm-rg350-f5a3260ee8b31c7ff5d63fe8d5ac551cc30d14d5.zip
KYRA: Properly mark digital sfx as sfx in HoF and LoL again.
This is a regression from e016e7dfc2b1e3cdb39c01d81c5a34eee66a277b.
-rw-r--r--engines/kyra/kyra_hof.cpp2
-rw-r--r--engines/kyra/script_tim.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index c53731ec35..b180285ffc 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -1448,7 +1448,7 @@ void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) {
int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]);
if (vocIndex != -1) {
- _sound->voicePlay(_ingameSoundList[vocIndex], 0, 255, true);
+ _sound->voicePlay(_ingameSoundList[vocIndex], 0, 255, 255, true);
} else if (_flags.platform == Common::kPlatformPC) {
if (_sound->getSfxType() == Sound::kMidiMT32)
track = track < _mt32SfxMapSize ? _mt32SfxMap[track] - 1 : -1;
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 177d7993a0..f031381524 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -736,7 +736,7 @@ int TIMInterpreter::cmd_playVocFile(const uint16 *param) {
const int volume = (param[1] * 255) / 100;
if (index < ARRAYSIZE(_vocFiles) && !_vocFiles[index].empty())
- _vm->sound()->voicePlay(_vocFiles[index].c_str(), 0, volume, true);
+ _vm->sound()->voicePlay(_vocFiles[index].c_str(), 0, volume, 255, true);
else if (index == 7 && !_vm->gameFlags().isTalkie)
_vm->sound()->playTrack(index);
else