diff options
| -rw-r--r-- | engines/pink/objects/actors/lead_actor.cpp | 17 | ||||
| -rw-r--r-- | engines/pink/objects/actors/lead_actor.h | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index 8f48df52e0..4d09281d29 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -155,10 +155,8 @@ void LeadActor::update() { void LeadActor::loadPDA(const Common::String &pageName) { if (_state != kPDA) { - if (_state == kMoving) { - _recipient = nullptr; - _nextState = kReady; - } + if (_state == kMoving) + setReadyAfterWalk(); if (_state != kInventory) _page->pause(true); @@ -268,10 +266,8 @@ void LeadActor::onClick() { _nextState = (_state != kMoving) ? kUnk_Loading : kReady; } else { - if (_state == kMoving) { - _recipient = nullptr; - _nextState = kReady; - } + if (_state == kMoving) + setReadyAfterWalk(); startInventory(0); } } @@ -391,6 +387,11 @@ void LeadActor::startInventory(bool fromSave) { _page->pause(true); } +void LeadActor::setReadyAfterWalk() { + _recipient = nullptr; + _nextState = kReady; +} + void ParlSqPink::toConsole() { debug("ParlSqPink: _name = %s", _name.c_str()); for (uint i = 0; i < _actions.size(); ++i) { diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h index c4c0748e70..9e1f8cb4ea 100644 --- a/engines/pink/objects/actors/lead_actor.h +++ b/engines/pink/objects/actors/lead_actor.h @@ -102,6 +102,8 @@ protected: void startInventory(bool fromSave); + void setReadyAfterWalk(); + Actor *_recipient; CursorMgr *_cursorMgr; |