From de0b5b62ab9171fc9839b7804a0f2b56fe0da9a9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 28 Dec 2015 00:35:43 +0100
Subject: CINE: Let makeLoad take a Common::String as parameter.

---
 engines/cine/saveload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/cine/saveload.cpp')

diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 907086a9a1..1f4f286694 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -969,7 +969,7 @@ void CineEngine::makeSaveOS(Common::OutSaveFile &out) {
 	saveBgIncrustList(out);
 }
 
-void CineEngine::makeSave(char *saveFileName) {
+void CineEngine::makeSave(const Common::String &saveFileName) {
 	Common::SharedPtr<Common::OutSaveFile> fHandle(_saveFileMan->openForSaving(saveFileName));
 
 	setMouseCursor(MOUSE_CURSOR_DISK);
-- 
cgit v1.2.3


From e5974027ecd75683270190778c8d1a3cfbfc7b29 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Tue, 1 Mar 2016 20:06:48 +1100
Subject: CINE: Fix restoring background music when loading saved game in DOS
 CD version of Future Wars.

---
 engines/cine/saveload.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/cine/saveload.cpp')

diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 1f4f286694..dfd3a1f4bc 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);
 	}
 
-- 
cgit v1.2.3