From b712315ec3d48c9e4b83a20c0beb38b2127e343f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 14 Sep 2022 22:04:41 +0200 Subject: [PATCH] - floatified playerJump --- source/games/duke/src/funct.h | 2 +- source/games/duke/src/player.cpp | 4 ++-- source/games/duke/src/player_d.cpp | 2 +- source/games/duke/src/player_r.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/games/duke/src/funct.h b/source/games/duke/src/funct.h index 87fdfc589..558dd2f4a 100644 --- a/source/games/duke/src/funct.h +++ b/source/games/duke/src/funct.h @@ -119,7 +119,7 @@ void playerisdead(int snum, int psectlotag, double fz, double cz); void footprints(int snum); int makepainsounds(int snum, int type); void playerCrouch(int snum); -void playerJump(int snum, int fz, int cz); +void playerJump(int snum, double fz, double cz); void checklook(int snum, ESyncBits actions); void playerCenterView(int snum); diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index 5f7c7834e..cbedb97cf 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -707,12 +707,12 @@ void playerCrouch(int snum) } } -void playerJump(int snum, int fz, int cz) +void playerJump(int snum, double floorz, double ceilingz) { auto p = &ps[snum]; if (p->jumping_toggle == 0 && p->jumping_counter == 0) { - if ((fz - cz) > (56 << 8)) + if ((floorz - ceilingz) > 56) { SetGameVarID(g_iReturnVarID, 0, p->GetActor(), snum); OnEvent(EVENT_JUMP, snum, p->GetActor(), -1); diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index 2237fdc9a..136d44f85 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -1913,7 +1913,7 @@ static void movement(int snum, ESyncBits actions, sectortype* psect, double floo else if ((actions & SB_JUMP)) { - playerJump(snum, floorz * zworldtoint, ceilingz * zworldtoint); + playerJump(snum, floorz, ceilingz); } if (p->jumping_counter && (actions & SB_JUMP) == 0) diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 533bef0f3..4369aae9b 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -2247,7 +2247,7 @@ static void movement(int snum, ESyncBits actions, sectortype* psect, double floo else if ((actions & SB_JUMP) && !p->OnMotorcycle && p->jumping_toggle == 0) { - playerJump(snum, floorz* zworldtoint, ceilingz* zworldtoint); + playerJump(snum, floorz, ceilingz); } }