[Scummvm-git-logs] scummvm master -> 8173ea0d79974c1b2271e55b308048800c28c02f
bluegr
noreply at scummvm.org
Tue Mar 4 08:39:37 UTC 2025
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:
8173ea0d79 SWORD25: Fix overriden instances of preFunctionInvocation()
Commit: 8173ea0d79974c1b2271e55b308048800c28c02f
https://github.com/scummvm/scummvm/commit/8173ea0d79974c1b2271e55b308048800c28c02f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-04T10:39:19+02:00
Commit Message:
SWORD25: Fix overriden instances of preFunctionInvocation()
Changed paths:
engines/sword25/gfx/graphicengine_script.cpp
engines/sword25/input/inputengine_script.cpp
engines/sword25/script/luacallback.cpp
engines/sword25/script/luacallback.h
diff --git a/engines/sword25/gfx/graphicengine_script.cpp b/engines/sword25/gfx/graphicengine_script.cpp
index d8e432ae25b..65872c5289c 100644
--- a/engines/sword25/gfx/graphicengine_script.cpp
+++ b/engines/sword25/gfx/graphicengine_script.cpp
@@ -58,7 +58,7 @@ public:
Common::String Action;
protected:
- virtual int PreFunctionInvokation(lua_State *L) {
+ int preFunctionInvocation(lua_State *L) override {
lua_pushstring(L, Action.c_str());
return 1;
}
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index e126c000084..fd848feff3b 100644
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -51,7 +51,7 @@ public:
Common::String _character;
protected:
- int preFunctionInvokation(lua_State *L) override {
+ int preFunctionInvocation(lua_State *L) override {
lua_pushstring(L, _character.c_str());
return 1;
}
@@ -68,7 +68,7 @@ public:
InputEngine::KEY_COMMANDS _command;
protected:
- int preFunctionInvokation(lua_State *L) override {
+ int preFunctionInvocation(lua_State *L) override {
lua_pushnumber(L, _command);
return 1;
}
diff --git a/engines/sword25/script/luacallback.cpp b/engines/sword25/script/luacallback.cpp
index 2ba7e3ac4e3..ae6e898afdb 100644
--- a/engines/sword25/script/luacallback.cpp
+++ b/engines/sword25/script/luacallback.cpp
@@ -113,7 +113,7 @@ void LuaCallback::invokeCallbackFunctions(lua_State *L, uint objectHandle) {
// Pre-Function Call
// Derived classes can function in this parameter onto the stack.
// The return value indicates the number of parameters
- int argumentCount = preFunctionInvokation(L);
+ int argumentCount = preFunctionInvocation(L);
// Lua_pcall the function and the parameters pop themselves from the stack
if (lua_pcall(L, argumentCount, 0, 0) != 0) {
diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h
index 50465811841..e8032986bba 100644
--- a/engines/sword25/script/luacallback.h
+++ b/engines/sword25/script/luacallback.h
@@ -53,7 +53,7 @@ public:
void invokeCallbackFunctions(lua_State *L, uint objectHandle);
protected:
- virtual int preFunctionInvokation(lua_State *L) {
+ virtual int preFunctionInvocation(lua_State *L) {
return 0;
}
More information about the Scummvm-git-logs
mailing list