From c6ba2ee0a7bc0c171accb2ea0cb47d7a5d209aea Mon Sep 17 00:00:00 2001 From: Indev Date: Wed, 3 Jan 2024 00:10:28 +0300 Subject: [PATCH] Fix warnings related to boolean glib getters/setters --- src/dehacked.c | 28 ++++++++++++++-------------- src/lua_glib.c | 4 +++- src/lua_glib.h | 4 ++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index b34303c20..28e5095f3 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -9941,15 +9941,15 @@ int LUA_EnumLib(lua_State *L) PUSHGETTER(gamemap, i16); PUSHGETTER(maptol, i16); PUSHGETTER(ultimatemode, b8); - PUSHGETTER(circuitmap, b32); - PUSHGETTER(netgame, b32); - PUSHGETTER(multiplayer, b32); + PUSHGETTER(circuitmap, bool); + PUSHGETTER(netgame, bool); + PUSHGETTER(multiplayer, bool); PUSHGETTER(modeattacking, b8); PUSHGETTER(splitscreen, u8); - PUSHGETTER(gamecomplete, b32); - PUSHGETTER(devparm, b32); - PUSHGETTER(majormods, b32); - PUSHGETTER(menuactive, b32); + PUSHGETTER(gamecomplete, bool); + PUSHGETTER(devparm, bool); + PUSHGETTER(majormods, bool); + PUSHGETTER(menuactive, bool); PUSHGETTER(paused, b8); PUSHGETTER(gametype, i16); PUSHGETTER(leveltime, u32); @@ -9962,13 +9962,13 @@ int LUA_EnumLib(lua_State *L) PUSHGETTER(mapmusposition, u32); PUSHGETTER(gravity, fxp); PUSHGETTER(gamespeed, u8); - PUSHGETTER(encoremode, b32); - PUSHGETTER(franticitems, b32); - PUSHGETTER(comeback, b32); + PUSHGETTER(encoremode, bool); + PUSHGETTER(franticitems, bool); + PUSHGETTER(comeback, bool); PUSHGETTER(wantedcalcdelay, u32); PUSHGETTER(indirectitemcooldown, u32); PUSHGETTER(hyubgone, u32); - PUSHGETTER(thwompsactive, b32); + PUSHGETTER(thwompsactive, bool); PUSHGETTER(spbplace, i8); PUSHGETTER(mapobjectscale, fxp); PUSHGETTER(racecountdown, u32); @@ -10006,12 +10006,12 @@ int LUA_EnumLib(lua_State *L) lua_pushcfunction(L, lua_glib_new_getter); lua_pushliteral(L, "isserver"); - lua_glib_push_b32_getter(L, &server); + lua_glib_push_bool_getter(L, &server); lua_call(L, 2, 0); lua_pushcfunction(L, lua_glib_new_getter); lua_pushliteral(L, "isdedicatedserver"); - lua_glib_push_b32_getter(L, &dedicated); + lua_glib_push_bool_getter(L, &dedicated); lua_call(L, 2, 0); lua_pushcfunction(L, lua_glib_new_getter); @@ -10021,7 +10021,7 @@ int LUA_EnumLib(lua_State *L) lua_pushcfunction(L, lua_glib_new_getter); lua_pushliteral(L, "replayplayback"); - lua_glib_push_b32_getter(L, &demo.playback); + lua_glib_push_bool_getter(L, &demo.playback); lua_call(L, 2, 0); if (!mathlib) diff --git a/src/lua_glib.c b/src/lua_glib.c index 3a39cfc17..07b3a87b6 100644 --- a/src/lua_glib.c +++ b/src/lua_glib.c @@ -336,7 +336,7 @@ int lua_glib_new_setter(lua_State *L) #define _GLIB_DECL_BOOL_SETTER(T, name) \ int lua_glib_setter_##name(lua_State *L) { \ T* ptr = (T*)lua_touserdata(L, lua_upvalueindex(1)); \ - *ptr = (T)lua_toboolean(L, 1); \ + *ptr = lua_toboolean(L, 1) ? true : false; \ return 0; \ } @@ -352,6 +352,7 @@ _GLIB_DECL_BOOL_GETTER(uint8_t, b8); _GLIB_DECL_BOOL_GETTER(uint16_t, b16); _GLIB_DECL_BOOL_GETTER(uint32_t, b32); _GLIB_DECL_BOOL_GETTER(uint64_t, b64); +_GLIB_DECL_BOOL_GETTER(boolean, bool); _GLIB_DECL_INT_SETTER(int8_t, i8); _GLIB_DECL_INT_SETTER(int16_t, i16); @@ -365,6 +366,7 @@ _GLIB_DECL_BOOL_SETTER(uint8_t, b8); _GLIB_DECL_BOOL_SETTER(uint16_t, b16); _GLIB_DECL_BOOL_SETTER(uint32_t, b32); _GLIB_DECL_BOOL_SETTER(uint64_t, b64); +_GLIB_DECL_BOOL_SETTER(boolean, bool); int lua_glib_setter_fxp(lua_State *L) { diff --git a/src/lua_glib.h b/src/lua_glib.h index 4d4b52f48..d21f9000c 100644 --- a/src/lua_glib.h +++ b/src/lua_glib.h @@ -108,6 +108,7 @@ int lua_glib_getter_b16(lua_State *L); int lua_glib_getter_b32(lua_State *L); int lua_glib_getter_b64(lua_State *L); int lua_glib_getter_fxp(lua_State *L); +int lua_glib_getter_bool(lua_State *L); int lua_glib_getter_str(lua_State *L); int lua_glib_getter_ptr(lua_State *L); @@ -128,6 +129,7 @@ int lua_glib_setter_b16(lua_State *L); int lua_glib_setter_b32(lua_State *L); int lua_glib_setter_b64(lua_State *L); int lua_glib_setter_fxp(lua_State *L); +int lua_glib_setter_bool(lua_State *L); #define _LUA_GLIB_DECL_PGETTER(T, name) \ static inline void lua_glib_push_##name##_getter(lua_State *L, T* ptr) { \ @@ -150,6 +152,7 @@ int lua_glib_setter_fxp(lua_State *L); _LUA_GLIB_DECL_PGETTER(uint32_t, b32); _LUA_GLIB_DECL_PGETTER(uint64_t, b64); _LUA_GLIB_DECL_PGETTER(fixed_t, fxp); + _LUA_GLIB_DECL_PGETTER(boolean, bool); #undef _LUA_GLIB_DECL_PGETTER #define _LUA_GLIB_DECL_PSETTER(T, name) \ @@ -171,6 +174,7 @@ int lua_glib_setter_fxp(lua_State *L); _LUA_GLIB_DECL_PSETTER(uint32_t, b32); _LUA_GLIB_DECL_PSETTER(uint64_t, b64); _LUA_GLIB_DECL_PSETTER(fixed_t, fxp); + _LUA_GLIB_DECL_PSETTER(boolean, bool); #undef _LUA_GLIB_DECL_PSETTER #endif