From 08efd4321c28a6a696fc200f0054e1c60c44323b Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Mon, 30 Mar 2026 15:15:57 -0400
Subject: [PATCH] Fix map music not playing on Join

---
 src/g_game.c | 2 +-
 src/p_mobj.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index cf1941d0c..5e67eb464 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3583,7 +3583,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 		}
 	}
 
-	if (betweenmaps)
+	if (betweenmaps && !(p->jointime <= 1))
 		return;
 
 	if (leveltime < starttime)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 51469e7da..8a2b5760e 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12385,7 +12385,6 @@ void P_RespawnSpecials(void)
 //
 void P_SpawnPlayer(INT32 playernum)
 {
-	UINT8 i;
 	player_t *p = &players[playernum];
 	mobj_t *mobj;