[Scummvm-git-logs] scummvm master -> 2a6222be1752cabd0fc1d0641a3d34cd896a0784

[whiterandrek]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2a6222be17 PINK: fixed clicking on leadActor in moving state with item


Commit: 2a6222be1752cabd0fc1d0641a3d34cd896a0784
    https://github.com/scummvm/scummvm/commit/2a6222be1752cabd0fc1d0641a3d34cd896a0784
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-08-15T19:11:24+03:00

Commit Message:
PINK: fixed clicking on leadActor in moving state with item

Changed paths:
    engines/pink/objects/actors/lead_actor.cpp


diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index dc36ffc..6165a35 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -283,9 +283,9 @@ void LeadActor::onMouseOver(const Common::Point point, CursorMgr *mgr) {
 
 void LeadActor::onLeftClickMessage() {
 	if (_isHaveItem) {
-		assert(_state != kMoving);
 		_isHaveItem = false;
-		_nextState = kUndefined;
+		_nextState = _state != kMoving ? kUndefined : kReady;
+		forceUpdateCursor();
 	} else {
 		if (_state == kMoving)
 			cancelInteraction();