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

Misc fixup

Browse source
This commit is contained in:
AJ Martinez 2023-05-19 23:43:53 -07:00
parent de8f4812cf
commit 2c44bafe74
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_collide.cpp
View file

@ -811,10 +811,10 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
if (victim != attacker && !P_PlayerInPain(victimPlayer) && victimPlayer->flashing == 0) if (victim != attacker && !P_PlayerInPain(victimPlayer) && victimPlayer->flashing == 0)
{ {
// BLOW THAT SHIT THE FUCK UP with guard // BLOW THAT SHIT THE FUCK UP with guard
if (K_PlayerGuard(victimPlayer)) //if (K_PlayerGuard(victimPlayer))
//if (true) if (true)
{ {
victimHitlag = 2*victimHitlag; victimHitlag = 3*victimHitlag;
if (P_PlayerInPain(attackerPlayer)) if (P_PlayerInPain(attackerPlayer))
return false; // never punish shield more than once return false; // never punish shield more than once
@ -845,10 +845,12 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
S_StartSound(victim, sfx_mbv92); S_StartSound(victim, sfx_mbv92);
K_AddHitLag(attacker, victimHitlag, true); K_AddHitLag(attacker, victimHitlag, true);
K_AddHitLag(victim, attackerHitlag, false); K_AddHitLag(victim, attackerHitlag, false);
shield->hitlag = attacker->hitlag;
K_DoPowerClash(shield, victim); K_DoPowerClash(shield, victim);
attacker->hitlag = victimHitlag; // No, seriously, we do not care about K_AddHitLag's idea of a normal maximum
shield->hitlag = attacker->hitlag;
shield->extravalue2 = 1; shield->extravalue2 = 1;
return true; return true;

3
src/p_inter.c
View file

@ -2443,6 +2443,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
K_PlayPainSound(target, source); K_PlayPainSound(target, source);
} }
if (gametyperules & GTR_BUMPERS)
player->spheres = min(player->spheres + 5, 40);
if ((hardhit == true) || cv_kartdebughuddrop.value) if ((hardhit == true) || cv_kartdebughuddrop.value)
{ {
K_DropItems(player); K_DropItems(player);