From e3a5da7b7ed1581e31b47dceabddb46f49b29cd7 Mon Sep 17 00:00:00 2001
From: Norbert Lange
Date: Tue, 30 Jun 2009 17:41:24 +0000
Subject: engines/scumm/*: enabled choosing of the colorpalette, by setting
 RenderMode to EGA the "old" palette will be used tfmx/tfmxplayer.cpp: removed
 some unused stuff sound/mods/tfmx.cpp: emulating the way MI initialises new
 macro-programms. (Difference might not be audible at all)

svn-id: r41976
---
 sound/mods/tfmx.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'sound/mods/tfmx.cpp')

diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp
index f813212a82..cf34a9715d 100644
--- a/sound/mods/tfmx.cpp
+++ b/sound/mods/tfmx.cpp
@@ -93,8 +93,9 @@ void Tfmx::interrupt() {
 			channel.sfxLocked = (channel.customMacroPrio != 0);
 		}
 
-		// apply timebased effects on Parameters 
-		effects(channel);
+		// apply timebased effects on Parameters
+		if (channel.macroSfxRun > 0)
+			effects(channel);
 
 		// see if we have to run the macro-program
 		if (channel.macroRun) {
@@ -107,6 +108,8 @@ void Tfmx::interrupt() {
 		}
 
 		Paula::setChannelPeriod(channel.paulaChannel, channel.period);
+		if (channel.macroSfxRun >= 0)
+			channel.macroSfxRun = 1;
 
 		// TODO: handling pending DMAOff?
 	}
@@ -253,6 +256,9 @@ void Tfmx::macroRun(ChannelContext &channel) {
 			continue;
 
 		case 0x01:	// DMA On
+			// TODO: Parameter macroPtr[1] - en-/disable effects
+			if (macroPtr[1])
+				debug("Tfmx: DMA On %i", (int8)macroPtr[1]);
 			channel.dmaIntCount = 0;
 			if (deferWait) {
 				// TODO
-- 
cgit v1.2.3