[Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.4,1.5 fmopl.cpp,1.1,1.2 imuse.cpp,1.3,1.4

[James Brown]

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

Modified Files:
	adlib.cpp fmopl.cpp imuse.cpp 
Log Message:
Code cleanup - get rid of a bunch of typecast and unused variable warnings.




Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adlib.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** adlib.cpp	2 Feb 2002 19:07:32 -0000	1.4
--- adlib.cpp	24 Feb 2002 17:25:02 -0000	1.5
***************
*** 643,650 ****
  			break;
  		case 30:
! 			s11->s10->modwheel = s11->modify_val;
  			break;
  		case 31:
! 			s11->s10->unk3 = s11->modify_val;
  			break;
  		default:
--- 643,650 ----
  			break;
  		case 30:
! 			s11->s10->modwheel = (char)s11->modify_val;
  			break;
  		case 31:
! 			s11->s10->unk3 = (char)s11->modify_val;
  			break;
  		default:
***************
*** 917,921 ****
  
  int AdlibSoundDriver::part_update_active(Part *part,uint16 *active) {
- 	int i;
  	uint16 bits;
  	int count = 0;
--- 917,920 ----

Index: fmopl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fmopl.cpp	1 Dec 2001 17:06:13 -0000	1.1
--- fmopl.cpp	24 Feb 2002 17:25:02 -0000	1.2
***************
*** 711,715 ****
  	OPL_CH *CH;
  	int slot;
! 	int block_fnum;
  
  	switch(r&0xe0)
--- 711,715 ----
  	OPL_CH *CH;
  	int slot;
! 	unsigned int block_fnum;
  
  	switch(r&0xe0)

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** imuse.cpp	12 Feb 2002 18:20:37 -0000	1.3
--- imuse.cpp	24 Feb 2002 17:25:03 -0000	1.4
***************
*** 348,353 ****
  void SoundEngine::handle_marker(uint id, byte data) {
  	uint16 *p;
! 	uint pos;
! 	int a;
  	
  	pos = _queue_end;
--- 348,352 ----
  void SoundEngine::handle_marker(uint id, byte data) {
  	uint16 *p;
! 	uint pos;	
  	
  	pos = _queue_end;
***************
*** 421,425 ****
  		counter = sn->counter + player->_timer_speed;
  		sn->pos += counter>>16;
! 		sn->counter = counter & 0xFFFF;
  
  		if (sn->pos >= sn->off_pos) {
--- 420,424 ----
  		counter = sn->counter + player->_timer_speed;
  		sn->pos += counter>>16;
! 		sn->counter = (unsigned short)counter & 0xFFFF;
  
  		if (sn->pos >= sn->off_pos) {
***************
*** 569,573 ****
  int SoundEngine::enqueue_command(int a, int b, int c, int d, int e, int f, int g) {
  	uint16 *p;
- 	uint32 r;
  	uint i;
  
--- 568,571 ----
***************
*** 930,940 ****
  
  void SoundEngine::pause(bool paused) {
- 	Part *part;
- 	int i;
- 	MidiChannel *mc;
- 
  	lock();
  
  #if 0
  
  	for (i=ARRAYSIZE(_parts),part=_parts; i!=0; i--, part++) {
--- 928,937 ----
  
  void SoundEngine::pause(bool paused) {
  	lock();
  
  #if 0
+ 	int i;
+ 	Part *part;
+ 	MidiChannel *mc;
  
  	for (i=ARRAYSIZE(_parts),part=_parts; i!=0; i--, part++) {
***************
*** 1237,1241 ****
  	byte buf[128];
  	Part *part;
- 	byte hw;
  
  	/* too big? */
--- 1234,1237 ----
***************
*** 1765,1769 ****
  uint Player::update_actives() {
  	Part *part;
- 	MidiChannel *mc;
  	uint16 *active;
  	int count = 0;
--- 1761,1764 ----
***************
*** 2095,2099 ****
  	if (!ser->isSaving()) {
  		/* Load all sounds that we need */
- 		int i;
  		fix_players_after_load();
  		init_sustaining_notes();
--- 2090,2093 ----