From 6882ea7671d35d9cddb957bbb963e03677063691 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 1 May 2023 18:58:18 +0100
Subject: [PATCH] P_EndingMusic: Change priority

- In gametypes where you can exit successfully but get PF_NOCONTEST, play the _lose jingle instead of RETIRE
    - Affects Prison Break, Sealed Stars
- If you're losing, even if in first place, don't play the _first jingle
    - Affects Prison Break
---
 src/p_user.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/p_user.c b/src/p_user.c
index 49ee31f5d..4aca1f15b 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -733,16 +733,16 @@ void P_EndingMusic(void)
 			continue;
 		}
 
-		if (checkPlayer->pflags & PF_NOCONTEST)
-		{
-			// No Contest, use special value
-			;
-		}
-		else if (checkPlayer->exiting)
+		if (checkPlayer->exiting)
 		{
 			// Standard exit, use their position
 			pos = checkPlayer->position;
 		}
+		else if (checkPlayer->pflags & PF_NOCONTEST)
+		{
+			// No Contest without finishing, use special value
+			;
+		}
 		else
 		{
 			// Not finished, ignore
@@ -778,15 +778,7 @@ void P_EndingMusic(void)
 	}
 	else
 	{
-		if (bestPlayer->position == 1)
-		{
-			jingle = "_first";
-		}
-		else if (K_IsPlayerLosing(bestPlayer) == false)
-		{
-			jingle = "_win";
-		}
-		else
+		if (K_IsPlayerLosing(bestPlayer) == true)
 		{
 			jingle = "_lose";
 
@@ -796,6 +788,14 @@ void P_EndingMusic(void)
 				nointer = true;
 			}
 		}
+		else if (bestPlayer->position == 1)
+		{
+			jingle = "_first";
+		}
+		else if (K_IsPlayerLosing(bestPlayer) == false)
+		{
+			jingle = "_win";
+		}
 	}
 
 	if (nointer == true)