[Scummvm-cvs-logs] SF.net SVN: scummvm: [30549] scummvm/trunk/engines/scumm/imuse_digi

[fingolfin at users.sourceforge.net]

Revision: 30549
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30549&view=rev
Author:   fingolfin
Date:     2008-01-18 08:38:11 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
Don't hardcode value for which we have wonderful and nice constants defined ;)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2008-01-18 10:52:18 UTC (rev 30548)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2008-01-18 16:38:11 UTC (rev 30549)
@@ -39,8 +39,10 @@
 
 namespace Scumm {
 
-#define MAX_DIGITAL_TRACKS 8
-#define MAX_DIGITAL_FADETRACKS 8
+enum {
+	MAX_DIGITAL_TRACKS = 8,
+	MAX_DIGITAL_FADETRACKS = 8
+};
 
 struct imuseDigTable;
 struct imuseComiTable;

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-18 10:52:18 UTC (rev 30548)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-18 16:38:11 UTC (rev 30549)
@@ -341,7 +341,7 @@
 		return NULL;
 	}
 
-	assert(track->trackId < 8);
+	assert(track->trackId < MAX_DIGITAL_TRACKS);
 	fadeTrack = _track[track->trackId + MAX_DIGITAL_TRACKS];
 
 	if (fadeTrack->used) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.