[Scummvm-cvs-logs] SF.net SVN: scummvm:[43772] scummvm/trunk/sound/mods/maxtrax.cpp

[drmccoy at users.sourceforge.net]

Revision: 43772
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43772&view=rev
Author:   drmccoy
Date:     2009-08-27 16:29:56 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
This just fix the compile errors on AmigaOS (bug #2845660)

Modified Paths:
--------------
    scummvm/trunk/sound/mods/maxtrax.cpp

Modified: scummvm/trunk/sound/mods/maxtrax.cpp
===================================================================
--- scummvm/trunk/sound/mods/maxtrax.cpp	2009-08-27 15:08:21 UTC (rev 43771)
+++ scummvm/trunk/sound/mods/maxtrax.cpp	2009-08-27 16:29:56 UTC (rev 43772)
@@ -176,7 +176,7 @@
 			if (cmd < 0x80) {	// Note
 				const int8 voiceIndex = noteOn(channel, cmd, (curEvent->parameter & 0xF0) >> 1, kPriorityScore);
 				if (voiceIndex >= 0)
-					_voiceCtx[voiceIndex].stopEventTime = MAX(0, (eventDelta + curEvent->stopTime) << 8);
+					_voiceCtx[voiceIndex].stopEventTime = MAX<int32>(0, (eventDelta + curEvent->stopTime) << 8);
 
 			} else {
 				switch (cmd) {
@@ -336,7 +336,7 @@
 		const uint16 envUnit = _playerCtx.frameUnit;
 		if (voice.envelope) {
 			if (voice.ticksLeft > envUnit) {	// envelope still active
-				voice.baseVolume = (uint16)MIN(MAX(0, voice.baseVolume + voice.incrVolume), 0x8000);
+				voice.baseVolume = (uint16) MIN<int32>(MAX<int32>(0, voice.baseVolume + voice.incrVolume), 0x8000);
 				voice.ticksLeft -= envUnit;
 				// Update Volume and Period
 


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