diff options
| author | johndoe123 | 2015-11-19 13:16:22 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 61a0b5badbd7098e0b96355a428408654b3705df (patch) | |
| tree | ab3ca376ccc5cca11508cd9918a445c2ef8f9bde /engines/illusions/duckman | |
| parent | 41978f466d423e9b5f3c3980666c1beb4219b937 (diff) | |
| download | scummvm-rg350-61a0b5badbd7098e0b96355a428408654b3705df.tar.gz scummvm-rg350-61a0b5badbd7098e0b96355a428408654b3705df.tar.bz2 scummvm-rg350-61a0b5badbd7098e0b96355a428408654b3705df.zip | |
ILLUSIONS: Rename tag -> sceneId
Diffstat (limited to 'engines/illusions/duckman')
| -rw-r--r-- | engines/illusions/duckman/illusions_duckman.cpp | 18 | ||||
| -rw-r--r-- | engines/illusions/duckman/scriptopcodes_duckman.cpp | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp index 041e4372b9..3a6514fa96 100644 --- a/engines/illusions/duckman/illusions_duckman.cpp +++ b/engines/illusions/duckman/illusions_duckman.cpp @@ -233,8 +233,8 @@ void IllusionsEngine_Duckman::initInput() { .addKey(Common::KEYCODE_DOWN); } -#define UPDATEFUNCTION(priority, tag, callback) \ - _updateFunctions->add(priority, tag, new Common::Functor1Mem<uint, int, IllusionsEngine_Duckman> \ +#define UPDATEFUNCTION(priority, sceneId, callback) \ + _updateFunctions->add(priority, sceneId, new Common::Functor1Mem<uint, int, IllusionsEngine_Duckman> \ (this, &IllusionsEngine_Duckman::callback)); void IllusionsEngine_Duckman::initUpdateFunctions() { @@ -760,13 +760,13 @@ bool IllusionsEngine_Duckman::changeScene(uint32 sceneId, uint32 threadId, uint3 void IllusionsEngine_Duckman::enterPause(uint32 sceneId, uint32 threadId) { _threads->suspendThreads(threadId); _controls->pauseControls(); - _actorInstances->pauseByTag(sceneId); - _backgroundInstances->pauseByTag(sceneId); + _actorInstances->pauseBySceneId(sceneId); + _backgroundInstances->pauseBySceneId(sceneId); } void IllusionsEngine_Duckman::leavePause(uint32 sceneId, uint32 threadId) { - _backgroundInstances->unpauseByTag(sceneId); - _actorInstances->unpauseByTag(sceneId); + _backgroundInstances->unpauseBySceneId(sceneId); + _actorInstances->unpauseBySceneId(sceneId); _controls->unpauseControls(); _threads->notifyThreads(threadId); } @@ -776,11 +776,11 @@ void IllusionsEngine_Duckman::dumpActiveScenes(uint32 sceneId, uint32 threadId) } void IllusionsEngine_Duckman::dumpCurrSceneFiles(uint32 sceneId, uint32 threadId) { - // TODO UpdateFunctions_disableByTag(sceneId); + // TODO UpdateFunctions_disableBySceneId(sceneId); _threads->terminateActiveThreads(threadId); - _threads->terminateThreadsByTag(sceneId, threadId); + _threads->terminateThreadsBySceneId(sceneId, threadId); _controls->destroyActiveControls(); - _resSys->unloadResourcesByTag(sceneId); + _resSys->unloadResourcesBySceneId(sceneId); } void IllusionsEngine_Duckman::setSceneIdThreadId(uint32 theSceneId, uint32 theThreadId) { diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp index 107d8983e7..09bf8c6716 100644 --- a/engines/illusions/duckman/scriptopcodes_duckman.cpp +++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp @@ -294,7 +294,7 @@ void ScriptOpcodes_Duckman::opStartModalScene(ScriptThread *scriptThread, OpCall ARG_UINT32(threadId); _vm->_input->discardAllEvents(); _vm->enterPause(_vm->getCurrentScene(), opCall._callerThreadId); - _vm->_talkItems->pauseByTag(_vm->getCurrentScene()); + _vm->_talkItems->pauseBySceneId(_vm->getCurrentScene()); _vm->enterScene(sceneId, threadId); opCall._result = kTSSuspend; } @@ -308,7 +308,7 @@ void ScriptOpcodes_Duckman::opExitModalScene(ScriptThread *scriptThread, OpCall _vm->dumpCurrSceneFiles(_vm->getCurrentScene(), opCall._callerThreadId); _vm->exitScene(); _vm->leavePause(_vm->getCurrentScene(), opCall._callerThreadId); - _vm->_talkItems->unpauseByTag(_vm->getCurrentScene()); + _vm->_talkItems->unpauseBySceneId(_vm->getCurrentScene()); } } |