[Scummvm-cvs-logs] CVS: scummvm-new/gui dialog.cpp,1.3,1.4 gui.cpp,1.1.1.1,1.2

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Sat Aug 24 08:32:02 CEST 2002


Update of /cvsroot/scummvm/scummvm-new/gui
In directory usw-pr-cvs1:/tmp/cvs-serv7048/gui

Modified Files:
	dialog.cpp gui.cpp 
Log Message:
synced with scummvm

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/gui/dialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dialog.cpp	21 Aug 2002 16:33:56 -0000	1.3
+++ dialog.cpp	24 Aug 2002 15:31:36 -0000	1.4
@@ -489,8 +489,8 @@
 		
 		scumm->_imuse->set_music_volume(_soundVolumeMusic);
 		scumm->_imuse->set_master_volume(_soundVolumeMaster);
-		scumm->_mixer->set_volume(_soundVolumeSfx);
-		scumm->_mixer->set_music_volume(_soundVolumeMusic);
+		scumm->_mixer->setVolume(_soundVolumeSfx);
+		scumm->_mixer->setMusicVolume(_soundVolumeMusic);
 		
 		scummcfg->set("master_volume", _soundVolumeMaster);
 		scummcfg->set("music_volume", _soundVolumeMusic);

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/gui/gui.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gui.cpp	21 Aug 2002 16:07:24 -0000	1.1.1.1
+++ gui.cpp	24 Aug 2002 15:31:36 -0000	1.2
@@ -621,8 +621,8 @@
 
 		_s->_imuse->set_music_volume(_s->_sound->_sound_volume_music);
 		_s->_imuse->set_master_volume(_s->_sound->_sound_volume_master);
-		_s->_mixer->set_volume(_s->_sound->_sound_volume_sfx);
-		_s->_mixer->set_music_volume(_s->_sound->_sound_volume_music);
+		_s->_mixer->setVolume(_s->_sound->_sound_volume_sfx);
+		_s->_mixer->setMusicVolume(_s->_sound->_sound_volume_music);
 
 		scummcfg->set("master_volume", _s->_sound->_sound_volume_master);
 		scummcfg->set("music_volume", _s->_sound->_sound_volume_music);





More information about the Scummvm-git-logs mailing list