aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/actors
diff options
context:
space:
mode:
Diffstat (limited to 'engines/pink/objects/actors')
-rw-r--r--engines/pink/objects/actors/actor.h4
-rw-r--r--engines/pink/objects/actors/audio_info_pda_button.cpp3
-rw-r--r--engines/pink/objects/actors/audio_info_pda_button.h2
-rw-r--r--engines/pink/objects/actors/lead_actor.cpp10
-rw-r--r--engines/pink/objects/actors/lead_actor.h6
-rw-r--r--engines/pink/objects/actors/supporting_actor.cpp8
-rw-r--r--engines/pink/objects/actors/supporting_actor.h4
7 files changed, 16 insertions, 21 deletions
diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h
index 87d12cf1e6..af11490998 100644
--- a/engines/pink/objects/actors/actor.h
+++ b/engines/pink/objects/actors/actor.h
@@ -68,8 +68,8 @@ public:
virtual void onClick() {}
virtual void onTimerMessage() {}
- virtual bool onLeftClickMessage() { return false; }
- virtual bool onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) { return false; }
+ virtual void onLeftClickMessage() {}
+ virtual void onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) {}
Action *findAction(const Common::String &name);
diff --git a/engines/pink/objects/actors/audio_info_pda_button.cpp b/engines/pink/objects/actors/audio_info_pda_button.cpp
index 7849b6ddb3..af03d5adf6 100644
--- a/engines/pink/objects/actors/audio_info_pda_button.cpp
+++ b/engines/pink/objects/actors/audio_info_pda_button.cpp
@@ -41,10 +41,9 @@ void AudioInfoPDAButton::onMouseOverWithItem(const Common::Point point, const Co
onMouseOver(point, cursorMgr);
}
-bool AudioInfoPDAButton::onLeftClickMessage() {
+void AudioInfoPDAButton::onLeftClickMessage() {
AudioInfoMgr *audioInfoMgr = _page->getLeadActor()->getAudioInfoMgr();
audioInfoMgr->onLeftClick();
- return true;
}
} // End of namespace Pink
diff --git a/engines/pink/objects/actors/audio_info_pda_button.h b/engines/pink/objects/actors/audio_info_pda_button.h
index 6eee840cce..c2949e2f8c 100644
--- a/engines/pink/objects/actors/audio_info_pda_button.h
+++ b/engines/pink/objects/actors/audio_info_pda_button.h
@@ -39,7 +39,7 @@ public:
void onMouseOver(const Common::Point point, CursorMgr *mgr);
void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, CursorMgr *cursorMgr) override;
- bool onLeftClickMessage() override;
+ void onLeftClickMessage() override;
};
} // End of namespace Pink
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 22396cf96d..e30fcb937b 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -366,7 +366,7 @@ void LeadActor::updateCursor(const Common::Point point) {
}
}
-bool LeadActor::sendUseClickMessage(Actor *actor) {
+void LeadActor::sendUseClickMessage(Actor *actor) {
InventoryMgr *mgr = getInventoryMgr();
assert(_state != kPlayingExitSequence);
_nextState = kReady;
@@ -376,16 +376,14 @@ bool LeadActor::sendUseClickMessage(Actor *actor) {
if (item->getCurrentOwner() != this->_name)
_isHaveItem = false;
forceUpdateCursor();
- return true;
}
-bool LeadActor::sendLeftClickMessage(Actor *actor) {
+void LeadActor::sendLeftClickMessage(Actor *actor) {
assert(_state != kPlayingExitSequence);
_nextState = kReady;
_state = kPlayingSequence;
actor->onLeftClickMessage();
forceUpdateCursor();
- return true;
}
WalkLocation *LeadActor::getWalkDestination() {
@@ -477,12 +475,10 @@ void PubPink::updateCursor(const Common::Point point) {
}
}
-bool PubPink::sendUseClickMessage(Actor *actor) {
+void PubPink::sendUseClickMessage(Actor *actor) {
LeadActor::sendUseClickMessage(actor);
if (playingMiniGame())
_isHaveItem = true;
-
- return true;
}
WalkLocation *PubPink::getWalkDestination() {
diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h
index 4275578b85..bab8cc4d7c 100644
--- a/engines/pink/objects/actors/lead_actor.h
+++ b/engines/pink/objects/actors/lead_actor.h
@@ -101,8 +101,8 @@ protected:
virtual void updateCursor(const Common::Point point);
- virtual bool sendUseClickMessage(Actor *actor);
- bool sendLeftClickMessage(Actor *actor);
+ virtual void sendUseClickMessage(Actor *actor);
+ void sendLeftClickMessage(Actor *actor);
virtual WalkLocation *getWalkDestination();
@@ -148,7 +148,7 @@ public:
protected:
void updateCursor(const Common::Point point) override;
- bool sendUseClickMessage(Actor *actor) override;
+ void sendUseClickMessage(Actor *actor) override;
WalkLocation *getWalkDestination() override;
diff --git a/engines/pink/objects/actors/supporting_actor.cpp b/engines/pink/objects/actors/supporting_actor.cpp
index 744fe6034f..b158650caa 100644
--- a/engines/pink/objects/actors/supporting_actor.cpp
+++ b/engines/pink/objects/actors/supporting_actor.cpp
@@ -75,12 +75,12 @@ void SupportingActor::onTimerMessage() {
_handlerMgr.onTimerMessage(this);
}
-bool SupportingActor::onLeftClickMessage() {
- return _handlerMgr.onLeftClickMessage(this);
+void SupportingActor::onLeftClickMessage() {
+ _handlerMgr.onLeftClickMessage(this);
}
-bool SupportingActor::onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) {
- return _handlerMgr.onUseClickMessage(this, item, mgr);
+void SupportingActor::onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) {
+ _handlerMgr.onUseClickMessage(this, item, mgr);
}
const Common::String &SupportingActor::getLocation() const {
diff --git a/engines/pink/objects/actors/supporting_actor.h b/engines/pink/objects/actors/supporting_actor.h
index 88c39963ab..69ccd03b3a 100644
--- a/engines/pink/objects/actors/supporting_actor.h
+++ b/engines/pink/objects/actors/supporting_actor.h
@@ -44,8 +44,8 @@ public:
void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, CursorMgr *cursorMgr) override;
void onTimerMessage() override;
- bool onLeftClickMessage() override;
- bool onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) override;
+ void onLeftClickMessage() override;
+ void onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) override;
const Common::String &getPDALink() const override;
const Common::String &getLocation() const override;