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 set hitlag for punted mines multiple times

Browse source
This commit is contained in:
Sally Coolatta 2020-11-10 23:42:30 -05:00
parent 4abb14a158
commit 87e3dd518b
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/k_collide.c
View file

@ -273,7 +273,6 @@ boolean K_MineCollide(mobj_t *t1, mobj_t *t2)
} }
else else
{ {
K_SetHitLagForObjects(t1, t2, 2);
K_PuntMine(t1, t2); K_PuntMine(t1, t2);
} }
} }

5
src/k_kart.c
View file

@ -3816,6 +3816,9 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
if (!mine || P_MobjWasRemoved(mine)) if (!mine || P_MobjWasRemoved(mine))
return; return;
if (mine->threshold > 0 || mine->hitlag > 0)
return;
spd = (82 + ((gamespeed-1) * 14))*mapobjectscale; // Avg Speed is 41 in Normal spd = (82 + ((gamespeed-1) * 14))*mapobjectscale; // Avg Speed is 41 in Normal
mine->flags |= MF_NOCLIPTHING; mine->flags |= MF_NOCLIPTHING;
@ -3825,6 +3828,8 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
mine->extravalue1 = 0; mine->extravalue1 = 0;
mine->reactiontime = mine->info->reactiontime; mine->reactiontime = mine->info->reactiontime;
K_SetHitLagForObjects(punter, mine, 5);
mine->momx = punter->momx + FixedMul(FINECOSINE(fa), spd); mine->momx = punter->momx + FixedMul(FINECOSINE(fa), spd);
mine->momy = punter->momy + FixedMul(FINESINE(fa), spd); mine->momy = punter->momy + FixedMul(FINESINE(fa), spd);
mine->momz = P_MobjFlip(mine) * z; mine->momz = P_MobjFlip(mine) * z;