SLUDGE: Remove special settings

engines/sludge/main_loop.cpp

@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/events.h"
 #include "common/keyboard.h"
@@ -45,7 +46,6 @@
 #include "sludge/sludger.h"
 #include "sludge/helpers.h"
 #include "sludge/sludge.h"
-#include "sludge/specialsettings.h"
 
 namespace Sludge {
 
@@ -58,7 +58,6 @@ HWND hMainWindow = NULL;
 int realWinWidth = 640, realWinHeight = 480;
 extern float cameraZoom;
 
-extern int specialSettings;
 extern inputType input;
 extern variableStack *noStack;
 Graphics::Surface renderSurface;
@@ -182,7 +181,7 @@ int main_loop(const char *filename)
 
 	g_sludge->gameName = getNumberedString(1);
 
-	if (!(specialSettings & SPECIAL_SILENT)) {
+	if (!ConfMan.hasKey("mute") || !ConfMan.getBool("mute")) {
 		initSoundStuff(hMainWindow);
 	}
 

engines/sludge/movie.cpp

@@ -20,17 +20,13 @@
  *
  */
 
-#include "sludge/specialsettings.h"
-
 #include "sludge/newfatal.h"
 #include "sludge/timing.h"
 #include "sludge/movie.h"
 #include "sludge/sound.h"
 
 namespace Sludge {
 
-extern int specialSettings;
-
 // in main.c
 int checkInput();
 extern int weAreDoneSoQuit;

engines/sludge/sludger.cpp

@@ -47,7 +47,6 @@
 #include "sludge/language.h"
 #include "sludge/variable.h"
 #include "sludge/sludge.h"
-#include "sludge/specialsettings.h"
 #include "sludge/version.h"
 #include "sludge/imgloader.h"
 
@@ -69,7 +68,6 @@ int selectedLanguage = 0;
 int languageNum = -1;
 
 int gameVersion;
-int specialSettings;
 FILETIME fileTime;
 bool captureAllKeys = false;
 
@@ -218,7 +216,7 @@ bool initSludge(const Common::String &filename) {
 	debug(kSludgeDebugDataLoad, "winWidth : %i", winWidth);
 	winHeight = fp->readUint16BE();
 	debug(kSludgeDebugDataLoad, "winHeight : %i", winHeight);
-	specialSettings = fp->readByte();
+	int specialSettings = fp->readByte();
 	debug(kSludgeDebugDataLoad, "specialSettings : %i", specialSettings);
 	g_sludge->_timer.setDesiredfps(1000 / fp->readByte());