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

Merge branch 'shut-the-fuck-up-bufo' into 'master'

Browse source 
Suppress bufo spawn, bufo sound, and hud messages when exiting

Closes #1057

See merge request KartKrew/Kart!1937
This commit is contained in:
Oni 2024-02-25 07:24:05 +00:00
commit dc561c8737
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_hud.cpp
View file

@ -5682,6 +5682,8 @@ struct messagestate_t
return;
}
if (exitcountdown)
return;
if (timer == 0 && mode == MM_IN)
S_StartSound(NULL, sfx_s3k47);
@ -5793,6 +5795,10 @@ void K_TickMessages()
static void K_DrawMessageFeed(void)
{
int i;
if (exitcountdown)
return;
for (i = 0; i <= r_splitscreen; i++)
{
messagestate_t state = messagestates[i];

7
src/objects/battle-ufo.cpp
View file

@ -112,6 +112,11 @@ public:
return;
}
if (exitcountdown)
{
return;
}
Fixed ofs = mobjinfo[MT_BATTLEUFO].height / 4;
Spawner* spawner = next(g_battleufo.previousId);
@ -145,7 +150,7 @@ void Obj_BattleUFOThink(mobj_t *mobj)
ufo->spawn_beam();
}
if ((ufo->extravalue1 % (TICRATE*2)) == 0)
if (!exitcountdown && (ufo->extravalue1 % (TICRATE*2)) == 0)
{
S_StartSound(ufo, sfx_s3ka5);
}