From bdee380fd94b92014b8afbff5945e027d51deb53 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 27 May 2005 10:25:15 +0000
Subject: Very minor cleanup.

svn-id: r18272
---
 scumm/imuse.cpp        | 6 +++---
 scumm/imuse_player.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scumm')

diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index c612a3aa34..648e585170 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -712,7 +712,7 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 #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 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 				// 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 @@ void Part::noteOn(byte note, byte velocity) {
 		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;
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index a1cee095a1..900309780d 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -437,7 +437,7 @@ void Player::sysEx(byte *p, uint16 len) {
 			// 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)
 				{
-- 
cgit v1.2.3