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

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

Browse source
This commit is contained in:
AJ Martinez 2024-02-21 17:22:15 -07:00
parent 36b4e88e11
commit 09cdc60697
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

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

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

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