[Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.52,1.53

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Dec 2 02:26:00 CET 2003


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv14433

Modified Files:
	controls.cpp 
Log Message:
Since all other engines have been changed to use "subtitles" instead of
"nosubtitles", let's change this one as well. Of course, it does break
compatibility with old config files, but I guess the worst that can happen
is that we have an unused "nosubtitles" line in addition to the used
"subtitles" line... 


Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- controls.cpp	25 Nov 2003 17:08:46 -0000	1.52
+++ controls.cpp	2 Dec 2003 10:25:12 -0000	1.53
@@ -1427,13 +1427,13 @@
 	ConfMan.registerDefault("speech_mute", false);
 	ConfMan.registerDefault("sfx_mute", false);
 	ConfMan.registerDefault("gfx_details", 2);
-	ConfMan.registerDefault("nosubtitles", false);
+	ConfMan.registerDefault("subtitles", true);
 	ConfMan.registerDefault("object_labels", true);
 	ConfMan.registerDefault("reverse_stereo", false);
 }
 
 void Gui::readOptionSettings(void) {
-	_subtitles = !ConfMan.getBool("nosubtitles");
+	_subtitles = ConfMan.getBool("subtitles");
 	_pointerTextSelected = ConfMan.getBool("object_labels");
 	_stereoReversed = ConfMan.getBool("reverse_stereo");
 
@@ -1456,7 +1456,7 @@
 	ConfMan.set("speech_mute", _vm->_sound->isSpeechMute());
 	ConfMan.set("sfx_mute", _vm->_sound->isFxMute());
 	ConfMan.set("gfx_details", _vm->_graphics->getRenderLevel());
-	ConfMan.set("nosubtitles", !_subtitles);
+	ConfMan.set("subtitles", _subtitles);
 	ConfMan.set("object_labels", _pointerTextSelected);
 	ConfMan.set("reverse_stereo", _stereoReversed);
 





More information about the Scummvm-git-logs mailing list