[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.483,1.484 simon.h,1.132,1.133

[kirben]

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

Modified Files:
	simon.cpp simon.h 
Log Message:

Set SFX volume correctly


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -d -r1.483 -r1.484
--- simon.cpp	22 Jan 2005 01:47:07 -0000	1.483
+++ simon.cpp	22 Jan 2005 02:01:22 -0000	1.484
@@ -665,7 +665,7 @@
 	if (!_mixer->isReady())
 		warning("Sound initialization failed. "
 						"Features of the game that depend on sound synchronization will most likely break");
-	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	set_volume(ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
 
 	_system->beginGFXTransaction();
@@ -4225,7 +4225,7 @@
 void SimonEngine::dx_unlock_attached() {
 }
 
-void SimonEngine::set_volume(byte volume) {
+void SimonEngine::set_volume(int volume) {
 	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, volume);
 }
 

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- simon.h	1 Jan 2005 16:09:20 -0000	1.132
+++ simon.h	22 Jan 2005 02:01:22 -0000	1.133
@@ -808,7 +808,7 @@
 
 	void set_dummy_cursor();
 
-	void set_volume(byte volume);
+	void set_volume(int volume);
 
 	void save_or_load_dialog(bool load);
 	void o_unk_132_helper_3();