aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirben2016-03-01 20:36:36 +1100
committerKirben2016-03-01 20:36:36 +1100
commit27e5cfbd1b42c86c21339b474986e621e0e5dbf4 (patch)
treee7f658e48ca966e3944e02bb5e2273a712a1ff51
parente5974027ecd75683270190778c8d1a3cfbfc7b29 (diff)
downloadscummvm-rg350-27e5cfbd1b42c86c21339b474986e621e0e5dbf4.tar.gz
scummvm-rg350-27e5cfbd1b42c86c21339b474986e621e0e5dbf4.tar.bz2
scummvm-rg350-27e5cfbd1b42c86c21339b474986e621e0e5dbf4.zip
CINE: Fix sound effects stopping the music in the DOS CD version of Future Wars.
-rw-r--r--engines/cine/script_fw.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 6ad38f4433..86eb709d5a 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -1858,7 +1858,9 @@ int FWScript::o1_playSample() {
if (g_cine->getGameType() == Cine::GType_OS && size == 0) {
return 0;
}
- g_sound->stopMusic();
+ // The DOS CD version of Future Wars uses CD audio for music
+ if (!(g_cine->getGameType() == Cine::GType_FW && (g_cine->getFeatures() & GF_CD)))
+ g_sound->stopMusic();
if (size == 0xFFFF) {
g_sound->playSound(channel, 0, data, 0, 0, 0, volume, 0);
} else {