diff options
author | Andrei Prykhodko | 2018-06-29 16:30:39 +0300 |
---|---|---|
committer | Andrei Prykhodko | 2018-06-29 16:30:39 +0300 |
commit | 4a4692a5ddcc6f8631e71ac26f52282f4dbb62b9 (patch) | |
tree | 3c7e60129bdf1066ea54da6873c0b1931ebe8c56 | |
parent | 6ff1db5dfd56de2b681bfe528078f33999f1c804 (diff) | |
download | scummvm-rg350-4a4692a5ddcc6f8631e71ac26f52282f4dbb62b9.tar.gz scummvm-rg350-4a4692a5ddcc6f8631e71ac26f52282f4dbb62b9.tar.bz2 scummvm-rg350-4a4692a5ddcc6f8631e71ac26f52282f4dbb62b9.zip |
PINK: removed onClick virtual function
-rw-r--r-- | engines/pink/objects/actors/actor.h | 2 | ||||
-rw-r--r-- | engines/pink/objects/actors/lead_actor.cpp | 8 | ||||
-rw-r--r-- | engines/pink/objects/actors/lead_actor.h | 4 | ||||
-rw-r--r-- | engines/pink/objects/actors/pda_button_actor.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/actors/pda_button_actor.h | 2 | ||||
-rw-r--r-- | engines/pink/pda_mgr.cpp | 2 |
6 files changed, 9 insertions, 11 deletions
diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h index ab84c6d417..294beb99b6 100644 --- a/engines/pink/objects/actors/actor.h +++ b/engines/pink/objects/actors/actor.h @@ -66,8 +66,6 @@ public: virtual void onMouseOver(const Common::Point point, CursorMgr *mgr); virtual void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, CursorMgr *cursorMgr); - virtual void onClick() {} - virtual void onTimerMessage() {} virtual void onLeftClickMessage() {} virtual void onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) {} diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index 2649b2f6d0..1d26c4dc31 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -214,7 +214,7 @@ void LeadActor::onLeftButtonClick(const Common::Point point) { if (this == clickedActor) { _audioInfoMgr.stop(); - onClick(); + onLeftClickMessage(); } else if (clickedActor->isSupporting()) { if (isInteractingWith(clickedActor)) { _recipient = clickedActor; @@ -272,7 +272,7 @@ void LeadActor::onMouseOver(const Common::Point point, CursorMgr *mgr) { Actor::onMouseOver(point, mgr); } -void LeadActor::onClick() { +void LeadActor::onLeftClickMessage() { if (_isHaveItem) { assert(_state != kMoving); _isHaveItem = false; @@ -454,9 +454,9 @@ void PubPink::toConsole() { } } -void PubPink::onClick() { +void PubPink::onLeftClickMessage() { if (!playingMiniGame()) - LeadActor::onClick(); + LeadActor::onLeftClickMessage(); } void PubPink::onVariableSet() { diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h index e6b0292a57..ff38ef9bf4 100644 --- a/engines/pink/objects/actors/lead_actor.h +++ b/engines/pink/objects/actors/lead_actor.h @@ -77,7 +77,7 @@ public: void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, Pink::CursorMgr *cursorMgr) override; void onMouseOver(const Common::Point point, CursorMgr *mgr) override; - virtual void onClick(); + virtual void onLeftClickMessage() override; virtual void onVariableSet() {} void onInventoryClosed(bool isItemClicked); void onWalkEnd(const Common::String &stopName); @@ -141,7 +141,7 @@ public: void toConsole() override; - void onClick() override; + void onLeftClickMessage() override; void onVariableSet() override; protected: diff --git a/engines/pink/objects/actors/pda_button_actor.cpp b/engines/pink/objects/actors/pda_button_actor.cpp index 240d51a705..972dc28afe 100644 --- a/engines/pink/objects/actors/pda_button_actor.cpp +++ b/engines/pink/objects/actors/pda_button_actor.cpp @@ -46,7 +46,7 @@ void PDAButtonActor::toConsole() { _name.c_str(), _x, _y, _hideOnStop, _opaque, (int)_command.type, _command.arg.c_str()); } -void PDAButtonActor::onClick() { +void PDAButtonActor::onLeftClickMessage() { if (isActive()) { _page->getGame()->getPdaMgr().execute(_command); } diff --git a/engines/pink/objects/actors/pda_button_actor.h b/engines/pink/objects/actors/pda_button_actor.h index c7bfdd146a..c10f2ef5ab 100644 --- a/engines/pink/objects/actors/pda_button_actor.h +++ b/engines/pink/objects/actors/pda_button_actor.h @@ -46,7 +46,7 @@ public: void onMouseOver(const Common::Point point, CursorMgr *mgr) override; - void onClick() override; + void onLeftClickMessage() override; private: bool isActive(); diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp index 257a7deeed..1623b5573c 100644 --- a/engines/pink/pda_mgr.cpp +++ b/engines/pink/pda_mgr.cpp @@ -72,7 +72,7 @@ void PDAMgr::goToPage(const Common::String &pageName) { void PDAMgr::onLeftButtonClick(Common::Point point) { Actor *actor = _game->getDirector()->getActorByPoint(point); if (actor) - actor->onClick(); + actor->onLeftClickMessage(); } void PDAMgr::onMouseMove(Common::Point point) { |