ACTIONSCRIPT: Add support for static functions to avm

xoreos · Sep 30, 2019 · 279fdb0 · 279fdb0
1 parent 0d785e9
commit 279fdb0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/aurora/actionscript/avm.cpp b/src/aurora/actionscript/avm.cpp
@@ -137,6 +137,17 @@ Variable AVM::getVariable(const Common::UString &name) {
 	}
 }
 
+Variable AVM::callFunction(const Common::UString &name, const std::vector<Variable> &arguments) {
+	std::map<Common::UString, StaticFunction>::const_iterator iter = _functions.find(name);
+
+	if (iter == _functions.end()) {
+		warning("Function %s does not exist", name.c_str());
+		return Variable();
+	}
+
+	return (*iter).second(arguments);
+}
+
 Variable AVM::createNewObject(const Common::UString &name, std::vector<Variable> arguments) {
 	Variable variable = getVariable(name);
 

diff --git a/src/aurora/actionscript/avm.h b/src/aurora/actionscript/avm.h
@@ -46,6 +46,9 @@ typedef boost::function<Variable(const Common::UString &, const Common::UString
 /** Function for registering classes for widgets. */
 typedef boost::function<void (const Common::UString &, ObjectPtr)> RegisterClassFunction;
 
+/** Prototype for ActionScript static functions. */
+typedef boost::function<Variable(std::vector<Variable>)> StaticFunction;
+
 /** The Action script virtual machine (AVM). */
 class AVM {
 public:
@@ -80,6 +83,9 @@ class AVM {
 	void setVariable(const Common::UString &name, Variable value);
 	Variable getVariable(const Common::UString &name);
 
+	/** Call a specific static function. */
+	Variable callFunction(const Common::UString &name, const std::vector<Variable> &arguments);
+
 	Variable createNewObject(const Common::UString &name,
 	                         std::vector<Variable> arguments = std::vector<Variable>());
 
@@ -99,6 +105,7 @@ class AVM {
 
 	std::vector<std::stack<Variable>> _registers;
 	std::map<Common::UString, Variable> _variables;
+	std::map<Common::UString, StaticFunction> _functions;
 
 	bool _stopFlag;
 	Variable _returnValue;