ACTIONSCRIPT: Enable calling objects themselves

xoreos · Sep 30, 2019 · 1550d7b · 1550d7b
1 parent 864311f
commit 1550d7b
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/aurora/actionscript/object.cpp b/src/aurora/actionscript/object.cpp
@@ -89,13 +89,21 @@ void Object::setMember(const Common::UString &id, Function *function) {
 }
 
 Variable Object::call(const Common::UString &function, AVM &avm, const std::vector<Variable> &arguments) {
-	if (!hasMember(function))
-		throw Common::Exception("object has no member %s", function.c_str());
+	Function *f = reinterpret_cast<Function *>(getMember(function).asObject().get());
 
-	if (!getMember(function).isFunction())
-		throw Common::Exception("%s is no method", function.c_str());
+	if (!function.empty()) {
+		if (!hasMember(function))
+			throw Common::Exception("object has no member %s", function.c_str());
 
-	Function *f = reinterpret_cast<Function *>(getMember(function).asObject().get());
+		if (!getMember(function).isFunction())
+			throw Common::Exception("%s is no method", function.c_str());
+
+		f = reinterpret_cast<Function *>(getMember(function).asObject().get());
+	} else {
+		f = dynamic_cast<Function *>(this);
+		if (!f)
+			throw Common::Exception("Object is no function");
+	}
 
 	byte counter = 1;
 	if (f->getPreloadRootFlag()) {