aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/handlers/handler_mgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/pink/objects/handlers/handler_mgr.cpp')
-rw-r--r--engines/pink/objects/handlers/handler_mgr.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/engines/pink/objects/handlers/handler_mgr.cpp b/engines/pink/objects/handlers/handler_mgr.cpp
index e68b63e243..de6809d165 100644
--- a/engines/pink/objects/handlers/handler_mgr.cpp
+++ b/engines/pink/objects/handlers/handler_mgr.cpp
@@ -72,24 +72,18 @@ void HandlerMgr::onTimerMessage(Actor *actor) {
handler->handle(actor);
}
-bool HandlerMgr::onLeftClickMessage(Actor *actor) {
+void HandlerMgr::onLeftClickMessage(Actor *actor) {
Handler *handler = findSuitableHandlerLeftClick(actor);
- if (handler) {
- handler->handle(actor);
- return true;
- }
- return false;
+ assert(handler);
+ handler->handle(actor);
}
-bool HandlerMgr::onUseClickMessage(Actor *actor, InventoryItem *item, InventoryMgr *mgr) {
+void HandlerMgr::onUseClickMessage(Actor *actor, InventoryItem *item, InventoryMgr *mgr) {
HandlerUseClick *handler = findSuitableHandlerUseClick(actor, item);
- if (handler) {
- if (!handler->getRecepient().empty())
- mgr->setItemOwner(handler->getRecepient(), item);
- handler->handle(actor);
- return true;
- }
- return false;
+ assert(handler);
+ if (!handler->getRecepient().empty())
+ mgr->setItemOwner(handler->getRecepient(), item);
+ handler->handle(actor);
}
Handler *HandlerMgr::findSuitableHandlerTimer(Actor *actor) {