aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwhiterandrek2018-05-12 19:20:21 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commit9cfa4970a24aea17530ad567905e8e38d207c951 (patch)
tree52483ffea446ae255ae9764cbe4315dc2769693f
parent84529c917764275e3f74ed711f9eebcf07ff822c (diff)
downloadscummvm-rg350-9cfa4970a24aea17530ad567905e8e38d207c951.tar.gz
scummvm-rg350-9cfa4970a24aea17530ad567905e8e38d207c951.tar.bz2
scummvm-rg350-9cfa4970a24aea17530ad567905e8e38d207c951.zip
PINK: fixed choosing item after getting it from click using other item
-rw-r--r--engines/pink/objects/actors/lead_actor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index ddc4052479..cb87a24107 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -249,10 +249,10 @@ bool LeadActor::sendUseClickMessage(SupportingActor *actor) {
InventoryMgr *mgr = _page->getModule()->getInventoryMgr();
_nextState = _state != kPlayingVideo ? kReady : kPlayingVideo;
_state = kInDialog1;
+ InventoryItem *item = mgr->getCurrentItem();
actor->onUseClickMessage(mgr->getCurrentItem(), mgr);
- if (mgr->getCurrentItem() == nullptr
- || mgr->getCurrentItem()->getCurrentOwner() != this->_name)
- _isHaveItem = false;
+ if (item->getCurrentOwner() != this->_name)
+ _isHaveItem = false;
return true;
}