From 09cdc60697cb943d5ecd37719e037968d6c693d0 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Wed, 21 Feb 2024 17:22:15 -0700
Subject: [PATCH] Suppress bufo spawn, bufo sound, and hud messages when
 exiting

---
 src/k_hud.cpp              | 6 ++++++
 src/objects/battle-ufo.cpp | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index acfa84f7b..3a086505f 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -5739,6 +5739,8 @@ struct messagestate_t
 				return;
 		}
 
+		if (exitcountdown)
+			return;
 
 		if (timer == 0 && mode == MM_IN)
 			S_StartSound(NULL, sfx_s3k47);
@@ -5850,6 +5852,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];
diff --git a/src/objects/battle-ufo.cpp b/src/objects/battle-ufo.cpp
index a980eeb71..5a768f9c9 100644
--- a/src/objects/battle-ufo.cpp
+++ b/src/objects/battle-ufo.cpp
@@ -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);
 	}