Merge branch 'musicchange-fix' into 'next'

Fix MusicChange lua hook returning some values incorrectly

See merge request KartKrew/Kart-Public!287
This commit is contained in:
Sal 2022-07-04 09:17:53 +00:00
commit cf4bb3bbe0

View file

@ -1306,13 +1306,13 @@ boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boo
if (lua_isboolean(gL, -4)) if (lua_isboolean(gL, -4))
*looping = lua_toboolean(gL, -4); *looping = lua_toboolean(gL, -4);
// output 4: position override // output 4: position override
if (lua_isboolean(gL, -3)) if (lua_isnumber(gL, -3))
*position = lua_tonumber(gL, -3); *position = lua_tonumber(gL, -3);
// output 5: prefadems override // output 5: prefadems override
if (lua_isboolean(gL, -2)) if (lua_isnumber(gL, -2))
*prefadems = lua_tonumber(gL, -2); *prefadems = lua_tonumber(gL, -2);
// output 6: fadeinms override // output 6: fadeinms override
if (lua_isboolean(gL, -1)) if (lua_isnumber(gL, -1))
*fadeinms = lua_tonumber(gL, -1); *fadeinms = lua_tonumber(gL, -1);
lua_pop(gL, 6); lua_pop(gL, 6);