Converted functions called by LuaScript to callbacks

This includes the quest reply, post reply, death notification and
remove notification.

Also, Script::Ref was changed from a typedef to a small class,
automating initialization and making the check for validness clearer.

Reviewed-by: Erik Schilling

4 files changed, 11 insertions, 9 deletions

diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index b5051764..950c6496 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -52,12 +52,12 @@ const float Character::EXPCURVE_FACTOR = 10.0f;
 const float Character::LEVEL_SKILL_PRECEDENCE_FACTOR = 0.75f;
 const float Character::EXP_LEVEL_FLEXIBILITY = 1.0f;
 
-Script::Ref Character::mDeathCallback = Script::NoRef;
-Script::Ref Character::mDeathAcceptedCallback = Script::NoRef;
+Script::Ref Character::mDeathCallback;
+Script::Ref Character::mDeathAcceptedCallback;
 
 static bool executeCallback(Script::Ref function, Character *character)
 {
-    if (function == Script::NoRef)
+    if (!function.isValid())
         return false;
 
     Script *script = ScriptManager::currentState();
diff --git a/src/game-server/postman.h b/src/game-server/postman.h
index 82b7a5a7..5669ebef 100644
--- a/src/game-server/postman.h
+++ b/src/game-server/postman.h
@@ -25,12 +25,13 @@
 #include <string>
 
 class Character;
+class Script;
 
 struct PostCallback
 {
     void (*handler)(Character *, const std::string &sender,
-                    const std::string &letter, void *data);
-    void *data;
+                    const std::string &letter, Script *script);
+    Script *script;
 };
 
 class PostMan
@@ -64,7 +65,7 @@ public:
         std::map<Character*, PostCallback>::iterator itr = mCallbacks.find(player);
         if (itr != mCallbacks.end())
         {
-            itr->second.handler(player, sender, letter, itr->second.data);
+            itr->second.handler(player, sender, letter, itr->second.script);
         }
     }
 
diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp
index e4607c6a..974fc4ce 100644
--- a/src/game-server/quest.cpp
+++ b/src/game-server/quest.cpp
@@ -152,7 +152,7 @@ void recoveredQuestVar(int id, const std::string &name,
     for (QuestCallbacks::const_iterator k = j->second.begin(),
          k_end = j->second.end(); k != k_end; ++k)
     {
-        k->handler(ch, name, value, k->data);
+        k->handler(ch, name, value, k->script);
     }
 
     variables.erase(j);
diff --git a/src/game-server/quest.h b/src/game-server/quest.h
index 56fa5c2a..86d2be46 100644
--- a/src/game-server/quest.h
+++ b/src/game-server/quest.h
@@ -24,12 +24,13 @@
 #include <string>
 
 class Character;
+class Script;
 
 struct QuestCallback
 {
     void (*handler)(Character *, const std::string &name,
-                    const std::string &value, void *data);
-    void *data;
+                    const std::string &value, Script *script);
+    Script *script;
 };
 
 /**