thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-04 16:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Broly: detect added hitlag even if damage call didn't deal real damage

Browse source
This commit is contained in:
James R 2022-12-16 23:49:59 -08:00
parent ba2a7744d1
commit 9ddf10c9a5
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/k_collide.c
View file

@ -204,7 +204,7 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2)
static mobj_t *grenade; static mobj_t *grenade;
static fixed_t explodedist; static fixed_t explodedist;
static boolean explodespin; static boolean explodespin;
static tic_t minehitlag; static INT32 minehitlag;
static inline boolean PIT_SSMineChecks(mobj_t *thing) static inline boolean PIT_SSMineChecks(mobj_t *thing)
{ {
@ -272,6 +272,9 @@ void K_DoMineSearch(mobj_t *actor, fixed_t size)
static inline BlockItReturn_t PIT_SSMineExplode(mobj_t *thing) static inline BlockItReturn_t PIT_SSMineExplode(mobj_t *thing)
{ {
const INT32 oldhitlag = thing->hitlag;
INT32 lagadded;
if (grenade == NULL || P_MobjWasRemoved(grenade)) if (grenade == NULL || P_MobjWasRemoved(grenade))
return BMIT_ABORT; // There's the possibility these can chain react onto themselves after they've already died if there are enough all in one spot return BMIT_ABORT; // There's the possibility these can chain react onto themselves after they've already died if there are enough all in one spot
@ -283,9 +286,13 @@ static inline BlockItReturn_t PIT_SSMineExplode(mobj_t *thing)
if (PIT_SSMineChecks(thing) == true) if (PIT_SSMineChecks(thing) == true)
return BMIT_CONTINUE; return BMIT_CONTINUE;
if (P_DamageMobj(thing, grenade, grenade->target, 1, (explodespin ? DMG_NORMAL : DMG_EXPLODE))) P_DamageMobj(thing, grenade, grenade->target, 1, (explodespin ? DMG_NORMAL : DMG_EXPLODE));
lagadded = (thing->hitlag - oldhitlag);
if (lagadded > 0)
{ {
minehitlag = thing->hitlag; minehitlag = lagadded;
} }
return BMIT_CONTINUE; return BMIT_CONTINUE;
@ -392,6 +399,8 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2)
if (t2->player) if (t2->player)
{ {
const INT32 oldhitlag = t2->hitlag;
if (t2->player->flashing) if (t2->player->flashing)
return true; return true;
@ -411,7 +420,7 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2)
P_DamageMobj(t2, t1, t1->target, 1, DMG_TUMBLE); P_DamageMobj(t2, t1, t1->target, 1, DMG_TUMBLE);
} }
t1->reactiontime = t2->hitlag; t1->reactiontime = (t2->hitlag - oldhitlag);
P_KillMobj(t1, t2, t2, DMG_NORMAL); P_KillMobj(t1, t2, t2, DMG_NORMAL);
} }
else if (t2->type == MT_BANANA || t2->type == MT_BANANA_SHIELD else if (t2->type == MT_BANANA || t2->type == MT_BANANA_SHIELD