[Scummvm-cvs-logs] scummvm branch-1-8 -> 181a3ad20fc9973302376d2d504259bd46b8568f

[Kirben]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c3697b9da7 CINE: Fix restoring background music when loading saved game in DOS CD version of Future Wars.
181a3ad20f CINE: Fix sound effects stopping the music in the DOS CD version of Future Wars.


Commit: c3697b9da7547bd629f038d9cf122ad95860e097
    https://github.com/scummvm/scummvm/commit/c3697b9da7547bd629f038d9cf122ad95860e097
Author: Kirben (kirben at optusnet.com.au)
Date: 2016-03-02T19:22:26+11:00

Commit Message:
CINE: Fix restoring background music when loading saved game in DOS CD version of Future Wars.

Changed paths:
    engines/cine/saveload.cpp



diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 1f4f286..dfd3a1f 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -691,6 +691,11 @@ bool CineEngine::loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFor
 	}
 
 	if (strlen(bgName)) {
+		if (g_cine->getGameType() == GType_FW && (g_cine->getFeatures() & GF_CD)) {
+			char buffer[20];
+			removeExtention(buffer, bgName);
+			g_sound->setBgMusic(atoi(buffer + 1));
+		}
 		loadBg(bgName);
 	}
 


Commit: 181a3ad20fc9973302376d2d504259bd46b8568f
    https://github.com/scummvm/scummvm/commit/181a3ad20fc9973302376d2d504259bd46b8568f
Author: Kirben (kirben at optusnet.com.au)
Date: 2016-03-02T19:22:26+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 {