diff --git a/lib/lua/lauxlib.h b/lib/lua/lauxlib.h index ac4d15f..aa855cb 100644 --- a/lib/lua/lauxlib.h +++ b/lib/lua/lauxlib.h @@ -193,9 +193,10 @@ typedef struct luaL_Stream { /* }====================================================== */ +// Hack by Allanis. Not recommended. /* compatibility with old module system */ -#if defined(LUA_COMPAT_MODULE) +//#if defined(LUA_COMPAT_MODULE) LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname, int sizehint); @@ -204,7 +205,7 @@ LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname, #define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) -#endif +//#endif #endif diff --git a/src/ai.c b/src/ai.c index 7db97a1..51b3dd9 100644 --- a/src/ai.c +++ b/src/ai.c @@ -46,7 +46,7 @@ // ============================================================ // FUCK LUA!!! -#define luaL_register(L,n,l) (luaL_openlib(L, (n),(l), 0)) +//#define luaL_register(L,n,l) (luaL_openlib(L, (n),(l), 0)) // Creates a new lua table. #define newtable(L) (lua_newtable(L), lua_gettop(L)) // Register a number constant n to name s (syntax is just like lua_regfunc). diff --git a/src/input.c b/src/input.c index 11115d1..8cd19e1 100644 --- a/src/input.c +++ b/src/input.c @@ -33,7 +33,7 @@ const char* keybindNames[] = { // Accel hacks. static unsigned int input_accelLast = 0; // Used to see if double tap. -int input_afterburnSensibility = 500; // ms between taps to afterburn. +unsigned int input_afterburnSensibility = 500; // ms between taps to afterburn. // From player.c extern double player_turn; diff --git a/src/misn_lua.c b/src/misn_lua.c index b4929eb..7b68cac 100644 --- a/src/misn_lua.c +++ b/src/misn_lua.c @@ -1,4 +1,5 @@ #include "lua.h" +#include "lualib.h" #include "lauxlib.h" #include "hook.h" @@ -10,7 +11,7 @@ #include "misn_lua.h" // FUCK LUA!!! -#define luaL_register(L,n,l) (luaL_openlib(L, (n),(l), 0)) +//#define luaL_register(L,n,l) (luaL_openlib(L, (n),(l), 0)) #define MIN_ARGS(n) if(lua_gettop(L) < n) return 0 @@ -192,7 +193,7 @@ static int player_pay(lua_State* L) { return 0; } -static rnd_int(lua_State* L) { +static int rnd_int(lua_State* L) { int o; o = lua_gettop(L); diff --git a/src/mission.c b/src/mission.c index 692b3f5..6aac223 100644 --- a/src/mission.c +++ b/src/mission.c @@ -11,6 +11,7 @@ #include "hook.h" #include "pack.h" #include "xml.h" +#include "faction.h" #include "mission.h" #define XML_MISSION_ID "Missions" // XML section identifier. @@ -27,7 +28,7 @@ static unsigned int mission_id = 0; Mission player_missions[MISSION_MAX]; // Mission stack. -static Mission* mission_stack = NULL; // Unmuteable after creation. +static MissionData* mission_stack = NULL; // Unmuteable after creation. static int mission_nstack = 0; // Extern. diff --git a/src/mission.h b/src/mission.h index ec34803..0d8dd45 100644 --- a/src/mission.h +++ b/src/mission.h @@ -62,6 +62,7 @@ void mission_accept(Mission* misn); // Load/Quit. int missions_load(void); +void mission_free(Mission* mission); void missions_free(void); void missions_cleanup(void); diff --git a/src/pilot.c b/src/pilot.c index fae7512..0fea028 100644 --- a/src/pilot.c +++ b/src/pilot.c @@ -953,7 +953,6 @@ static Fleet* fleet_parse(const xmlNodePtr parent) { #define MELEMENT(o,s) if(o) WARN("Fleet '%s' missing '"s"' element", tmp->name) MELEMENT(tmp->ai==NULL, "ai"); MELEMENT(tmp->faction==-1, "faction"); - MELEMENT(tmp->faction==NULL, "faction"); MELEMENT(tmp->pilots==NULL, "pilots"); #undef MELEMENT diff --git a/src/toolkit.c b/src/toolkit.c index 2651df8..5fabd75 100644 --- a/src/toolkit.c +++ b/src/toolkit.c @@ -788,6 +788,7 @@ static void window_render(Window* w) { static void toolkit_renderButton(Widget* btn, double bx, double by) { glColour* c, *dc, *oc, *lc; double x, y; + (void)oc; x = bx + btn->x; y = by + btn->y;