diff options
Diffstat (limited to 'src/script/common')
| -rw-r--r-- | src/script/common/c_internal.cpp | 14 | ||||
| -rw-r--r-- | src/script/common/c_internal.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp index 2a10ce0f2..14d992df0 100644 --- a/src/script/common/c_internal.cpp +++ b/src/script/common/c_internal.cpp @@ -136,28 +136,28 @@ void script_run_callbacks_f(lua_State *L, int nargs, FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments"); // Insert error handler - lua_pushcfunction(L, script_error_handler); - int errorhandler = lua_gettop(L) - nargs - 1; - lua_insert(L, errorhandler); + PUSH_ERROR_HANDLER(L); + int error_handler = lua_gettop(L) - nargs - 1; + lua_insert(L, error_handler); // Insert run_callbacks between error handler and table lua_getglobal(L, "core"); lua_getfield(L, -1, "run_callbacks"); lua_remove(L, -2); - lua_insert(L, errorhandler + 1); + lua_insert(L, error_handler + 1); // Insert mode after table lua_pushnumber(L, (int) mode); - lua_insert(L, errorhandler + 3); + lua_insert(L, error_handler + 3); // Stack now looks like this: // ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n> - int result = lua_pcall(L, nargs + 2, 1, errorhandler); + int result = lua_pcall(L, nargs + 2, 1, error_handler); if (result != 0) script_error(L, result, NULL, fxn); - lua_remove(L, -2); // Remove error handler + lua_remove(L, error_handler); } void log_deprecated(lua_State *L, const std::string &message) diff --git a/src/script/common/c_internal.h b/src/script/common/c_internal.h index 80576b5e9..fc59b0e2e 100644 --- a/src/script/common/c_internal.h +++ b/src/script/common/c_internal.h @@ -53,7 +53,11 @@ extern "C" { #define CUSTOM_RIDX_SCRIPTAPI (CUSTOM_RIDX_BASE) #define CUSTOM_RIDX_GLOBALS_BACKUP (CUSTOM_RIDX_BASE + 1) #define CUSTOM_RIDX_CURRENT_MOD_NAME (CUSTOM_RIDX_BASE + 2) +#define CUSTOM_RIDX_ERROR_HANDLER (CUSTOM_RIDX_BASE + 3) +// Pushes the error handler onto the stack and returns its index +#define PUSH_ERROR_HANDLER(L) \ + (lua_rawgeti((L), LUA_REGISTRYINDEX, CUSTOM_RIDX_ERROR_HANDLER), lua_gettop((L))) #define PCALL_RESL(L, RES) do { \ int result_ = (RES); \ |