From 3e0a9cf742cf707da57e4f56c0c0e67cf9b71096 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sat, 19 Oct 2019 14:36:30 -0400
Subject: [PATCH] Revert my old attempt of making the level music fade out
 before game over jingle

---
 src/g_game.h  | 3 ---
 src/m_menu.c  | 2 +-
 src/p_inter.c | 2 +-
 src/p_setup.c | 6 ------
 src/p_tick.c  | 2 --
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/g_game.h b/src/g_game.h
index bebfaf514..df1301dd7 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -31,9 +31,6 @@ extern char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
 extern player_t players[MAXPLAYERS];
 extern boolean playeringame[MAXPLAYERS];
 
-extern INT32 fadetogameovermus;
-extern boolean gameovermus;
-
 // ======================================
 // DEMO playback/recording related stuff.
 // ======================================
diff --git a/src/m_menu.c b/src/m_menu.c
index feb0f1b84..9132c8d7d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8267,7 +8267,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
 	}
 
 	// Alternative menu header
-#ifdef CHOOSEPLAYER_DRAWHEADER //
+#ifdef CHOOSEPLAYER_DRAWHEADER
 	{
 		patch_t *header = W_CachePatchName("M_PICKP", PU_CACHE);
 		INT32 xtitle = 146;
diff --git a/src/p_inter.c b/src/p_inter.c
index c94a0b7f9..cce9df91b 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2477,7 +2477,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
 
 			if (target->player->lives <= 0) // Tails 03-14-2000
 			{
-				gameovermus = false;
+				boolean gameovermus = false;
 				if ((netgame || multiplayer) && (gametype == GT_COOP) && (cv_cooplives.value != 1))
 				{
 					INT32 i;
diff --git a/src/p_setup.c b/src/p_setup.c
index 23794a869..519226a3d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -81,10 +81,6 @@
 #include "p_slopes.h"
 #endif
 
-// Game over stuff
-boolean gameovermus;
-INT32 fadetogameovermus;
-
 //
 // Map MD5, calculated on level load.
 // Sent to clients in PT_SERVERINFO.
@@ -2610,8 +2606,6 @@ boolean P_SetupLevel(boolean skipprecip)
 	boolean loadedbm = false;
 	sector_t *ss;
 	boolean chase;
-	gameovermus = false;
-	fadetogameovermus = 0;
 	levelloading = true;
 
 	// This is needed. Don't touch.
diff --git a/src/p_tick.c b/src/p_tick.c
index 0a14d5fbd..6b5c7980c 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -24,8 +24,6 @@
 
 // Object place
 #include "m_cheat.h"
-boolean gameovermus;
-INT32 fadetogameovermus;
 
 tic_t leveltime;