From c240c8e6ee1529852d18d32b4f138ffa92ab4aed Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Thu, 29 Dec 2022 18:53:46 +1100 Subject: [PATCH] - SW: Fix two bad calls to `pushmove()` where a fixed point adjustment was used. * Came in from 3ac4e7ed2d4a1cf70e372c4742e7f9b4a50f0e5f. * Fixes #816. --- source/games/sw/src/player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index 177c26848..67e82dda8 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -2090,7 +2090,7 @@ void DoPlayerMove(PLAYER* pp) } else { - push_ret = pushmove(pp->actor->spr.pos.XY(), pp->actor->getOffsetZ(), &pp->cursector, actor->clipdist, pp->p_ceiling_dist, pp->p_floor_dist - Z(16), CLIPMASK_PLAYER); + push_ret = pushmove(pp->actor->spr.pos.XY(), pp->actor->getOffsetZ(), &pp->cursector, actor->clipdist, pp->p_ceiling_dist, pp->p_floor_dist - 16., CLIPMASK_PLAYER); if (push_ret < 0) { @@ -2118,7 +2118,7 @@ void DoPlayerMove(PLAYER* pp) actor->spr.cstat = save_cstat; PlayerCheckValidMove(pp); - push_ret = pushmove(pp->actor->spr.pos.XY(), pp->actor->getOffsetZ(), &pp->cursector, actor->clipdist, pp->p_ceiling_dist, pp->p_floor_dist - Z(16), CLIPMASK_PLAYER); + push_ret = pushmove(pp->actor->spr.pos.XY(), pp->actor->getOffsetZ(), &pp->cursector, actor->clipdist, pp->p_ceiling_dist, pp->p_floor_dist - 16., CLIPMASK_PLAYER); if (push_ret < 0) {