mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Don't spindash warn when whipping or hitlagged
This commit is contained in:
parent
763f9b2124
commit
fa51861f66
1 changed files with 3 additions and 1 deletions
|
|
@ -488,6 +488,8 @@ std::optional<TargetTracking::Tooltip> object_tooltip(const mobj_t* mobj)
|
||||||
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);
|
||||||
|
|
||||||
|
boolean whipping = stplyr->whip && !P_MobjWasRemoved(stplyr->whip);
|
||||||
|
|
||||||
boolean hasboost = (stplyr->itemamount &&
|
boolean hasboost = (stplyr->itemamount &&
|
||||||
(
|
(
|
||||||
stplyr->itemtype == KITEM_SNEAKER || stplyr->itemtype == KITEM_INVINCIBILITY || stplyr->itemtype == KITEM_ROCKETSNEAKER
|
stplyr->itemtype == KITEM_SNEAKER || stplyr->itemtype == KITEM_INVINCIBILITY || stplyr->itemtype == KITEM_ROCKETSNEAKER
|
||||||
|
|
@ -495,7 +497,7 @@ std::optional<TargetTracking::Tooltip> object_tooltip(const mobj_t* mobj)
|
||||||
)
|
)
|
||||||
) || stplyr->rocketsneakertimer;
|
) || stplyr->rocketsneakertimer;
|
||||||
|
|
||||||
if (mobj->player == stplyr && (offroadwarning || hitwarning))
|
if (mobj->player == stplyr && (offroadwarning || hitwarning) && !mobj->hitlag && !whipping)
|
||||||
{
|
{
|
||||||
if (offroadwarning)
|
if (offroadwarning)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue