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

Merge branch 'fix-broly-underflow' into 'master'

Browse source 
Fix bugged SPB after player hits Fuel Canister (Lost Colony)

Closes #1083

See merge request KartKrew/Kart!2045
This commit is contained in:
AJ Martinez 2024-03-09 06:03:30 +00:00
commit 90753596e0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/objects/broly.hpp
View file

@ -44,7 +44,7 @@ struct Broly : Mobj
bool valid() const { return duration(); } bool valid() const { return duration(); }
tic_t remaining() const { return tics - kBufferTics; } tic_t remaining() const { return tics > kBufferTics ? tics - kBufferTics : 0u; }
Fixed linear() const { return (remaining() * FRACUNIT) / duration(); } Fixed linear() const { return (remaining() * FRACUNIT) / duration(); }

2
src/objects/spb.c
View file

@ -679,7 +679,7 @@ static void SPBChase(mobj_t *spb, mobj_t *bestMobj)
return; return;
} }
if (chase->hitlag) if (chase->hitlag > 0)
{ {
// If the player is frozen, the SPB should be too. // If the player is frozen, the SPB should be too.
spb->hitlag = max(spb->hitlag, chase->hitlag); spb->hitlag = max(spb->hitlag, chase->hitlag);