[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.64,1.65 sound.cpp,1.23,1.24

[James Brown]

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

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:
Fixed music volume control for some games.



Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** scummvm.cpp	6 Mar 2002 20:32:34 -0000	1.64
--- scummvm.cpp	7 Mar 2002 08:11:48 -0000	1.65
***************
*** 484,489 ****
                  		goto ShowHelpAndExit;
  					SoundEngine *se = (SoundEngine*)_soundEngine;
! 					if (se) 
! 						se->set_music_volume(atoi(s+1));
                      goto NextArg;
  				}
--- 484,490 ----
                  		goto ShowHelpAndExit;
  					SoundEngine *se = (SoundEngine*)_soundEngine;
! 					
! 					if (se)						
! 						se->set_music_volume(atoi(s+1));					
                      goto NextArg;
  				}

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** sound.cpp	6 Mar 2002 23:17:16 -0000	1.23
--- sound.cpp	7 Mar 2002 08:11:48 -0000	1.24
***************
*** 328,334 ****
  void Scumm::setupSound() {
  	SoundEngine *se = (SoundEngine*)_soundEngine;
! 	if (se)
  		se->setBase(res.address[rtSound]);
! 
  	_sfxFile = openSfxFile();
  }
--- 328,335 ----
  void Scumm::setupSound() {
  	SoundEngine *se = (SoundEngine*)_soundEngine;
! 	if (se) {
  		se->setBase(res.address[rtSound]);
! 		se->set_master_volume(100);
! 	}
  	_sfxFile = openSfxFile();
  }