thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't stair jank on really small steps

Browse source 
Also don't do it off slope launches.
This commit is contained in:
James R 2021-04-11 02:07:23 -07:00
parent 50c198cc0f
commit b3293aa122
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_map.c
View file

@ -2492,7 +2492,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (maxstep > 0) if (maxstep > 0)
{ {
const fixed_t minstep = maxstep / 8; const fixed_t minstep = maxstep / 4;
thingtop = thing->z + thing->height; thingtop = thing->z + thing->height;
@ -2501,7 +2501,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
{ {
if (tmfloorstep <= maxstep) if (tmfloorstep <= maxstep)
{ {
stairjank = thing->floordrop; stairjank = tmfloorstep;
stairstep = minstep; stairstep = minstep;
thing->z = thing->floorz = tmfloorz; thing->z = thing->floorz = tmfloorz;
@ -2517,7 +2517,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
{ {
if (tmceilingstep <= maxstep) if (tmceilingstep <= maxstep)
{ {
stairjank = thing->ceilingdrop; stairjank = tmceilingstep;
stairstep = minstep; stairstep = minstep;
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height; thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
@ -2536,7 +2536,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep) if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
{ {
stairjank = thing->ceilingdrop; stairjank = (tmceilingz - thingtop);
stairstep = minstep; stairstep = minstep;
thing->z = (thing->ceilingz = tmceilingz) - thing->height; thing->z = (thing->ceilingz = tmceilingz) - thing->height;
@ -2546,7 +2546,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
} }
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep) else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
{ {
stairjank = thing->floordrop; stairjank = (thing->z - tmfloorz);
stairstep = minstep; stairstep = minstep;
thing->z = thing->floorz = tmfloorz; thing->z = thing->floorz = tmfloorz;

3
src/p_slopes.c
View file

@ -850,7 +850,10 @@ void P_SlopeLaunch(mobj_t *mo)
mo->standingslope = NULL; mo->standingslope = NULL;
if (mo->player) if (mo->player)
{
mo->player->powers[pw_justlaunched] = 1; mo->player->powers[pw_justlaunched] = 1;
mo->player->stairjank = 0; // fuck you
}
} }
// //