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

[Pawe? Ko?odziejski]

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

Modified Files:
	dialog.cpp 
Log Message:
moved to Sound class

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- dialog.cpp	4 Aug 2002 01:18:06 -0000	1.35
+++ dialog.cpp	14 Aug 2002 20:43:56 -0000	1.36
@@ -447,9 +447,9 @@
 	Dialog::open();
 
 	// get current variables
-	_soundVolumeMaster = scumm->_sound_volume_master;
-	_soundVolumeMusic = scumm->_sound_volume_music;
-	_soundVolumeSfx = scumm->_sound_volume_sfx;
+	_soundVolumeMaster = scumm->_sound->_sound_volume_master;
+	_soundVolumeMusic = scumm->_sound->_sound_volume_music;
+	_soundVolumeSfx = scumm->_sound->_sound_volume_sfx;
 
 	masterVolumeSlider->setValue(_soundVolumeMaster);
 	musicVolumeSlider->setValue(_soundVolumeMusic);
@@ -483,9 +483,9 @@
 		Scumm	*scumm = _gui->getScumm();
 		
 		// FIXME: Look at Fingolfins comments in Gui::handleSoundDialogCommand(), gui.cpp 
-		scumm->_sound_volume_master = _soundVolumeMaster;	// Master
-		scumm->_sound_volume_music = _soundVolumeMusic;	// Music
-		scumm->_sound_volume_sfx = _soundVolumeSfx;	// SFX
+		scumm->_sound->_sound_volume_master = _soundVolumeMaster;	// Master
+		scumm->_sound->_sound_volume_music = _soundVolumeMusic;	// Music
+		scumm->_sound->_sound_volume_sfx = _soundVolumeSfx;	// SFX
 		
 		scumm->_imuse->set_music_volume(_soundVolumeMusic);
 		scumm->_imuse->set_master_volume(_soundVolumeMaster);