thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-18 11:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Super Flicky: fix erroneous timer past flicky exit

Browse source
This commit is contained in:
James R 2023-06-29 19:20:33 -07:00
parent da80096a67
commit 6e80957e4f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_objects.h
View file

@ -151,7 +151,7 @@ void Obj_SpawnSuperFlickySwarm(player_t *owner, tic_t time);
void Obj_SuperFlickyControllerThink(mobj_t *controller);
void Obj_EndSuperFlickySwarm(mobj_t *controller);
void Obj_ExtendSuperFlickySwarm(mobj_t *controller, tic_t time);
tic_t Obj_SuperFlickySwarmTime(const mobj_t *controller);
tic_t Obj_SuperFlickySwarmTime(mobj_t *controller);
/* Super Flicky */
void Obj_SuperFlickyThink(mobj_t *flicky);

6
src/objects/super-flicky.cpp
View file

@ -754,11 +754,11 @@ void Obj_ExtendSuperFlickySwarm(mobj_t* mobj, tic_t time)
x->expiry(x->expiry() + time);
}
tic_t Obj_SuperFlickySwarmTime(const mobj_t* mobj)
tic_t Obj_SuperFlickySwarmTime(mobj_t* mobj)
{
const Controller* x = static_cast<const Controller*>(mobj);
Controller* x = static_cast<Controller*>(mobj);
return x ? x->powerup_remaining() : 0u;
return !P_MobjWasRemoved(x) ? x->powerup_remaining() : 0u;
}
boolean Obj_IsSuperFlickyWhippable(const mobj_t* mobj)