mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix some more ifdefs
This commit is contained in:
parent
9446a397d6
commit
84a4c7ba62
4 changed files with 10 additions and 6 deletions
|
|
@ -2755,11 +2755,16 @@ static int lib_sMusicExists(lua_State *L)
|
||||||
music_compat_name[6] = 0;
|
music_compat_name[6] = 0;
|
||||||
music_name = (const char *)&music_compat_name;
|
music_name = (const char *)&music_compat_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!player || P_IsLocalPlayer(player))
|
|
||||||
lua_pushinteger(L, (int)S_GetMusicLength());
|
|
||||||
else
|
else
|
||||||
lua_pushnil(L);
|
{
|
||||||
|
music_num = 0;
|
||||||
|
music_name = luaL_checkstring(L, 1);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
const char *music_name = luaL_checkstring(L, 1);
|
||||||
|
#endif
|
||||||
|
NOHUD
|
||||||
|
lua_pushboolean(L, S_MusicExists(music_name, checkMIDI, checkDigi));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2840,7 +2840,6 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
|
||||||
mobj->modeltilt = mobj->standingslope;
|
mobj->modeltilt = mobj->standingslope;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
if (diff2 & MD2_COLORIZED)
|
if (diff2 & MD2_COLORIZED)
|
||||||
mobj->colorized = READUINT8(save_p);
|
mobj->colorized = READUINT8(save_p);
|
||||||
if (diff2 & MD2_MIRRORED)
|
if (diff2 & MD2_MIRRORED)
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,6 @@ consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_co
|
||||||
|
|
||||||
// number of channels available
|
// number of channels available
|
||||||
consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
|
||||||
#endif
|
|
||||||
|
|
||||||
consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -887,6 +887,7 @@ void ST_Drawer(void)
|
||||||
|
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF|c, player_names[seenplayer-players]);
|
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF|c, player_names[seenplayer-players]);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Doom's status bar only updated if necessary.
|
// Doom's status bar only updated if necessary.
|
||||||
// However, ours updates every frame regardless, so the "refresh" param was removed
|
// However, ours updates every frame regardless, so the "refresh" param was removed
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue