From c01a1269b6bd6bfbce0de201490fc2c1d61c2250 Mon Sep 17 00:00:00 2001
From: Eric Fry
Date: Tue, 3 Jul 2018 22:44:38 +1000
Subject: ILLUSIONS: DUCKMAN: Clear fader when loading/unpausing backgrounds

(cherry picked from commit 3367aafae37d6c28c1ab1e8323613a56a44e3a5c)

ILLUSIONS: Delete dictionary list before it gets removed

(cherry picked from commit d9d0c11)

ILLUSIONS: Implement PathFinder::postProcess

(cherry picked from commit ee98dfc)
---
 engines/illusions/duckman/illusions_duckman.cpp     | 12 ++++++++++++
 engines/illusions/duckman/illusions_duckman.h       |  1 +
 engines/illusions/duckman/scriptopcodes_duckman.cpp |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'engines/illusions/duckman')

diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index c30b8ce318..9eae7a5514 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -390,6 +390,18 @@ void IllusionsEngine_Duckman::updateFader() {
 	}
 }
 
+void IllusionsEngine_Duckman::clearFader() {
+	_fader->_active = false;
+	_fader->_currValue = 255;
+	_fader->_minValue = 255;
+	_fader->_maxValue = 255;
+	_fader->_firstIndex = 1;
+	_fader->_lastIndex = 256;
+	_fader->_startTime = 0;
+	_fader->_duration = 0;
+	_fader->_notifyThreadId = 0;
+}
+
 void IllusionsEngine_Duckman::pauseFader() {
 	_fader->_paused = true;
 	_fader->_startTime = getCurrentTime() - _fader->_startTime;
diff --git a/engines/illusions/duckman/illusions_duckman.h b/engines/illusions/duckman/illusions_duckman.h
index feacd50cc1..46bf15e3d8 100644
--- a/engines/illusions/duckman/illusions_duckman.h
+++ b/engines/illusions/duckman/illusions_duckman.h
@@ -113,6 +113,7 @@ public:
 
 	void startFader(int duration, int minValue, int maxValue, int firstIndex, int lastIndex, uint32 threadId);
 	void updateFader();
+	void clearFader();
 	void pauseFader();
 	void unpauseFader();
 
diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
index e6f286ca9c..8764f9277f 100644
--- a/engines/illusions/duckman/scriptopcodes_duckman.cpp
+++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -640,7 +640,7 @@ void ScriptOpcodes_Duckman::opStopMidiMusic(ScriptThread *scriptThread, OpCall &
 void ScriptOpcodes_Duckman::opFadeMidiMusic(ScriptThread *scriptThread, OpCall &opCall) {
 	ARG_INT16(duration);
 	ARG_INT16(finalVolume);
-	_vm->_soundMan->fadeMidiMusic(finalVolume, duration);
+	//FIXME _vm->_soundMan->fadeMidiMusic(finalVolume, duration);
 }
 
 void ScriptOpcodes_Duckman::opAddMenuChoice(ScriptThread *scriptThread, OpCall &opCall) {
-- 
cgit v1.2.3