diff options
| author | Eric Fry | 2018-07-03 22:44:38 +1000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | c01a1269b6bd6bfbce0de201490fc2c1d61c2250 (patch) | |
| tree | 5c72c060352f9609bd90ffc8e0a35f6af5447355 /engines/illusions/duckman | |
| parent | 24a4c6367ced2bfc76ae2326b077a8b324c6b6a5 (diff) | |
| download | scummvm-rg350-c01a1269b6bd6bfbce0de201490fc2c1d61c2250.tar.gz scummvm-rg350-c01a1269b6bd6bfbce0de201490fc2c1d61c2250.tar.bz2 scummvm-rg350-c01a1269b6bd6bfbce0de201490fc2c1d61c2250.zip | |
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)
Diffstat (limited to 'engines/illusions/duckman')
| -rw-r--r-- | engines/illusions/duckman/illusions_duckman.cpp | 12 | ||||
| -rw-r--r-- | engines/illusions/duckman/illusions_duckman.h | 1 | ||||
| -rw-r--r-- | engines/illusions/duckman/scriptopcodes_duckman.cpp | 2 |
3 files changed, 14 insertions, 1 deletions
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) { |