2 files changed, 4 insertions, 42 deletions
diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index 66f6a9b98..df82dba14 100644
--- a/src/script/common/c_internal.cpp
+++ b/src/script/common/c_internal.cpp
@@ -101,42 +101,6 @@ void script_error(lua_State *L, int pcall_result, const char *mod, const char *f
 	throw LuaError(err_msg);
 }
 
-// Push the list of callbacks (a lua table).
-// Then push nargs arguments.
-// Then call this function, which
-// - runs the callbacks
-// - replaces the table and arguments with the return value,
-//     computed depending on mode
-void script_run_callbacks_f(lua_State *L, int nargs,
-	RunCallbacksMode mode, const char *fxn)
-{
-	FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments");
-
-	// Insert error handler
-	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, error_handler + 1);
-
-	// Insert mode after table
-	lua_pushnumber(L, (int) mode);
-	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, error_handler);
-	if (result != 0)
-		script_error(L, result, NULL, fxn);
-
-	lua_remove(L, error_handler);
-}
-
 static void script_log_add_source(lua_State *L, std::string &message, int stack_depth)
 {
 	lua_Debug ar;
diff --git a/src/script/common/c_internal.h b/src/script/common/c_internal.h
index 4ddbed232..ab2d7b975 100644
--- a/src/script/common/c_internal.h
+++ b/src/script/common/c_internal.h
@@ -75,9 +75,6 @@ extern "C" {
 	}                                                   \
 }
 
-#define script_run_callbacks(L, nargs, mode) \
-	script_run_callbacks_f((L), (nargs), (mode), __FUNCTION__)
-
 // What script_run_callbacks does with the return values of callbacks.
 // Regardless of the mode, if only one callback is defined,
 // its return value is the total return value.
@@ -108,16 +105,17 @@ enum RunCallbacksMode
 	// are converted by readParam<bool> to true or false, respectively.
 };
 
+// Gets a backtrace of the current execution point
 std::string script_get_backtrace(lua_State *L);
+// Wrapper for CFunction calls that converts C++ exceptions to Lua errors
 int script_exception_wrapper(lua_State *L, lua_CFunction f);
+// Takes an error from lua_pcall and throws it as a LuaError
 void script_error(lua_State *L, int pcall_result, const char *mod, const char *fxn);
-void script_run_callbacks_f(lua_State *L, int nargs,
-	RunCallbacksMode mode, const char *fxn);
 
 bool script_log_unique(lua_State *L, std::string message, std::ostream &log_to,
 	int stack_depth = 1);
 
-enum class DeprecatedHandlingMode {
+enum DeprecatedHandlingMode {
 	Ignore,
 	Log,
 	Error