Merge branch 'master' into lpc2012

Conflicts:
	src/game-server/character.h

4 files changed, 70 insertions, 11 deletions

diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index b0993afa..edd8e681 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -67,7 +67,6 @@ static bool executeCallback(Script::Ref function, Character *character)
     script->prepare(function);
     script->push(character);
     script->execute();
-    script->setMap(0);
     return true;
 }
 
diff --git a/src/game-server/monster.h b/src/game-server/monster.h
index 8e87d758..a1a82eb5 100644
--- a/src/game-server/monster.h
+++ b/src/game-server/monster.h
@@ -315,6 +315,9 @@ class Monster : public Being
          */
         void changeAnger(Actor *target, int amount);
 
+        const std::map<Being *, int> &getAngerList() const
+        { return mAnger; }
+
         /**
          * Calls the damage function in Being and updates the aggro list
          */
diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp
index c4cce8e4..4d659227 100644
--- a/src/game-server/quest.cpp
+++ b/src/game-server/quest.cpp
@@ -30,7 +30,7 @@
 #include "game-server/eventlistener.h"
 #include "utils/logger.h"
 
-typedef std::list< QuestCallback > QuestCallbacks;
+typedef std::list< QuestCallback * > QuestCallbacks;
 typedef std::map< std::string, QuestCallbacks > PendingVariables;
 
 struct PendingQuest
@@ -88,6 +88,21 @@ struct QuestDeathListener: EventDispatch
     }
 };
 
+void QuestRefCallback::triggerCallback(Character *ch,
+                                       const std::string &value) const
+{
+    if (!mRef.isValid())
+        return;
+
+    Script *s = ScriptManager::currentState();
+    s->setMap(ch->getMap());
+    s->prepare(mRef);
+    s->push(ch);
+    s->push(mQuestName);
+    s->push(value);
+    s->execute();
+}
+
 static QuestDeathListener questDeathDummy;
 static EventListener questDeathListener(&questDeathDummy);
 
@@ -112,7 +127,7 @@ void QuestDeathListener::fullRemove(const EventListener *, Character *ch)
 }
 
 void recoverQuestVar(Character *ch, const std::string &name,
-                     const QuestCallback &f)
+                     QuestCallback *f)
 {
     assert(ch->questCache.find(name) == ch->questCache.end());
     int id = ch->getDatabaseID();
@@ -153,7 +168,8 @@ void recoveredQuestVar(int id,
     for (QuestCallbacks::const_iterator k = j->second.begin(),
          k_end = j->second.end(); k != k_end; ++k)
     {
-        k->handler(ch, value, k->script);
+        (*k)->triggerCallback(ch, value);
+        delete (*k);
     }
 
     variables.erase(j);
diff --git a/src/game-server/quest.h b/src/game-server/quest.h
index 0125e84b..05caa6ab 100644
--- a/src/game-server/quest.h
+++ b/src/game-server/quest.h
@@ -23,16 +23,58 @@
 
 #include <string>
 
+#include "scripting/scriptmanager.h"
+
 class Character;
 class Script;
 
-struct QuestCallback
+
+class QuestCallback
 {
-    void (*handler)(Character *,
-                    const std::string &value,
-                    Script *script);
+    public:
+        virtual ~QuestCallback()
+        { }
+
+        virtual void triggerCallback(Character *ch,
+                                     const std::string &value) const = 0;
+};
+
+class QuestThreadCallback : public QuestCallback
+{
+    public:
+        QuestThreadCallback(void (*handler)(Character *,
+                                            const std::string &value,
+                                            Script *mScript),
+                            Script *script) :
+            mHandler(handler),
+            mScript(script)
+        { }
+
+        virtual void triggerCallback(Character *ch,
+                                     const std::string &value) const
+        { mHandler(ch, value, mScript); }
+
+    private:
+        void (*mHandler)(Character *,
+                         const std::string &value,
+                         Script *mScript);
+
+        Script *mScript;
+};
+
+class QuestRefCallback : public QuestCallback
+{
+    public:
+        QuestRefCallback(Script *script, const std::string &questName) :
+            mQuestName(questName)
+        { script->assignCallback(mRef); }
+
+        virtual void triggerCallback(Character *ch,
+                                     const std::string &value) const;
 
-    Script *script;
+    private:
+        Script::Ref mRef;
+        std::string mQuestName;
 };
 
 /**
@@ -51,8 +93,7 @@ void setQuestVar(Character *, const std::string &name,
  * Starts the recovery of a variable and returns immediatly. The callback will
  * be called once the value has been recovered.
  */
-void recoverQuestVar(Character *, const std::string &name,
-                     const QuestCallback &);
+void recoverQuestVar(Character *, const std::string &name, QuestCallback *);
 
 /**
  * Called by the handler of the account server when a value is received.