diff options
Diffstat (limited to 'engines/sludge')
-rw-r--r-- | engines/sludge/main_loop.cpp | 5 | ||||
-rw-r--r-- | engines/sludge/movie.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/sludger.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/specialsettings.h | 29 |
4 files changed, 3 insertions, 39 deletions
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp index 29bbcd0f02..78ce63b6c3 100644 --- a/engines/sludge/main_loop.cpp +++ b/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); } diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp index 49a6919964..65b603065c 100644 --- a/engines/sludge/movie.cpp +++ b/engines/sludge/movie.cpp @@ -20,8 +20,6 @@ * */ -#include "sludge/specialsettings.h" - #include "sludge/newfatal.h" #include "sludge/timing.h" #include "sludge/movie.h" @@ -29,8 +27,6 @@ namespace Sludge { -extern int specialSettings; - // in main.c int checkInput(); extern int weAreDoneSoQuit; diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp index aed5fab9d8..e2b5e47517 100644 --- a/engines/sludge/sludger.cpp +++ b/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()); diff --git a/engines/sludge/specialsettings.h b/engines/sludge/specialsettings.h deleted file mode 100644 index adcececa40..0000000000 --- a/engines/sludge/specialsettings.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ -#define SPECIAL_REGISTERED 1 -#define SPECIAL_FULLSCREEN 2 -#define SPECIAL_MOUSE_1 4 -#define SPECIAL_SILENT 8 -#define SPECIAL_MOUSE_2 16 -#define SPECIAL_INVISIBLE 32 -#define SPECIAL_HIDELOGO 64 -#define SPECIAL_HIDELOADING 128 |