set_sky improvements, set_sun, set_moon and set_stars

[dragonfireclient.git] / src / script / common / c_internal.h

diff --git a/src/script/common/c_internal.h b/src/script/common/c_internal.h
index 9a50b8e960c18db32cd65a97cb9ac02c7f7ef96c..d8cf3fe767e33c0f5a8f9990d801c625031db35d 100644 (file)
--- a/src/script/common/c_internal.h
+++ b/src/script/common/c_internal.h
@@ -24,8 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /******************************************************************************/
 /******************************************************************************/
 
-#ifndef C_INTERNAL_H_
-#define C_INTERNAL_H_
+#pragma once
 
 extern "C" {
 #include <lua.h>
@@ -34,6 +33,41 @@ extern "C" {
 
 #include "common/c_types.h"
 
+
+/*
+       Define our custom indices into the Lua registry table.
+
+       Lua 5.2 and above define the LUA_RIDX_LAST macro. Only numbers above that
+       may be used for custom indices, anything else is reserved.
+
+       Lua 5.1 / LuaJIT do not use any numeric indices (only string indices),
+       so we can use numeric indices freely.
+*/
+#ifdef LUA_RIDX_LAST
+#define CUSTOM_RIDX_BASE ((LUA_RIDX_LAST)+1)
+#else
+#define CUSTOM_RIDX_BASE 1
+#endif
+
+#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_BACKTRACE           (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_BACKTRACE), lua_gettop((L)))
+
+#define PCALL_RESL(L, RES) {                            \
+       int result_ = (RES);                                \
+       if (result_ != 0) {                                 \
+               script_error((L), result_, NULL, __FUNCTION__); \
+       }                                                   \
+}
+
+#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.
@@ -61,12 +95,14 @@ enum RunCallbacksMode
        // after seeing the first true value
        RUN_CALLBACKS_MODE_OR_SC,
        // Note: "a true value" and "a false value" refer to values that
-       // are converted by lua_toboolean to true or false, respectively.
+       // are converted by readParam<bool> to true or false, respectively.
 };
 
-std::string script_get_backtrace   (lua_State *L);
-void        script_error           (lua_State *L, const char *fmt, ...);
-void        script_run_callbacks   (lua_State *L, int nargs,
-                                    RunCallbacksMode mode);
+std::string script_get_backtrace(lua_State *L);
+int script_exception_wrapper(lua_State *L, lua_CFunction f);
+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);
 
-#endif /* C_INTERNAL_H_ */
+void log_deprecated(lua_State *L, const std::string &message,
+       int stack_depth=1);