Switch nosubtitles option to subtitles, to match others and help with Simon2 issue.

svn-id: r11458

5 files changed, 17 insertions, 18 deletions

diff --git a/README b/README
index d117f3add3..d101bdf92b 100644
--- a/README
+++ b/README
@@ -328,7 +328,7 @@ arguments - see the next section.
   -m, --music-volume=NUM   Set the music volume, 0-255 (default: 192)
   -o, --master-volume=NUM  Set the master volume, 0-255 (default: 192)
   -s, --sfx-volume=NUM     Set the sfx volume, 0-255 (default: 192)
-  -n, --nosubtitles        Disable subtitles (use with games that have voice)
+  -n, --subtitles          Enable subtitles (use with games that have voice)
   -b, --boot-param=NUM     Pass number to the boot script (boot param)
   -d, --debuglevel=NUM     Set debug verbosity level
   -u, --dump-scripts       Enable script dumping if a directory called 'dumps'
@@ -776,7 +776,7 @@ An example config file looks as follows:
 
         [tentacle]
         path=C:\tentacle\
-        nosubtitles=true
+        subtitles=true
         master_volume=98
         music_volume=40
         sfx_volume=255
@@ -812,7 +812,7 @@ The following keywords are recognized:
 
         language        string   Specify language (en, de, fr, it, pt, es, jp,
                                  zh, kr,se, gb, hb)
-        nosubtitles     bool     Set to true to suppress subtitles.
+        subtitles       bool     Set to true to enable subtitles.
         talkspeed       number   Text speed (default: 60)
 
         fullscreen      bool     Fullscreen mode
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 3db94c4cd9..388ff3d10e 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -61,7 +61,7 @@ static const char USAGE_STRING[] =
 	"  -m, --music-volume=NUM   Set the music volume, 0-255 (default: 192)\n"
 	"  -o, --master-volume=NUM  Set the master volume, 0-255 (default: 192)\n"
 	"  -s, --sfx-volume=NUM     Set the sfx volume, 0-255 (default: 192)\n"
-	"  -n, --nosubtitles        Disable subtitles (use with games that have voice)\n"
+	"  -n, --subtitles          Enable subtitles (use with games that have voice)\n"
 	"  -b, --boot-param=NUM     Pass number to the boot script (boot param)\n"
 	"  -d, --debuglevel=NUM     Set debug verbosity level\n"
 	"  -u, --dump-scripts       Enable script dumping if a directory called 'dumps'\n"
@@ -157,7 +157,8 @@ GameDetector::GameDetector() {
 //	ConfMan.registerDefault("amiga", false);
 	ConfMan.registerDefault("platform", Common::kPlatformPC);
 	ConfMan.registerDefault("language", "en");
-	ConfMan.registerDefault("nosubtitles", false);
+//	ConfMan.registerDefault("nosubtitles", false);
+	ConfMan.registerDefault("subtitles", false);
 	ConfMan.registerDefault("boot_param", 0);
 	ConfMan.registerDefault("save_slot", -1);
 
@@ -362,8 +363,8 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 				ConfMan.set("music_volume", (int)strtol(option, 0, 10), kTransientDomain);
 			END_OPTION
 
-			DO_OPTION_BOOL('n', "nosubtitles")
-				ConfMan.set("nosubtitles", cmdValue, kTransientDomain);
+			DO_OPTION_BOOL('n', "subtitles")
+				ConfMan.set("subtitles", cmdValue, kTransientDomain);
 			END_OPTION
 
 			DO_OPTION('o', "master-volume")
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 1a9d2984bc..51debb0e30 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -624,7 +624,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 	_midiDriver = GameDetector::detectMusicDriver(gs.midi);
 
 	_demoMode = ConfMan.getBool("demo_mode");
-	_noSubtitles = ConfMan.getBool("nosubtitles");
+	_noSubtitles = ConfMan.getBool("subtitles");
+	_noSubtitles ^=1;
 	_confirmExit = ConfMan.getBool("confirm_exit");
 	_defaultTalkDelay = ConfMan.getInt("talkspeed");
 	_native_mt32 = ConfMan.getBool("native_mt32");
diff --git a/simon/simon.cpp b/simon/simon.cpp
index b8a8b02f48..e69661dff5 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -498,7 +498,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
 	_debugMode = ConfMan.hasKey("debuglevel");
 	_debugLevel = ConfMan.getInt("debuglevel");
 	_language = Common::parseLanguage(ConfMan.get("language"));
-	_noSubtitles = ConfMan.getBool("nosubtitles");
+	_subtitles = ConfMan.getBool("subtitles");
 
 	_system->init_size(320, 200);
 
@@ -4702,13 +4702,11 @@ void SimonEngine::go() {
 
 	if (_game & GF_TALKIE) {
 		_speech = true;
-		if ((_game & GF_SIMON2) || _language >= 2) {
-			if (_noSubtitles)
-				_subtitles = false;
 		// English and German versions of Simon the Sorcerer 1 don't have full subtitles
-		} else {
+		if (!(_game & GF_SIMON2) || _language < 2) 
 			_subtitles = false;
-		}
+	} else {
+		_subtitles = true;
 	}
 
 	if (_language == 4 || (_language > 5 && _language < 20))
diff --git a/sky/sky.cpp b/sky/sky.cpp
index ef9a19c846..e14d5bad82 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -269,10 +269,9 @@ void SkyEngine::initialise(void) {
 	}
 
 	if (isCDVersion()) {
-		if (ConfMan.getBool("nosubtitles"))
-			_systemVars.systemFlags |= SF_ALLOW_SPEECH;
-		else
-			_systemVars.systemFlags |= SF_ALLOW_SPEECH | SF_ALLOW_TEXT;
+		_systemVars.systemFlags |= SF_ALLOW_SPEECH;
+		if (ConfMan.getBool("subtitles"))
+			_systemVars.systemFlags |= SF_ALLOW_TEXT;
 	} else
 		_systemVars.systemFlags |= SF_ALLOW_TEXT;