From 3975fd7215fa0b97249231f965837729be21e554 Mon Sep 17 00:00:00 2001 From: yinsimei Date: Mon, 5 Jun 2017 22:54:34 +0200 Subject: SLUDGE: remove showSetupWindow --- engines/sludge/platform-dependent.h | 1 - engines/sludge/sludger.cpp | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/engines/sludge/platform-dependent.h b/engines/sludge/platform-dependent.h index 0296bc1382..bf36f5f710 100644 --- a/engines/sludge/platform-dependent.h +++ b/engines/sludge/platform-dependent.h @@ -28,7 +28,6 @@ namespace Sludge { char *grabFileName(); -int showSetupWindow(); void msgBox(const char *head, const char *msg); int msgBoxQuestion(const char *head, const char *msg); diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp index 0b99d79c39..ea716266d8 100644 --- a/engines/sludge/sludger.cpp +++ b/engines/sludge/sludger.cpp @@ -527,17 +527,13 @@ bool initSludge(char *filename) { // There's no startup window on Linux and respecting this // option from the ini file would disable commandline options. #if defined __unix__ && !(defined __APPLE__) -#if 0 - if (!showSetupWindow()) return 0; -#endif saveIniFile(filename); #else if (!gameSettings.noStartWindow) { - if (!showSetupWindow()) return 0; saveIniFile(filename); } #endif - + // Now set file indices properly to the chosen language. languageNum = getLanguageForFileB(); if (languageNum < 0) -- cgit v1.2.3