thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'public/master'

Browse source
This commit is contained in:
Sally Coolatta 2020-05-16 00:08:53 -04:00
commit 8be2d12b99
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/command.c
View file

@ -547,10 +547,7 @@ static void COM_ExecuteString(char *ptext)
if (!stricmp(com_argv[0], a->name)) if (!stricmp(com_argv[0], a->name))
{ {
if (recursion > MAX_ALIAS_RECURSION) if (recursion > MAX_ALIAS_RECURSION)
{
CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n")); CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
recursion = 0;
}
else else
{ {
char buf[1024]; char buf[1024];
@ -582,8 +579,10 @@ static void COM_ExecuteString(char *ptext)
} }
WRITESTRING(write, read); WRITESTRING(write, read);
// Monster Iestyn: keep track of how many levels of recursion we're in
recursion++; recursion++;
COM_BufInsertText(buf); COM_BufInsertText(buf);
recursion--;
} }
return; return;
} }

1
src/d_clisrv.c
View file

@ -2478,6 +2478,7 @@ static void Command_ClearBans(void)
return; return;
I_ClearBans(); I_ClearBans();
D_SaveBan();
reasontail = NULL; reasontail = NULL;
while (reasonhead) while (reasonhead)
{ {

2
src/r_main.c
View file

@ -1149,7 +1149,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
aimingangle = player->aiming; aimingangle = player->aiming;
viewangle = viewmobj->angle; viewangle = viewmobj->angle;
if (/*!demo.playback && */player->playerstate != PST_DEAD) if (!demo.playback && player->playerstate != PST_DEAD)
{ {
if (player == &players[consoleplayer]) if (player == &players[consoleplayer])
{ {

5
src/sdl/sdl_sound.c
View file

@ -1173,7 +1173,10 @@ void I_StartupSound(void)
const char *sdrv_name = NULL; const char *sdrv_name = NULL;
#endif #endif
#ifndef HAVE_MIXER #ifndef HAVE_MIXER
midi_disabled = digital_disabled = true; #ifndef NO_MIDI
midi_disabled =
#endif
digital_disabled = true;
#endif #endif
memset(channels, 0, sizeof (channels)); //Alam: Clean it memset(channels, 0, sizeof (channels)); //Alam: Clean it