Removed the last direct call to global script function

The ScriptAction of the TriggerArea (which can be created by
mana.trigger_create) was still using a named global function for its
callback. Now it also uses a reference to a script function.

Since it was the last occurrence of a call to a global script function,
I've also removed the Script::prepare(std::string) overload.

Reviewed-by: Erik Schilling
Mantis-issue: 299

1 files changed, 2 insertions, 3 deletions

diff --git a/src/game-server/trigger.h b/src/game-server/trigger.h
index f6f0e170..2a3aa611 100644
--- a/src/game-server/trigger.h
+++ b/src/game-server/trigger.h
@@ -50,14 +50,13 @@ class WarpAction : public TriggerAction
 class ScriptAction : public TriggerAction
 {
     public:
-        ScriptAction(Script *script, const std::string &function, int arg)
-          : mScript(script), mFunction(function), mArg(arg) {}
+        ScriptAction(Script *script, Script::Ref callback, int arg);
 
         virtual void process(Actor *obj);
 
     private:
         Script *mScript;        // Script object to be called
-        std::string mFunction;  // Name of the function called in the script object
+        Script::Ref mCallback;  // Reference to the function to call
         int mArg;               // Argument passed to script function (meaning is function-specific)
 };