[Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.36,1.37

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


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

Modified Files:
	dialog.cpp 
Log Message:
comited patch #598939, thanks Xavier :)
with some changes:
- compatible with VC6,
- naming convention,
- removed channel.cpp
- correct endlines.

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- dialog.cpp	14 Aug 2002 20:43:56 -0000	1.36
+++ dialog.cpp	24 Aug 2002 13:16:54 -0000	1.37
@@ -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);





More information about the Scummvm-git-logs mailing list