[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.49,1.50

[Jochen Hoenicke]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24452

Modified Files:
	dialogs.cpp 
Log Message:
Also call playerV2->set_master_volume when playerV2 exists.

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- dialogs.cpp	28 May 2003 00:07:56 -0000	1.49
+++ dialogs.cpp	1 Jun 2003 16:41:25 -0000	1.50
@@ -24,6 +24,7 @@
 #include "sound/mididrv.h"
 #include "scumm.h"
 #include "imuse.h"
+#include "player_v2.h"
 #include "verbs.h"
 
 #include "gui/newgui.h"
@@ -512,6 +513,9 @@
 		if (_scumm->_imuse) {
 			_scumm->_imuse->set_music_volume(_soundVolumeMusic);
 			_scumm->_imuse->set_master_volume(_soundVolumeMaster);
+		}
+		if (_scumm->_playerV2) {
+			_scumm->_playerV2->set_master_volume(_soundVolumeMaster);
 		}
 
 		_scumm->_mixer->setVolume(_soundVolumeSfx * _soundVolumeMaster / 255);