stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 10:31:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lua merge fixes

Browse source
This commit is contained in:
mazmazz 2018-08-18 18:57:53 -04:00
parent 8b6c24c6fa
commit 137291d50b
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lua_baselib.c
View file

@ -2293,8 +2293,18 @@ static int lib_sSetMusicPosition(lua_State *L)
static int lib_sGetMusicPosition(lua_State *L)
{
player_t *player = NULL;
NOHUD
lua_pushinteger(L, (UINT32)S_GetMusicPosition());
if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
{
player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
if (!player)
return LUA_ErrInvalid(L, "player_t");
}
if (!player || P_IsLocalPlayer(player))
lua_pushinteger(L, (int)S_GetMusicPosition());
else
lua_pushnil(L);
return 1;
}
@ -2322,9 +2332,9 @@ static int lib_sResumeMusic(lua_State *L)
{
player_t *player = NULL;
NOHUD
if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
{
player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
if (!player)
return LUA_ErrInvalid(L, "player_t");
}