lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Lua: Fix music functions not returning proper values

Browse source 
# Conflicts:
#	src/lua_baselib.c
This commit is contained in:
mazmazz 2018-08-15 02:29:04 -04:00
parent 6bde90f887
commit 8fe4c369bf
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lua_baselib.c
View file

@ -2206,7 +2206,6 @@ static int lib_sChangeMusic(lua_State *L)
music_name = luaL_checkstring(L, 1);
}
looping = (boolean)lua_opttrueboolean(L, 2);
#else
@ -2231,6 +2230,8 @@ static int lib_sChangeMusic(lua_State *L)
#endif
music_flags = (UINT16)luaL_optinteger(L, 4, 0);
fadein_ms = luaL_optinteger(L, 5, 0);
if (!player || P_IsLocalPlayer(player))
{
S_ChangeMusic(music_name, music_flags, looping);
@ -2238,7 +2239,7 @@ static int lib_sChangeMusic(lua_State *L)
}
else
lua_pushnil(L);
return 0;
return 1;
}
static int lib_sSpeedMusic(lua_State *L)
@ -2348,7 +2349,7 @@ static int lib_sStopMusic(lua_State *L)
}
else
lua_pushnil(L);
return 0;
return 1;
}
static int lib_sDigitalPlaying(lua_State *L)