From e8ac1c391c78e1f29867fd17e78fa9e8b4bef9f4 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 4 Dec 2019 17:32:47 +0000
Subject: [PATCH] Make rings 0 in competition winner selection if you gamed or
 timed over, and use the MAXSCORE macro instead of a hardcoded value.

---
 src/y_inter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/y_inter.c b/src/y_inter.c
index 32548d263..78f333da6 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1622,11 +1622,14 @@ static void Y_CalculateCompetitionWinners(void)
 		for (j = 0; j < 5; j++)
 			bestat[j] = true;
 
+		if ((players[i].pflags & PF_GAMETYPEOVER) || players[i].lives <= 0)
+			players[i].rings = 0;
+
 		times[i]    = players[i].realtime;
 		rings[i]    = (UINT32)max(players[i].rings, 0);
 		maxrings[i] = (UINT32)players[i].totalring;
 		monitors[i] = (UINT32)players[i].numboxes;
-		scores[i]   = (UINT32)min(players[i].score, 99999990);
+		scores[i]   = (UINT32)min(players[i].score, MAXSCORE);
 
 		for (j = 0; j < MAXPLAYERS; j++)
 		{