mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
Merge branch 'no-spin-reminder-with-rings' into 'master'
Never do spindash reminder if you have rings See merge request kart-krew-dev/ring-racers-internal!2984
This commit is contained in:
commit
ce0bc3cdea
1 changed files with 2 additions and 2 deletions
|
|
@ -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);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue