From 30a92bec6be657df29881de8075c5075f2289e28 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 16 Jul 2010 23:02:17 +0000
Subject: Removed unused variables.

svn-id: r50947
---
 engines/gob/inter_playtoons.cpp | 2 --
 engines/gob/mult_v2.cpp         | 2 --
 2 files changed, 4 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp
index c9b962579b..142467b47f 100644
--- a/engines/gob/inter_playtoons.cpp
+++ b/engines/gob/inter_playtoons.cpp
@@ -362,7 +362,6 @@ void Inter_Playtoons::oPlaytoons_getObjAnimSize() {
 	int16 objIndex;
 	uint16 readVar[4];
 	uint8 i;
-	bool break_fl;
 	Mult::Mult_AnimData animData;
 
 	_vm->_game->_script->evalExpr(&objIndex);
@@ -375,7 +374,6 @@ void Inter_Playtoons::oPlaytoons_getObjAnimSize() {
 		return;
 	}
 	if (objIndex == -2) {
-		break_fl = false;
 		warning("oPlaytoons_getObjAnimSize case -2 not implemented");
 		return;
 	}
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 88b604023c..6acd096e58 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -1149,7 +1149,6 @@ void Mult_v2::playImd(const char *imdFile, Mult::Mult_ImdKey &key, int16 dir,
 void Mult_v2::advanceObjects(int16 index) {
 	int16 frame;
 	bool stop = false;
-	bool hasImds = false;
 
 	frame = _multData->animKeysFrames[index];
 	if (frame == -1)
@@ -1254,7 +1253,6 @@ void Mult_v2::advanceObjects(int16 index) {
 			if ((dir != 1) && (--startFrame < 0))
 				startFrame = 0;
 
-			hasImds = true;
 			playImd(imdFile, key, dir, startFrame);
 		}
 	}
-- 
cgit v1.2.3


From 7424d39a980848e9c6783aae039aae28a4fa2b5a Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Tue, 27 Jul 2010 17:14:33 +0000
Subject: GOB: Respect mute option on startup (bug #3032781)

svn-id: r51379
---
 engines/gob/gob.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index ddeac25baa..f904c8c802 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -126,8 +126,13 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst) {
 	_pauseStart = 0;
 
 	// Setup mixer
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	bool muteSFX   = ConfMan.getBool("mute") || ConfMan.getBool("sfx_mute");
+	bool muteMusic = ConfMan.getBool("mute") || ConfMan.getBool("music_mute");
+
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType,
+			muteSFX   ? 0 : ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType,
+			muteMusic ? 0 : ConfMan.getInt("music_volume"));
 
 	_copyProtection = ConfMan.getBool("copy_protection");
 
-- 
cgit v1.2.3