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

Whip collects items

Browse source
This commit is contained in:
Ashnal 2025-05-18 15:57:59 -04:00
parent a9e3472e21
commit 136cb20cb6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_collide.cpp
View file

@ -1059,11 +1059,13 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
shield->extravalue1 = 1;
}
if (P_DamageMobj(victim, shield, attacker, 1, DMG_NORMAL))
if (!K_TryPickMeUp(attackerPlayer->mo, victim))
{
K_AddHitLag(attacker, attackerHitlag, false);
shield->hitlag = attacker->hitlag;
P_DamageMobj(victim, shield, attacker, 1, DMG_NORMAL);
}
K_AddHitLag(attacker, attackerHitlag, false);
shield->hitlag = attacker->hitlag;
}
return false;
}