[Scummvm-git-logs] scummvm master -> d9ba513ad060eadd977ff10dd4f0963afa745d4d

SupSuper supsuper at gmail.com
Wed Mar 3 22:03:50 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d9ba513ad0 AGS: Fix return type of plugin method calls


Commit: d9ba513ad060eadd977ff10dd4f0963afa745d4d
    https://github.com/scummvm/scummvm/commit/d9ba513ad060eadd977ff10dd4f0963afa745d4d
Author: SupSuper (supsuper at gmail.com)
Date: 2021-03-03T22:03:08Z

Commit Message:
AGS: Fix return type of plugin method calls

Changed paths:
    engines/ags/engine/script/script_runtime.cpp


diff --git a/engines/ags/engine/script/script_runtime.cpp b/engines/ags/engine/script/script_runtime.cpp
index 628b792ca3..a3c5b662af 100644
--- a/engines/ags/engine/script/script_runtime.cpp
+++ b/engines/ags/engine/script/script_runtime.cpp
@@ -42,6 +42,7 @@
 #include "ags/plugins/agsplugin.h"
 #include "ags/engine/ac/dynobj/cc_dynamicarray.h"
 #include "ags/engine/ac/statobj/staticobject.h"
+#include "ags/plugins/plugin_base.h"
 
 namespace AGS3 {
 
@@ -186,8 +187,7 @@ int call_function(intptr_t addr, const RuntimeScriptValue *object, int numparm,
 			params.push_back(parm_value[i]);
 
 		// Call the method
-		typedef int (*ScriptMethod)(const ScriptMethodParams &params);
-		ScriptMethod fparam = (ScriptMethod)addr;
+		Plugins::PluginFunction fparam = (Plugins::PluginFunction)addr;
 		return fparam(params);
 	}
 }




More information about the Scummvm-git-logs mailing list