[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.555,1.556

kirben kirben at users.sourceforge.net
Tue Jan 10 01:09:02 CET 2006


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27723/simon

Modified Files:
	simon.cpp 
Log Message:
Set _language, before checking value.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -d -r1.555 -r1.556
--- simon.cpp	30 Dec 2005 14:18:20 -0000	1.555
+++ simon.cpp	10 Jan 2006 09:08:07 -0000	1.556
@@ -577,6 +577,7 @@
 	midi.set_volume(ConfMan.getInt("music_volume"));
 
 	_debugMode = (gDebugLevel >= 0);
+	_language = Common::parseLanguage(ConfMan.get("language"));
 
 	if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
 		midi.pause(_musicPaused ^= 1);
@@ -642,7 +643,6 @@
 		SOUND_INDEX_BASE = 0;
 	}
 
-	_language = Common::parseLanguage(ConfMan.get("language"));
 	if (getGameType() == GType_FF) {
 		gss = PTR(feeblefiles_settings);
 	} else if (getGameType() == GType_SIMON2) {





More information about the Scummvm-git-logs mailing list