diff options
author | johndoe123 | 2018-05-26 06:45:15 +1000 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | 565de60234af381862200aef7c57ae3de94bf489 (patch) | |
tree | 223ccc5b0183e0ceffab1fc9768033a23a9abdf0 /engines/illusions/duckman | |
parent | 617e9439cfa51cdb7221a388762e0661ccd5f5ad (diff) | |
download | scummvm-rg350-565de60234af381862200aef7c57ae3de94bf489.tar.gz scummvm-rg350-565de60234af381862200aef7c57ae3de94bf489.tar.bz2 scummvm-rg350-565de60234af381862200aef7c57ae3de94bf489.zip |
ILLUSIONS: Clean up/fix some TODOs
(cherry picked from commit 66094e4)
Diffstat (limited to 'engines/illusions/duckman')
-rw-r--r-- | engines/illusions/duckman/illusions_duckman.h | 1 | ||||
-rw-r--r-- | engines/illusions/duckman/scriptopcodes_duckman.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/illusions/duckman/illusions_duckman.h b/engines/illusions/duckman/illusions_duckman.h index d4583bccef..0dfdf3a10f 100644 --- a/engines/illusions/duckman/illusions_duckman.h +++ b/engines/illusions/duckman/illusions_duckman.h @@ -84,7 +84,6 @@ protected: virtual bool hasFeature(EngineFeature f) const; public: - // TODO ActiveScenes _activeScenes; uint32 _prevSceneId; uint32 _theSceneId; uint32 _theThreadId; diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp index ee4979a11a..24e69db404 100644 --- a/engines/illusions/duckman/scriptopcodes_duckman.cpp +++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp @@ -323,6 +323,7 @@ void ScriptOpcodes_Duckman::opStartModalScene(ScriptThread *scriptThread, OpCall void ScriptOpcodes_Duckman::opExitModalScene(ScriptThread *scriptThread, OpCall &opCall) { _vm->_input->discardAllEvents(); if (_vm->_scriptResource->_properties.get(0x000E0027)) { + // NOTE This would switch to the debug menu which is not currently supported _vm->startScriptThread2(0x10002, 0x20001, 0); opCall._result = kTSTerminate; } else { @@ -584,7 +585,7 @@ void ScriptOpcodes_Duckman::opStartCursorHoldingObject(ScriptThread *scriptThrea void ScriptOpcodes_Duckman::opPlayVideo(ScriptThread *scriptThread, OpCall &opCall) { ARG_SKIP(2); ARG_UINT32(videoId); -#if 1 // TODO DEBUG Set to 0 to skip videos +#if 1 // NOTE DEBUG Set to 0 to skip videos _vm->playVideo(videoId, opCall._threadId); #else //DEBUG Resume calling thread, later done by the video player |