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/actor.cpp | |
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/actor.cpp')
-rw-r--r-- | engines/illusions/actor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp index cf3416a572..bae77c71fc 100644 --- a/engines/illusions/actor.cpp +++ b/engines/illusions/actor.cpp @@ -212,7 +212,7 @@ Control::Control(IllusionsEngine *vm) _position.y = 0; _actorTypeId = 0; _actor = 0; - _tag = _vm->getCurrentScene(); + _sceneId = _vm->getCurrentScene(); } Control::~Control() { @@ -1188,10 +1188,10 @@ void Controls::destroyActiveControls() { } } -void Controls::destroyControlsByTag(uint32 tag) { +void Controls::destroyControlsBySceneId(uint32 sceneId) { ItemsIterator it = _controls.begin(); while (it != _controls.end()) { - if ((*it)->_tag == tag) { + if ((*it)->_sceneId == sceneId) { destroyControlInternal(*it); it = _controls.erase(it); } else @@ -1239,10 +1239,10 @@ void Controls::unpauseControls() { } } -void Controls::pauseControlsByTag(uint32 tag) { +void Controls::pauseControlsBySceneId(uint32 sceneId) { for (ItemsIterator it = _controls.begin(); it != _controls.end(); ++it) { Control *control = *it; - if (control->_tag == tag) { + if (control->_sceneId == sceneId) { ++control->_pauseCtr; if (control->_pauseCtr == 1) control->pause(); @@ -1250,10 +1250,10 @@ void Controls::pauseControlsByTag(uint32 tag) { } } -void Controls::unpauseControlsByTag(uint32 tag) { +void Controls::unpauseControlsBySceneId(uint32 sceneId) { for (ItemsIterator it = _controls.begin(); it != _controls.end(); ++it) { Control *control = *it; - if (control->_tag == tag) { + if (control->_sceneId == sceneId) { --control->_pauseCtr; if (control->_pauseCtr == 0) control->unpause(); |