From 7731bf6b09d5027bd984c2641911e361a6d24103 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Wed, 21 Aug 2019 21:25:45 -0400 Subject: [PATCH 1/4] Use correct integer format --- src/lua_playerlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index dd743932..1b219c70 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -628,7 +628,7 @@ static int power_get(lua_State *L) UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS)); powertype_t p = luaL_checkinteger(L, 2); if (p >= NUMPOWERS) - return luaL_error(L, LUA_QL("powertype_t") " cannot be %u", p); + return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", p); lua_pushinteger(L, powers[p]); return 1; } @@ -640,7 +640,7 @@ static int power_set(lua_State *L) powertype_t p = luaL_checkinteger(L, 2); UINT16 i = (UINT16)luaL_checkinteger(L, 3); if (p >= NUMPOWERS) - return luaL_error(L, LUA_QL("powertype_t") " cannot be %u", p); + return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", p); if (hud_running) return luaL_error(L, "Do not alter player_t in HUD rendering code!"); powers[p] = i; From 9f7613ef6d280d30b571f35fbf53293004172450 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Sat, 24 Aug 2019 18:22:18 -0400 Subject: [PATCH 2/4] Typecast p to INT16 Since the enum type is implementation-defined, and could be either signed or unsigned. --- src/lua_playerlib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 1b219c70..d5b949f4 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -628,19 +628,19 @@ static int power_get(lua_State *L) UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS)); powertype_t p = luaL_checkinteger(L, 2); if (p >= NUMPOWERS) - return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", p); + return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", (INT16)p); lua_pushinteger(L, powers[p]); return 1; } // powers, p, value -> powers[p] = value -static int power_set(lua_State *L) -{ +static int power_set(lua_State *L){ + UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS)); powertype_t p = luaL_checkinteger(L, 2); UINT16 i = (UINT16)luaL_checkinteger(L, 3); if (p >= NUMPOWERS) - return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", p); + return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", (INT16)p); if (hud_running) return luaL_error(L, "Do not alter player_t in HUD rendering code!"); powers[p] = i; From 08808e220077b8899e361423cb665903d3c360ad Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Sat, 24 Aug 2019 18:27:07 -0400 Subject: [PATCH 3/4] I don't even know how this happened --- src/lua_playerlib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index d5b949f4..b3bda252 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -634,7 +634,8 @@ static int power_get(lua_State *L) } // powers, p, value -> powers[p] = value -static int power_set(lua_State *L){ +static int power_set(lua_State *L) +{ UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS)); powertype_t p = luaL_checkinteger(L, 2); From 13d627ee7fbe64697845cfea613a384c5ca81b40 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Sat, 24 Aug 2019 18:29:56 -0400 Subject: [PATCH 4/4] Remove extra whitespace --- src/lua_playerlib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index b3bda252..68e3e789 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -636,7 +636,6 @@ static int power_get(lua_State *L) // powers, p, value -> powers[p] = value static int power_set(lua_State *L) { - UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS)); powertype_t p = luaL_checkinteger(L, 2); UINT16 i = (UINT16)luaL_checkinteger(L, 3);