ACTIONSCRIPT: Add saving and restoring of "this" variable

xoreos · Aug 19, 2018 · a6c7114 · a6c7114
1 parent 2e4d4b3
commit a6c7114
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/aurora/actionscript/asbuffer.cpp b/src/aurora/actionscript/asbuffer.cpp
@@ -435,10 +435,13 @@ void ASBuffer::actionCallMethod(AVM &avm) {
 		throw Common::Exception("Object is not a function");
 
 	byte counter = 1;
+	Variable prevThis;
 
 	if (function->getPreloadThisFlag()) {
-		if (!name.empty())
+		if (!name.empty()) {
+			prevThis = avm.getRegister(counter);
 			avm.storeRegister(object, counter);
+		}
 		counter += 1;
 	}
 	if (function->getPreloadSuperFlag()) {
@@ -454,6 +457,9 @@ void ASBuffer::actionCallMethod(AVM &avm) {
 	avm.setReturnValue(Variable());
 	_stack.push((*function)(avm));
 
+	if (!prevThis.isUndefined())
+		avm.storeRegister(prevThis, 1);
+
 	debugC(kDebugActionScript, 1, "actionCallMethod");
 }