From fa51861f665fb59c58122502579dad96adac627f Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Wed, 3 Sep 2025 01:16:35 -0400 Subject: [PATCH] Don't spindash warn when whipping or hitlagged --- src/k_hud_track.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp index d056b7313..6ac196648 100644 --- a/src/k_hud_track.cpp +++ b/src/k_hud_track.cpp @@ -488,6 +488,8 @@ std::optional object_tooltip(const mobj_t* mobj) boolean hitwarning = stplyr->flashing && stplyr->rings <= 0 && stplyr->speed < K_GetKartSpeed(stplyr, false, false)/2 && P_IsObjectOnGround(mobj) && !P_PlayerInPain(stplyr); + boolean whipping = stplyr->whip && !P_MobjWasRemoved(stplyr->whip); + boolean hasboost = (stplyr->itemamount && ( stplyr->itemtype == KITEM_SNEAKER || stplyr->itemtype == KITEM_INVINCIBILITY || stplyr->itemtype == KITEM_ROCKETSNEAKER @@ -495,7 +497,7 @@ std::optional object_tooltip(const mobj_t* mobj) ) ) || stplyr->rocketsneakertimer; - if (mobj->player == stplyr && (offroadwarning || hitwarning)) + if (mobj->player == stplyr && (offroadwarning || hitwarning) && !mobj->hitlag && !whipping) { if (offroadwarning) {