From 942e8329b449f38515aed25e2e6ad41f3ac2e1f5 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Thu, 10 Jan 2013 23:36:51 +0100 Subject: Used a typedef to make callback syntax more readable --- src/game-server/quest.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/game-server/quest.h b/src/game-server/quest.h index 05caa6ab..0d130789 100644 --- a/src/game-server/quest.h +++ b/src/game-server/quest.h @@ -42,23 +42,21 @@ class QuestCallback class QuestThreadCallback : public QuestCallback { public: - QuestThreadCallback(void (*handler)(Character *, - const std::string &value, - Script *mScript), + typedef void (*Handler)(Character *, + const std::string &value, + Script *mScript); + + QuestThreadCallback(Handler handler, Script *script) : mHandler(handler), mScript(script) { } - virtual void triggerCallback(Character *ch, - const std::string &value) const + void triggerCallback(Character *ch, const std::string &value) const { mHandler(ch, value, mScript); } private: - void (*mHandler)(Character *, - const std::string &value, - Script *mScript); - + Handler mHandler; Script *mScript; }; @@ -69,8 +67,7 @@ class QuestRefCallback : public QuestCallback mQuestName(questName) { script->assignCallback(mRef); } - virtual void triggerCallback(Character *ch, - const std::string &value) const; + void triggerCallback(Character *ch, const std::string &value) const; private: Script::Ref mRef; -- cgit v1.2.3-60-g2f50