From c5ab2ffa11ee412c646c5539faf413692d90996e Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 9 Jun 2018 21:42:37 +0100
Subject: [PATCH] At FF and Sphere's suggestion, make the ring hoops work
 natively in normal stages and require more replacing for special stage
 conversion purposes.

---
 src/p_mobj.c | 62 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index efac937b8..2131c42d1 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10809,6 +10809,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 	sector_t *sec;
 	TVector v, *res;
 	angle_t closestangle, fa;
+	boolean nightsreplace = ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap));
 
 	x = mthing->x << FRACBITS;
 	y = mthing->y << FRACBITS;
@@ -11095,7 +11096,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 		if (ultimatemode)
 			return; // No rings in Ultimate!
 
-		if ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap))
+		if (nightsreplace)
 			ringthing = MT_NIGHTSSTAR;
 
 		for (r = 1; r <= 5; r++)
@@ -11147,7 +11148,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 		if (ultimatemode)
 			return; // No rings in Ultimate!
 
-		if ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap))
+		if (nightsreplace)
 			ringthing = MT_NIGHTSSTAR;
 
 		closestangle = FixedAngle(mthing->angle*FRACUNIT);
@@ -11217,33 +11218,42 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 
 		closestangle = FixedAngle(mthing->angle*FRACUNIT);
 
+		switch (mthing->type)
+		{
+			case 604:
+			case 605:
+				if (ultimatemode)
+					return; // No rings in Ultimate!
+				if (nightsreplace)
+					ringthing = MT_NIGHTSSTAR;
+				break;
+			case 608:
+			case 609:
+				/*ringthing = (i & 1) ? MT_RING : MT_BLUESPHERE; -- i == 0 is bluesphere
+				break;*/
+			case 606:
+			case 607:
+				ringthing = (nightsreplace) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
+				break;
+			default:
+				break;
+		}
+
 		// Create the hoop!
 		for (i = 0; i < numitems; i++)
 		{
-			switch (mthing->type)
+			if (mthing->type == 608 || mthing->type == 609)
 			{
-				case 604:
-				case 605:
-					ringthing = MT_BLUESPHERE;
-					break;
-				case 608:
-				case 609:
-					ringthing = (i & 1) ? MT_RING : MT_BLUESPHERE;
-					break;
-				case 606:
-				case 607:
-					ringthing = MT_RING;
-					break;
-				default:
-					break;
+				if (i & 1)
+				{
+					if (ultimatemode)
+						continue; // No rings in Ultimate!
+					ringthing = (nightsreplace) ? MT_NIGHTSSTAR : MT_RING;
+				}
+				else
+					ringthing = (nightsreplace) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
 			}
 
-			if (ringthing != MT_BLUESPHERE && ultimatemode)
-				continue; // No rings in Ultimate!
-
-			if ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap))
-				ringthing = ((ringthing == MT_BLUESPHERE) ? MT_NIGHTSCHIP : MT_NIGHTSSTAR);
-
 			fa = i*FINEANGLES/numitems;
 			v[0] = FixedMul(FINECOSINE(fa),size);
 			v[1] = 0;
@@ -11282,7 +11292,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 
 		// Which ringthing to use
 		if (mthing->type == mobjinfo[MT_BLUESPHERE].doomednum)
-			ringthing = ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap)) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
+			ringthing = (nightsreplace) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
 		else if (mthing->type == mobjinfo[MT_BOMBSPHERE].doomednum)
 			ringthing = MT_BOMBSPHERE;
 		else
@@ -11290,7 +11300,9 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 			if (ultimatemode)
 				return; // No rings in Ultimate!
 
-			if (mthing->type == mobjinfo[MT_COIN].doomednum)
+			if (nightsreplace)
+				ringthing = MT_NIGHTSSTAR;
+			else if (mthing->type == mobjinfo[MT_COIN].doomednum)
 				ringthing = MT_COIN;
 			else if (mthing->type == mobjinfo[MT_REDTEAMRING].doomednum) // No team rings in non-CTF
 				ringthing = (gametype == GT_CTF) ? MT_REDTEAMRING : MT_RING;