[Scummvm-cvs-logs] scummvm master -> 27e5cfbd1b42c86c21339b474986e621e0e5dbf4

[Kirben]

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:
27e5cfbd1b CINE: Fix sound effects stopping the music in the DOS CD version of Future Wars.


Commit: 27e5cfbd1b42c86c21339b474986e621e0e5dbf4
    https://github.com/scummvm/scummvm/commit/27e5cfbd1b42c86c21339b474986e621e0e5dbf4
Author: Kirben (kirben at optusnet.com.au)
Date: 2016-03-01T20:36:36+11:00

Commit Message:
CINE: Fix sound effects stopping the music in the DOS CD version of Future Wars.

Changed paths:
    engines/cine/script_fw.cpp



diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 6ad38f4..86eb709 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 {