diff options
author | whiterandrek | 2018-06-12 22:21:03 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 2c6ab1c77581b6486a5e496c0d7a5aa00db144ee (patch) | |
tree | 3cf25c7fa1be9397acb5690b14bf6cbd64ac3c37 /engines | |
parent | b6658eb9a8e90cfa3bba494f1934a0f8ca5727cf (diff) | |
download | scummvm-rg350-2c6ab1c77581b6486a5e496c0d7a5aa00db144ee.tar.gz scummvm-rg350-2c6ab1c77581b6486a5e496c0d7a5aa00db144ee.tar.bz2 scummvm-rg350-2c6ab1c77581b6486a5e496c0d7a5aa00db144ee.zip |
PINK: fix inventory opening
Diffstat (limited to 'engines')
-rw-r--r-- | engines/pink/objects/actors/lead_actor.cpp | 6 | ||||
-rw-r--r-- | engines/pink/objects/inventory.cpp | 4 | ||||
-rw-r--r-- | engines/pink/objects/inventory.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index 0c59c2e842..e05d50c16a 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -381,9 +381,9 @@ Actor *LeadActor::getActorByPoint(const Common::Point point) { return _page->getGame()->getDirector()->getActorByPoint(point); } -void LeadActor::startInventory(bool fromSave) { - getInventoryMgr()->start(fromSave); - if (!fromSave) { +void LeadActor::startInventory(bool paused) { + getInventoryMgr()->start(paused); + if (!paused) { _isHaveItem = false; _stateCopy = _state; _state = kInventory; diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp index bfbff3e653..f81275938c 100644 --- a/engines/pink/objects/inventory.cpp +++ b/engines/pink/objects/inventory.cpp @@ -98,7 +98,7 @@ void InventoryMgr::setItemOwner(const Common::String &owner, InventoryItem *item _item = item; } -bool InventoryMgr::start(bool playOpening) { +bool InventoryMgr::start(bool paused) { if (!_item) { _item = findInventoryItem(_lead->getName()); if (!_item) @@ -110,7 +110,7 @@ bool InventoryMgr::start(bool playOpening) { _rightArrow = _lead->getPage()->findActor(kInventoryRightArrowActor); _leftArrow = _lead->getPage()->findActor(kInventoryLeftArrowActor); - if (playOpening) { + if (!paused) { _window->setAction(kOpenAction); _state = kOpening; } diff --git a/engines/pink/objects/inventory.h b/engines/pink/objects/inventory.h index 836aa7f8a3..c9357fc62a 100644 --- a/engines/pink/objects/inventory.h +++ b/engines/pink/objects/inventory.h @@ -59,7 +59,7 @@ public: void update(); void onClick(Common::Point point); - bool start(bool playOpening); + bool start(bool paused); void setLeadActor(LeadActor *lead) { _lead = lead; } InventoryItem* findInventoryItem(const Common::String &name); |