thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge errors

Browse source
This commit is contained in:
mazmazz 2018-08-15 02:42:50 -04:00
parent c912fab1da
commit da5fd51feb
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lua_baselib.c
View file

@ -2236,8 +2236,6 @@ static int lib_sChangeMusic(lua_State *L)
#endif #endif
music_flags = (UINT16)luaL_optinteger(L, 4, 0); music_flags = (UINT16)luaL_optinteger(L, 4, 0);
fadein_ms = luaL_optinteger(L, 5, 0);
if (!player || P_IsLocalPlayer(player)) if (!player || P_IsLocalPlayer(player))
{ {
S_ChangeMusic(music_name, music_flags, looping); S_ChangeMusic(music_name, music_flags, looping);
@ -2314,12 +2312,6 @@ static int lib_sPauseMusic(lua_State *L)
static int lib_sResumeMusic(lua_State *L) static int lib_sResumeMusic(lua_State *L)
{ {
player_t *player = NULL;
NOHUD
if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
{
player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
UINT32 position = (UINT32)luaL_checkinteger(L, 1);
player_t *player = NULL; player_t *player = NULL;
NOHUD NOHUD
if (!lua_isnone(L, 2) && lua_isuserdata(L, 2)) if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
@ -2351,7 +2343,7 @@ static int lib_sStopMusic(lua_State *L)
if (!player || P_IsLocalPlayer(player)) if (!player || P_IsLocalPlayer(player))
{ {
S_StopMusic(); S_StopMusic();
lua_pushboolean(L, true) lua_pushboolean(L, true);
} }
else else
lua_pushnil(L); lua_pushnil(L);

10
src/sdl/mixer_sound.c
View file

@ -528,16 +528,6 @@ boolean I_MusicPlaying(void)
return (boolean)music; return (boolean)music;
} }
boolean I_MIDIPlaying(void)
{
return midimode && music;
}
boolean I_MusicPlaying(void)
{
return (boolean)music;
}
boolean I_MusicPaused(void) boolean I_MusicPaused(void)
{ {
return Mix_PausedMusic(); return Mix_PausedMusic();