stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-12 04:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse source
This commit is contained in:
James R 2019-10-07 18:19:48 -07:00
commit 34bddc1ce7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lua_playerlib.c
View file

@ -628,7 +628,7 @@ static int power_get(lua_State *L)
UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS)); UINT16 *powers = *((UINT16 **)luaL_checkudata(L, 1, META_POWERS));
powertype_t p = luaL_checkinteger(L, 2); powertype_t p = luaL_checkinteger(L, 2);
if (p >= NUMPOWERS) 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", (INT16)p);
lua_pushinteger(L, powers[p]); lua_pushinteger(L, powers[p]);
return 1; return 1;
} }
@ -640,7 +640,7 @@ static int power_set(lua_State *L)
powertype_t p = luaL_checkinteger(L, 2); powertype_t p = luaL_checkinteger(L, 2);
UINT16 i = (UINT16)luaL_checkinteger(L, 3); UINT16 i = (UINT16)luaL_checkinteger(L, 3);
if (p >= NUMPOWERS) 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", (INT16)p);
if (hud_running) if (hud_running)
return luaL_error(L, "Do not alter player_t in HUD rendering code!"); return luaL_error(L, "Do not alter player_t in HUD rendering code!");
powers[p] = i; powers[p] = i;