From 080ace7b914b944b33a6480c9cffbdfd1001a788 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 31 Mar 2026 11:55:27 -0400 Subject: [PATCH] Fix waypoint related crashes in battle mode --- src/k_hud.c | 6 ++++++ src/p_mobj.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/k_hud.c b/src/k_hud.c index ddf45c7f3..19b515b39 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -5042,6 +5042,12 @@ static void K_drawKartMinimap(void) if (cv_kartdebugwaypoints.value != 0) { + if (!(gametypes[gametype]->rules & GTR_CIRCUIT)) + return; + + if (waypointcap == NULL) + return; + size_t idx; for (idx = 0; idx < K_GetNumWaypoints(); ++idx) diff --git a/src/p_mobj.c b/src/p_mobj.c index eb6dcdb95..ab6fd98c8 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12582,7 +12582,7 @@ void P_AfterPlayerSpawn(INT32 playernum) P_CheckGravity(mobj, false); // set the player's starting waypoint - if (!K_UsingLegacyCheckpoints()) + if (!K_UsingLegacyCheckpoints() && (gametypes[gametype]->rules & GTR_CIRCUIT) && waypointcap != NULL) p->currentwaypoint = K_GetSpawnWaypointForMobj(p->mo); }