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)