[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.82,1.83

[Max Horn]

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

Modified Files:
	sword1.cpp 
Log Message:
BS1 specific fix for bug #1107121 (ALL/SFX: Setting the SFX volume at 256 mutes sound)

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- sword1.cpp	28 Jan 2005 22:05:50 -0000	1.82
+++ sword1.cpp	6 Feb 2005 20:31:20 -0000	1.83
@@ -176,9 +176,15 @@
 	_logic = new Logic(_objectMan, _resMan, _screen, _mouse, _sound, _music, _menu, _system, _mixer);
 	_mouse->useLogicAndMenu(_logic, _menu);
 
-	uint8 musicVol = (uint8)ConfMan.getInt("music_volume");
-	uint8 speechVol = (uint8)ConfMan.getInt("speech_volume");
-	uint8 sfxVol = (uint8)ConfMan.getInt("sfx_volume");
+	uint musicVol = ConfMan.getInt("music_volume");
+	uint speechVol = ConfMan.getInt("speech_volume");
+	uint sfxVol = ConfMan.getInt("sfx_volume");
+	if (musicVol > 255)
+		musicVol = 255;
+	if (speechVol > 255)
+		speechVol = 255;
+	if (sfxVol > 255)
+		sfxVol = 255;
 
 	_music->setVolume(musicVol, musicVol);      // these routines expect left and right volume,
 	_sound->setSpeechVol(speechVol, speechVol); // but our config manager doesn't support it.