[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.450,1.451
Travis Howell
kirben at users.sourceforge.net
Sun Aug 15 21:20:29 CEST 2004
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24629/simon
Modified Files:
simon.cpp
Log Message:
Set _language before checking its value
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -d -r1.450 -r1.451
--- simon.cpp 2 Aug 2004 11:53:33 -0000 1.450
+++ simon.cpp 16 Aug 2004 04:19:43 -0000 1.451
@@ -371,6 +371,7 @@
SOUND_INDEX_BASE = 0;
}
+ _language = Common::parseLanguage(ConfMan.get("language"));
if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) {
gss = PTR(simon2win_settings);
@@ -483,7 +484,6 @@
_dx_use_3_or_4_for_lock = 0;
_debugMode = 0;
- _language = 0;
_pause = 0;
_start_mainscript = 0;
_continous_mainscript = 0;
@@ -691,7 +691,6 @@
midi.set_volume(ConfMan.getInt("music_volume"));
_debugMode = ConfMan.hasKey("debuglevel");
- _language = Common::parseLanguage(ConfMan.get("language"));
if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
midi.pause(_music_paused ^= 1);
More information about the Scummvm-git-logs
mailing list