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 'pain-with-gain' into 'master'

Browse source 
Remove ringboost only when taking non-stumble damage

Closes #1664

See merge request kart-krew-dev/ring-racers-internal!2903
This commit is contained in:
AJ Martinez 2025-09-26 21:59:13 +00:00
commit 8b86622218
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -10506,7 +10506,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->tricklock = 0;
}
if (P_PlayerInPain(player) || player->respawn.state != RESPAWNST_NONE)
if ((P_PlayerInPain(player) && G_CompatLevel(0x0010)) || player->respawn.state != RESPAWNST_NONE)
{
player->ringboost = 0;
}

3
src/p_inter.c
View file

@ -2862,6 +2862,8 @@ static boolean P_FlashingException(const player_t *player, const mobj_t *inflict
return true;
}
// P_DamageMobj for 0x0010 compat.
// I know this sucks ass, but this function is legitimately too complicated to add more behavior switches.
static boolean P_DamageMobjCompat(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
{
player_t *player;
@ -4381,6 +4383,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
K_PopPlayerShield(player);
player->instashield = 15;
K_PlayPainSound(target, source);
player->ringboost = 0;
}
if (gametyperules & GTR_BUMPERS)