diff options
Diffstat (limited to 'engines/pink/objects/handlers')
-rw-r--r-- | engines/pink/objects/handlers/handler.cpp | 3 | ||||
-rw-r--r-- | engines/pink/objects/handlers/handler.h | 4 | ||||
-rw-r--r-- | engines/pink/objects/handlers/handler_mgr.h | 6 | ||||
-rw-r--r-- | engines/pink/objects/handlers/handler_timer.cpp | 1 |
4 files changed, 6 insertions, 8 deletions
diff --git a/engines/pink/objects/handlers/handler.cpp b/engines/pink/objects/handlers/handler.cpp index 2f73553f2a..f27b79a5de 100644 --- a/engines/pink/objects/handlers/handler.cpp +++ b/engines/pink/objects/handlers/handler.cpp @@ -39,9 +39,8 @@ void Handler::deserialize(Archive &archive) { bool Handler::isSuitable(Actor *actor) { for (uint i = 0; i < _conditions.size(); ++i) { - if (!_conditions[i]->evaluate(actor)){ + if (!_conditions[i]->evaluate(actor)) return false; - } } return true; } diff --git a/engines/pink/objects/handlers/handler.h b/engines/pink/objects/handlers/handler.h index 98d26620b5..3d795f8d7c 100644 --- a/engines/pink/objects/handlers/handler.h +++ b/engines/pink/objects/handlers/handler.h @@ -44,8 +44,8 @@ public: protected: void executeSideEffects(Actor *actor); - Array<Condition*> _conditions; - Array<SideEffect*> _sideEffects; + Array<Condition *> _conditions; + Array<SideEffect *> _sideEffects; }; class Sequence; diff --git a/engines/pink/objects/handlers/handler_mgr.h b/engines/pink/objects/handlers/handler_mgr.h index dabb329d27..75ba40cff6 100644 --- a/engines/pink/objects/handlers/handler_mgr.h +++ b/engines/pink/objects/handlers/handler_mgr.h @@ -56,9 +56,9 @@ private: HandlerLeftClick *findSuitableHandlerLeftClick(Actor *actor); HandlerUseClick *findSuitableHandlerUseClick(Actor *actor, InventoryItem *item); - Array<HandlerLeftClick*> _leftClickHandlers; - Array<HandlerUseClick*> _useClickHandlers; - Array<Handler*> _timerHandlers; + Array<HandlerLeftClick *> _leftClickHandlers; + Array<HandlerUseClick *> _useClickHandlers; + Array<Handler *> _timerHandlers; }; } diff --git a/engines/pink/objects/handlers/handler_timer.cpp b/engines/pink/objects/handlers/handler_timer.cpp index e27d4bb207..8f6e3a222a 100644 --- a/engines/pink/objects/handlers/handler_timer.cpp +++ b/engines/pink/objects/handlers/handler_timer.cpp @@ -34,7 +34,6 @@ namespace Pink { - void HandlerTimerActions::deserialize(Archive &archive) { Handler::deserialize(archive); _actions.deserialize(archive); |