[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.14,1.15

[James Brown]

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

Modified Files:
	imuse.cpp 
Log Message:
Add "options" menu to F5 key. Can set music volumes and stuff :)



Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** imuse.cpp	14 Mar 2002 14:45:04 -0000	1.14
--- imuse.cpp	14 Mar 2002 17:36:13 -0000	1.15
***************
*** 639,643 ****
  		vol = 1;
  	
! 	_music_volume = vol;
  	return 0;
  }
--- 639,643 ----
  		vol = 1;
  	
! 	_music_volume = vol;	
  	return 0;
  }
***************
*** 652,655 ****
--- 652,656 ----
  
  	_master_volume = vol;	
+ 	_s->_sound_volume_master = vol;
  	for (i=0; i!=8; i++)
  		_channel_volume_eff[i] = (_channel_volume[i]+1) * vol >> 7;