diff options
| author | johndoe123 | 2018-05-25 06:46:09 +1000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | aee54f4bca73b35371e9bc13f718209b38bfa731 (patch) | |
| tree | 28a21686acf45c20f22d861b6b3b3216ab1365fc | |
| parent | 33ece271fde12033c620660216a678e1c506fd75 (diff) | |
| download | scummvm-rg350-aee54f4bca73b35371e9bc13f718209b38bfa731.tar.gz scummvm-rg350-aee54f4bca73b35371e9bc13f718209b38bfa731.tar.bz2 scummvm-rg350-aee54f4bca73b35371e9bc13f718209b38bfa731.zip | |
ILLUSIONS: Minor cleanup
(cherry picked from commit 9abaa9e)
| -rw-r--r-- | engines/illusions/actor.h | 1 | ||||
| -rw-r--r-- | engines/illusions/bbdou/bbdou_credits.cpp | 1 | ||||
| -rw-r--r-- | engines/illusions/duckman/illusions_duckman.cpp | 4 | ||||
| -rw-r--r-- | engines/illusions/duckman/scriptopcodes_duckman.cpp | 5 |
4 files changed, 2 insertions, 9 deletions
diff --git a/engines/illusions/actor.h b/engines/illusions/actor.h index 046a963141..358ecbdb1e 100644 --- a/engines/illusions/actor.h +++ b/engines/illusions/actor.h @@ -234,7 +234,6 @@ public: int _pauseCtr; int16 _priority; Actor *_actor; - //field_6 dw uint32 _sceneId; uint32 _objectId; uint32 _actorTypeId; diff --git a/engines/illusions/bbdou/bbdou_credits.cpp b/engines/illusions/bbdou/bbdou_credits.cpp index 08f9900c4e..b3735953f7 100644 --- a/engines/illusions/bbdou/bbdou_credits.cpp +++ b/engines/illusions/bbdou/bbdou_credits.cpp @@ -97,7 +97,6 @@ void BbdouCredits::drawTextToControl(uint32 objectId, const char *text, uint ali uint16 wtext[128]; charToWChar(text, wtext, ARRAYSIZE(wtext)); - // TODO Extract to Actor class Control *control = _vm->getObjectControl(objectId); FontResource *font = _vm->_dict->findFont(_currFontId); TextDrawer textDrawer; diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp index d22b947731..1ffb9f68c4 100644 --- a/engines/illusions/duckman/illusions_duckman.cpp +++ b/engines/illusions/duckman/illusions_duckman.cpp @@ -247,7 +247,6 @@ bool IllusionsEngine_Duckman::hasFeature(EngineFeature f) const { } void IllusionsEngine_Duckman::initInput() { - // TODO Check if these are correct... _input->setInputEvent(kEventLeftClick, 0x01) .addMouseButton(MOUSE_LEFT_BUTTON) .addKey(Common::KEYCODE_RETURN); @@ -288,8 +287,6 @@ void IllusionsEngine_Duckman::initUpdateFunctions() { #undef UPDATEFUNCTION int IllusionsEngine_Duckman::updateScript(uint flags) { - // TODO Some more stuff - if (_screen->isDisplayOn() && !_screenPalette->isFaderActive() && _pauseCtr == 0) { if (_input->pollEvent(kEventAbort)) { startScriptThread(0x00020342, 0); @@ -297,7 +294,6 @@ int IllusionsEngine_Duckman::updateScript(uint flags) { startScriptThread(0x0002033F, 0); } } - _threads->updateThreads(); //TODO need to call startScriptThread2(0x10002, 0x20001, 0); diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp index 01a9c962e5..5e4dab4667 100644 --- a/engines/illusions/duckman/scriptopcodes_duckman.cpp +++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp @@ -683,9 +683,8 @@ void ScriptOpcodes_Duckman::opQuitGame(ScriptThread *scriptThread, OpCall &opCal void ScriptOpcodes_Duckman::opResetGame(ScriptThread *scriptThread, OpCall &opCall) { _vm->reset(); - _vm->_input->activateButton(0xFFFF); - // TODO _vm->stopMusic(); - // TODO _vm->_gameStates->clear(); + _vm->_soundMan->stopMidiMusic(); + _vm->_soundMan->clearMidiMusicQueue(); } void ScriptOpcodes_Duckman::opLoadGame(ScriptThread *scriptThread, OpCall &opCall) { |