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 'damaging-sector-stumble' into 'master'

Browse source 
Use damage stumble for stumble sectors / terrain again (allows DI)

See merge request kart-krew-dev/ring-racers-internal!2911
This commit is contained in:
AJ Martinez 2025-09-28 01:02:00 +00:00
commit 9bdd01f5a6
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_terrain.c
View file

@ -504,8 +504,13 @@ void K_ProcessTerrainEffect(mobj_t *mo)
if (dmg & DMG_STUMBLE && !G_CompatLevel(0x0010)) if (dmg & DMG_STUMBLE && !G_CompatLevel(0x0010))
{ {
if (player->mo->hitlag == 0 && (player->mo->momz >= 0) == (P_MobjFlip(player->mo) >= 0)) if (player->mo->hitlag == 0 &&
K_StumblePlayer(player); (player->mo->momz == 0 || (player->mo->momz > 0) != (P_MobjFlip(player->mo) > 0)))
{
player->pflags2 |= PF2_ALWAYSDAMAGED;
P_DamageMobj(mo, NULL, NULL, 1, dmg);
player->pflags2 &= ~PF2_ALWAYSDAMAGED;
}
} }
else else
{ {

7
src/p_spec.c
View file

@ -5430,9 +5430,12 @@ static void P_EvaluateDamageType(player_t *player, sector_t *sector, boolean isT
} }
else else
{ {
if (isTouching && player->mo->hitlag == 0 && (player->mo->momz >= 0) == (P_MobjFlip(player->mo) >= 0)) if (isTouching && player->mo->hitlag == 0 &&
(player->mo->momz == 0 || (player->mo->momz > 0) != (P_MobjFlip(player->mo) > 0)))
{ {
K_StumblePlayer(player); player->pflags2 |= PF2_ALWAYSDAMAGED;
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_STUMBLE);
player->pflags2 &= ~PF2_ALWAYSDAMAGED;
} }
} }