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

Merge branch 'team-ballhog' into 'master'

Browse source 
Team damage downgrade grants invincibility

See merge request kart-krew-dev/ring-racers-internal!2830
This commit is contained in:
Oni VelocitOni 2025-09-14 22:04:40 +00:00
commit 5488a3df26
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_inter.c
View file

@ -2875,6 +2875,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
player_t *playerInflictor; player_t *playerInflictor;
boolean force = false; boolean force = false;
boolean spbpop = false; boolean spbpop = false;
boolean downgraded = false;
INT32 laglength = 6; INT32 laglength = 6;
@ -3304,7 +3305,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (G_SameTeam(source->player, player)) if (G_SameTeam(source->player, player))
{ {
if (type != DMG_EXPLODE) if (type != DMG_EXPLODE)
{
type = DMG_STUMBLE; type = DMG_STUMBLE;
downgraded = true;
}
} }
else else
{ {
@ -3458,8 +3462,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
K_PopPlayerShield(player); K_PopPlayerShield(player);
} }
boolean downgraded = false;
if (!(gametyperules & GTR_SPHERES) && player->tripwireLeniency && !P_PlayerInPain(player)) if (!(gametyperules & GTR_SPHERES) && player->tripwireLeniency && !P_PlayerInPain(player))
{ {
switch (type) switch (type)