[Scummvm-git-logs] scummvm master -> a0cdc826942afee4ac32ed69411cf049230a1630

[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:
a0cdc82694 PINK: fixed right button click when playing pub minigame


Commit: a0cdc826942afee4ac32ed69411cf049230a1630
    https://github.com/scummvm/scummvm/commit/a0cdc826942afee4ac32ed69411cf049230a1630
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T15:14:27+03:00

Commit Message:
PINK: fixed right button click when playing pub minigame

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


diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index a1a47cb36a..148fefc047 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -499,4 +499,9 @@ bool PubPink::playingMiniGame() {
 			_page->checkValueOfVariable(kFoodPuzzle, kUndefinedValue));
 }
 
+void PubPink::onRightButtonClick(const Common::Point point) {
+	if (!playingMiniGame())
+		LeadActor::onRightButtonClick(point);
+}
+
 } // End of namespace Pink
diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h
index f7ef15a3cc..5e95e2f405 100644
--- a/engines/pink/objects/actors/lead_actor.h
+++ b/engines/pink/objects/actors/lead_actor.h
@@ -71,7 +71,7 @@ public:
 	void onKeyboardButtonClick(Common::KeyCode code);
 	void onLeftButtonClick(const Common::Point point);
 	void onLeftButtonUp();
-	void onRightButtonClick(const Common::Point point);
+	virtual void onRightButtonClick(const Common::Point point);
 
 	void onMouseMove(const Common::Point point);
 
@@ -140,6 +140,8 @@ class PubPink : public LeadActor {
 public:
 	void toConsole() const override;
 
+	void onRightButtonClick(const Common::Point point) override;
+
 	void onLeftClickMessage() override;
 	void onVariableSet() override;