From b654533bf64d2bea283c1e67a82c27af18a73e00 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 15 Apr 2024 15:43:46 +0100
Subject: [PATCH] Don't add rings to total in GPEVENT_SPECIAL

---
 src/g_game.c    | 2 +-
 src/k_tally.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 9b6950359..df9da2f3a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4532,7 +4532,7 @@ static void G_DoCompleted(void)
 			{
 				// Increase your total rings
 				INT32 ringtotal = player->hudrings;
-				if (ringtotal > 0)
+				if (ringtotal > 0 && grandprixinfo.eventmode != GPEVENT_SPECIAL)
 				{
 					if (ringtotal > 20)
 						ringtotal = 20;
diff --git a/src/k_tally.cpp b/src/k_tally.cpp
index 3102df5aa..2f32ca16a 100644
--- a/src/k_tally.cpp
+++ b/src/k_tally.cpp
@@ -331,7 +331,8 @@ void level_tally_t::Init(player_t *player)
 			}
 		}
 
-		if ((gametypes[gt]->rules & GTR_SPHERES) == 0)
+		if ((gametypes[gt]->rules & GTR_SPHERES) == 0
+		&& (!grandprixinfo.gp || grandprixinfo.eventmode != GPEVENT_SPECIAL))
 		{
 			if (player->hudrings > 0) // Don't count negative rings
 			{