[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.10,1.11

James Brown ender at users.sourceforge.net
Thu Mar 7 00:12:04 CET 2002


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

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



Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** imuse.cpp	6 Mar 2002 00:00:38 -0000	1.10
--- imuse.cpp	7 Mar 2002 08:11:48 -0000	1.11
***************
*** 636,640 ****
  
  int SoundEngine::set_master_volume(uint vol) {
! 	int i;
  	if (vol > 127)
  		return -1;
--- 636,640 ----
  
  int SoundEngine::set_master_volume(uint vol) {
! 	int i;	
  	if (vol > 127)
  		return -1;
***************
*** 643,647 ****
  		vol = vol / (100 / _music_volume);
  
! 	_master_volume = vol;
  	for (i=0; i!=8; i++)
  		_channel_volume_eff[i] = (_channel_volume[i]+1) * vol >> 7;
--- 643,647 ----
  		vol = vol / (100 / _music_volume);
  
! 	_master_volume = vol;	
  	for (i=0; i!=8; i++)
  		_channel_volume_eff[i] = (_channel_volume[i]+1) * vol >> 7;





More information about the Scummvm-git-logs mailing list