From 7b2e0f949188e76634a9a80ee2f196c000f0d5f0 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 1 Apr 2024 18:14:48 +0100
Subject: [PATCH] Oversight for debugchallenges: use the correct numeric value
 for debugchallenges highlight

Avoids dereferencing ref->conditionset, given ref can be NULL for blank squares
---
 src/k_menudraw.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 39fd26d57..4dc76f701 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -6801,12 +6801,17 @@ drawborder:
 	}
 
 #ifdef DEVELOP
-	if (cv_debugchallenges.value == -2 ||
-		cv_debugchallenges.value > 0)
+	if (
+		(
+			cv_debugchallenges.value == -2
+			|| cv_debugchallenges.value > 0
+		)
+		&& num < MAXUNLOCKABLES
+	)
 	{
 		// Display the conditionset for this tile.
 		V_DrawThinString(x, y,
-			ref->conditionset == cv_debugchallenges.value ? V_AQUAMAP : V_GRAYMAP,
+			num+1 == cv_debugchallenges.value ? V_AQUAMAP : V_GRAYMAP,
 			va("%u", num+1));
 	}
 #endif