thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't attempt to stumble invinc/grow players (someone get a fire extinguisher)

Browse source
This commit is contained in:
AJ Martinez 2024-01-14 23:07:40 -07:00
parent 3da44990d0
commit dad09dc86f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/objects/orbinaut.c
View file

@ -212,14 +212,15 @@ boolean Obj_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
else
{
// Player Damage
if (t1->type == MT_ORBINAUT_SHIELD || t1->type == MT_JAWZ_SHIELD)
if ((t1->type == MT_ORBINAUT_SHIELD || t1->type == MT_JAWZ_SHIELD)
&& !t2->player->invincibilitytimer && !K_IsBigger(t1, t2)) // UGH. Stumble ignores invinc. Fix this damage type someday.
{
// Same hack as Instawhip!
// If you do this a third time, please make it a part of the damage system.
// ^ remove all of P_DamageMobj and start over
P_PlayRinglossSound(t2);
P_PlayerRingBurst(t2->player, 5);
P_DamageMobj(t2, t1, t1->target, 1, DMG_WOMBO | DMG_WHUMBLE);
P_DamageMobj(t2, t1, t1->target, 1, DMG_WOMBO | DMG_STUMBLE);
}
else
{