thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-spin-reminder-with-rings' into 'master'

Browse source 
Never do spindash reminder if you have rings

See merge request kart-krew-dev/ring-racers-internal!2984
This commit is contained in:
Gunla 2025-11-01 00:02:14 +00:00
commit ce0bc3cdea
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_hud_track.cpp
View file

@ -307,7 +307,7 @@ private:
}}, }},
}; };
} }
return { return {
{ // Near { // Near
{8, 2, {kp_capsuletarget_near[0]}}, // 1P {8, 2, {kp_capsuletarget_near[0]}}, // 1P
@ -501,7 +501,7 @@ std::optional<TargetTracking::Tooltip> object_tooltip(const mobj_t* mobj)
} }
boolean offroadwarning = K_ApplyOffroad(stplyr) && stplyr->offroad >= FRACUNIT && !stplyr->spindash && stplyr->curshield != KSHIELD_TOP boolean offroadwarning = K_ApplyOffroad(stplyr) && stplyr->offroad >= FRACUNIT && !stplyr->spindash && stplyr->curshield != KSHIELD_TOP
&& stplyr->boostpower < FRACUNIT && stplyr->speed < 2*K_GetKartSpeed(stplyr, false, false)/3; && stplyr->boostpower < FRACUNIT && stplyr->rings <= 0 && stplyr->speed < K_GetKartSpeed(stplyr, false, false)/2;
boolean hitwarning = stplyr->flashing && stplyr->rings <= 0 && stplyr->speed < K_GetKartSpeed(stplyr, false, false)/2 boolean hitwarning = stplyr->flashing && stplyr->rings <= 0 && stplyr->speed < K_GetKartSpeed(stplyr, false, false)/2
&& P_IsObjectOnGround(mobj) && !P_PlayerInPain(stplyr); && P_IsObjectOnGround(mobj) && !P_PlayerInPain(stplyr);