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

Merge branch 'fix-super-flicky-whip' into 'master'

Browse source 
Fix Super Flickys not being whippable

See merge request KartKrew/Kart!1627
This commit is contained in:
Oni 2023-11-15 21:26:31 +00:00
commit a51b889444
3 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_collide.cpp
View file

@ -925,7 +925,7 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
} }
else if (victim->type == MT_SUPER_FLICKY) else if (victim->type == MT_SUPER_FLICKY)
{ {
if (Obj_IsSuperFlickyWhippable(victim)) if (Obj_IsSuperFlickyWhippable(victim, attacker))
{ {
K_AddHitLag(victim, victimHitlag, true); K_AddHitLag(victim, victimHitlag, true);
K_AddHitLag(attacker, attackerHitlag, false); K_AddHitLag(attacker, attackerHitlag, false);

2
src/k_objects.h
View file

@ -173,7 +173,7 @@ void Obj_BlockSuperFlicky(mobj_t *flicky);
void Obj_SuperFlickyPlayerCollide(mobj_t *flicky, mobj_t *player); void Obj_SuperFlickyPlayerCollide(mobj_t *flicky, mobj_t *player);
void Obj_SuperFlickyLanding(mobj_t *flicky); void Obj_SuperFlickyLanding(mobj_t *flicky);
mobj_t *Obj_SuperFlickyOwner(const mobj_t *flicky); mobj_t *Obj_SuperFlickyOwner(const mobj_t *flicky);
boolean Obj_IsSuperFlickyWhippable(const mobj_t *flicky); boolean Obj_IsSuperFlickyWhippable(const mobj_t *flicky, const mobj_t *target);
boolean Obj_IsSuperFlickyTargettingYou(const mobj_t *flicky, mobj_t *player); boolean Obj_IsSuperFlickyTargettingYou(const mobj_t *flicky, mobj_t *player);
/* Battle/Power-UP UFO */ /* Battle/Power-UP UFO */

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

@ -768,11 +768,11 @@ mobj_t *Obj_SuperFlickyOwner(const mobj_t* mobj)
return x->valid() ? x->source() : nullptr; return x->valid() ? x->source() : nullptr;
} }
boolean Obj_IsSuperFlickyWhippable(const mobj_t* mobj) boolean Obj_IsSuperFlickyWhippable(const mobj_t* mobj, const mobj_t* target)
{ {
const Flicky* x = static_cast<const Flicky*>(mobj); const Flicky* x = static_cast<const Flicky*>(mobj);
return mobj == x->chasing() && !x->stunned(); return target == x->chasing() && !x->stunned();
} }
boolean Obj_IsSuperFlickyTargettingYou(const mobj_t* mobj, mobj_t *player) boolean Obj_IsSuperFlickyTargettingYou(const mobj_t* mobj, mobj_t *player)