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 'slope-stepup-fix' into 'master'

Browse source 
Slope stepup fix

See merge request kart-krew-dev/ring-racers-internal!2496
This commit is contained in:
Eidolon 2025-02-13 17:14:33 +00:00
commit eeb1ac347c
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.c
View file

@ -2764,7 +2764,7 @@ fixed_t P_GetThingStepUp(mobj_t *thing, fixed_t destX, fixed_t destY)
maxstep += maxstepmove; maxstep += maxstepmove;
} }
if (thing->standingslope && thing->standingslope->zdelta != 0) if (thing->standingslope && thing->standingslope->zdelta != 0 && (thing->momx || thing->momy))
{ {
vector3_t slopemom = {0,0,0}; vector3_t slopemom = {0,0,0};
slopemom.x = thing->momx; slopemom.x = thing->momx;

29
src/p_mobj.c
View file

@ -2249,6 +2249,18 @@ boolean P_CheckSolidLava(mobj_t *mobj, ffloor_t *rover)
return false; return false;
} }
// Resets momz to 0 if the mo has just stepped up and is rising, but under a gravity and stepup derived momz threshold
static void P_CheckStepUpReset(mobj_t *mo)
{
if (mo->eflags & MFE_JUSTSTEPPEDDOWN && (mo->momz * P_MobjFlip(mo)) > 0)
{
if (abs(mo->momz) < P_GetThingStepUp(mo, mo->x, mo->y)/6 + abs(P_GetMobjGravity(mo)*3))
{
mo->momz = 0;
}
}
}
// //
// P_ZMovement // P_ZMovement
// Returns false if the mobj was killed/exploded/removed, true otherwise. // Returns false if the mobj was killed/exploded/removed, true otherwise.
@ -2277,6 +2289,9 @@ boolean P_ZMovement(mobj_t *mo)
mo->pmomz = 0; mo->pmomz = 0;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
P_CheckStepUpReset(mo);
mo->z += mo->momz; mo->z += mo->momz;
onground = P_IsObjectOnGround(mo); onground = P_IsObjectOnGround(mo);
@ -2824,19 +2839,7 @@ void P_PlayerZMovement(mobj_t *mo)
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
if (mo->eflags & MFE_JUSTSTEPPEDDOWN && abs(mo->momz) > 1) P_CheckStepUpReset(mo);
{
// CONS_Printf("%s Check Step up momz reset %d < %d + %d", player_names[mo->player-players], abs(mo->momz), P_GetThingStepUp(mo, mo->x, mo->y)/6, abs(P_GetMobjGravity(mo)*3));
if (abs(mo->momz) < P_GetThingStepUp(mo, mo->x, mo->y)/6 + abs(P_GetMobjGravity(mo)*3))
{
// CONS_Printf(" True\n");
mo->momz = 0;
}
// else
// {
// CONS_Printf(" False\n");
// }
}
mo->z += mo->momz; mo->z += mo->momz;
onground = P_IsObjectOnGround(mo); onground = P_IsObjectOnGround(mo);