[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.139,2.140 imuse_player.cpp,2.51,2.52

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16400

Modified Files:
	imuse.cpp imuse_player.cpp 
Log Message:
Very minor cleanup.


Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.139
retrieving revision 2.140
diff -u -d -r2.139 -r2.140
--- imuse.cpp	27 May 2005 07:01:04 -0000	2.139
+++ imuse.cpp	27 May 2005 10:25:14 -0000	2.140
@@ -712,7 +712,7 @@
 #ifdef IMUSE_DEBUG
 	{
 		char string[128];
-		sprintf (string, "doCommand - %d (%d/%d)", a[0], (int)param, (int)cmd);
+		sprintf(string, "doCommand - %d (%d/%d)", a[0], (int)param, (int)cmd);
 		for (i = 1; i < numargs; ++i)
 			sprintf(string + strlen(string), ", %d", a[i]);
 		debug(0, string);
@@ -798,7 +798,7 @@
 				// associated with a particular player ID and
 				// trigger ID.
 				a[0] = 0;
-				for (i = 0; i < 16; ++i) {
+				for (i = 0; i < ARRAYSIZE(_snm_triggers); ++i) {
 					if (_snm_triggers[i].sound == a[1] && _snm_triggers[i].id &&
 					   (a[3] == -1 || _snm_triggers[i].id == a[3]))
 					{
@@ -1744,7 +1744,7 @@
 		mc = _player->getMidiDriver()->getPercussionChannel();
 		if (!mc)
 			return;
-  		static byte prev_vol_eff = 128;
+		static byte prev_vol_eff = 128;
 		if (_vol_eff != prev_vol_eff){
 			mc->volume(_vol_eff);
 			prev_vol_eff = _vol_eff;

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.51
retrieving revision 2.52
diff -u -d -r2.51 -r2.52
--- imuse_player.cpp	26 May 2005 11:13:42 -0000	2.51
+++ imuse_player.cpp	27 May 2005 10:25:15 -0000	2.52
@@ -437,7 +437,7 @@
 			// When a SysEx marker is encountered whose sound
 			// ID and marker ID match what was set by ImSetTrigger,
 			// something magical is supposed to happen....
-			for (a = 0; a < 16; ++a) {
+			for (a = 0; a < ARRAYSIZE(_se->_snm_triggers); ++a) {
 				if (_se->_snm_triggers[a].sound == _id &&
 				    _se->_snm_triggers[a].id == *p)
 				{