From 10a0b38ab1b41731505f1025949cc493fca4ea61 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 11 Sep 2019 14:24:49 +0100
Subject: [PATCH] Fix an issue where completing a stage normally would not
 correctly set startrings for the next one (as opposed to warping directly or
 dying inside it).

---
 src/p_setup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 65335be3f..bb96cf89f 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2242,7 +2242,7 @@ static void P_LevelInitStuff(void)
 		}
 
 		// obliteration station...
-		players[i].rings = players[i].spheres =\
+		players[i].spheres =\
 		 players[i].xtralife = players[i].deadtimer =\
 		 players[i].numboxes = players[i].totalring =\
 		 players[i].laps = players[i].aiming =\
@@ -2267,6 +2267,7 @@ static void P_LevelInitStuff(void)
 
 		// aha, the first evidence this shouldn't be a memset!
 		players[i].drillmeter = 40*20;
+		players[i].rings = (ultimatemode ? 0 : mapheaderinfo[gamemap-1]->startrings);
 
 		P_ResetPlayer(&players[i]);
 		// hit these too