From 9d5860d38dbe568bfabd5d67275788d3c2d514cb Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 14 Apr 2024 21:41:15 +0100
Subject: [PATCH] Also prevent Fury Bike chao key blastin (resolves #1275)

Fury Bike ID handled by #define now
---
 src/m_cond.c                  | 4 ++--
 src/m_cond.h                  | 2 ++
 src/m_pw.cpp                  | 2 +-
 src/menus/extras-challenges.c | 4 ++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/m_cond.c b/src/m_cond.c
index ffb032309..b8ef09890 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -1300,7 +1300,7 @@ void M_SetNetUnlocked(void)
 	{
 		for (i = 0; i < MAXUNLOCKABLES; i++)
 		{
-			if (unlockables[i].conditionset == 55)
+			if (unlockables[i].conditionset == CH_FURYBIKE)
 				continue;
 
 			netUnlocked[i] = true;
@@ -3094,7 +3094,7 @@ char *M_BuildConditionSetString(UINT16 unlockid)
 		}
 	}
 
-	if (usedTourney && unlockables[unlockid].conditionset == 55 && gamedata->unlocked[unlockid] == false)
+	if (usedTourney && unlockables[unlockid].conditionset == CH_FURYBIKE && gamedata->unlocked[unlockid] == false)
 	{
 		strcpy(message, "Power shrouds this challenge in darkness... (Return here without Tournament Mode!)\0");
 	}
diff --git a/src/m_cond.h b/src/m_cond.h
index d0881ae3b..5c2142561 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -281,6 +281,8 @@ typedef enum
 #endif
 #define challengegridloops (gamedata->challengegridwidth >= CHALLENGEGRIDLOOPWIDTH)
 
+#define CH_FURYBIKE 55
+
 // See also M_PlayMenuJam
 typedef enum {
 	GDMUSIC_NONE = 0,
diff --git a/src/m_pw.cpp b/src/m_pw.cpp
index 11b95e4d6..a2d314620 100644
--- a/src/m_pw.cpp
+++ b/src/m_pw.cpp
@@ -109,7 +109,7 @@ void f_tournament()
 	{
 		if (!unlockables[i].conditionset)
 			continue;
-		if (unlockables[i].conditionset == 55)
+		if (unlockables[i].conditionset == CH_FURYBIKE)
 			continue;
 		if (gamedata->unlocked[i])
 			continue;
diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c
index b6d48f296..b27198539 100644
--- a/src/menus/extras-challenges.c
+++ b/src/menus/extras-challenges.c
@@ -468,6 +468,10 @@ boolean M_CanKeyHiliTile(void)
 			return false;
 	}
 
+	// Fury Bike
+	if (unlockables[challengesmenu.currentunlock].conditionset == CH_FURYBIKE)
+		return false;
+
 	// All good!
 	return true;
 }