[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.1,1.2

Ludvig Strigeus strigeus at users.sourceforge.net
Fri Dec 28 10:44:01 CET 2001


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

Modified Files:
	imuse.cpp 
Log Message:
fixed the programming style on some lines

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imuse.cpp	2001/12/01 17:23:50	1.1
--- imuse.cpp	2001/12/28 18:43:02	1.2
***************
*** 366,370 ****
  	_queue_cleared = false;
  	do {
! 		pos = (++pos) & (ARRAYSIZE(_cmd_queue)-1);
  		if (_queue_pos == pos)
  			break;
--- 366,370 ----
  	_queue_cleared = false;
  	do {
! 		pos = (pos+1) & (ARRAYSIZE(_cmd_queue)-1);
  		if (_queue_pos == pos)
  			break;
***************
*** 509,513 ****
  		if (a[0] == COMMAND_ID && a[1] == 8 && a[2] == (uint16)sound)
  			return 2;
! 		i = (++i) & (ARRAYSIZE(_cmd_queue)-1);
  	}
  	return 0;
--- 509,513 ----
  		if (a[0] == COMMAND_ID && a[1] == 8 && a[2] == (uint16)sound)
  			return 2;
! 		i = (i+1) & (ARRAYSIZE(_cmd_queue)-1);
  	}
  	return 0;
***************
*** 593,597 ****
  	p[7] = g;
  
! 	i = (++i) & (ARRAYSIZE(_cmd_queue)-1);
  
  	if (_queue_end!=i) {
--- 593,597 ----
  	p[7] = g;
  
! 	i = (i+1) & (ARRAYSIZE(_cmd_queue)-1);
  
  	if (_queue_end!=i) {
***************
*** 599,603 ****
  		return 0;
  	} else {
! 		_queue_pos = (--i) & (ARRAYSIZE(_cmd_queue)-1);
  		return -1;
  	}
--- 599,603 ----
  		return 0;
  	} else {
! 		_queue_pos = (i-1) & (ARRAYSIZE(_cmd_queue)-1);
  		return -1;
  	}
***************
*** 653,659 ****
  	p[2] = marker;
  
! 	pos = (++pos) & (ARRAYSIZE(_cmd_queue)-1);
  	if (_queue_end==pos) {
! 		_queue_pos =  (--pos) & (ARRAYSIZE(_cmd_queue)-1);
  		return -1;
  	}
--- 653,659 ----
  	p[2] = marker;
  
! 	pos = (pos+1) & (ARRAYSIZE(_cmd_queue)-1);
  	if (_queue_end==pos) {
! 		_queue_pos = (pos-1) & (ARRAYSIZE(_cmd_queue)-1);
  		return -1;
  	}





More information about the Scummvm-git-logs mailing list