[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.42,1.43

[Max Horn]

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

Modified Files:
	sword1.cpp 
Log Message:
be tolerant against abuse of ConfMan.getInt(); add missing default value for 'speech_volume' in bs1

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sword1.cpp	28 Mar 2004 16:30:49 -0000	1.42
+++ sword1.cpp	31 Mar 2004 18:00:46 -0000	1.43
@@ -113,18 +113,19 @@
 	_logic = new Logic(_objectMan, _resMan, _screen, _mouse, _sound, _music, _menu, _system, _mixer);
 	_mouse->useLogicAndMenu(_logic, _menu);
 
+	ConfMan.registerDefault("speech_volume", 192);
+
 	uint8 musicVol = (uint8)ConfMan.getInt("music_volume");
 	uint8 speechVol = (uint8)ConfMan.getInt("speech_volume");
 	uint8 sfxVol = (uint8)ConfMan.getInt("sfx_volume");
-	if (!speechVol)
-		speechVol = 192;
 
 	_music->setVolume(musicVol, musicVol);      // these routines expect left and right volume,
 	_sound->setSpeechVol(speechVol, speechVol); // but our config manager doesn't support it.
 	_sound->setSfxVol(sfxVol, sfxVol);
 
-	_systemVars.justRestoredGame = _systemVars.currentCD = 
-		_systemVars.gamePaused = 0;
+	_systemVars.justRestoredGame = 0;
+	_systemVars.currentCD = 0;
+	_systemVars.gamePaused = 0;
 	_systemVars.deathScreenFlag = 3;
 	_systemVars.forceRestart = false;
 	_systemVars.wantFade = true;