From 1b12de00371adab1bfecbf7d9c6c89eb60a61c72 Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 17 Sep 2019 03:20:11 +0000 Subject: [PATCH] Fix a couple remaining issues with crouch toggle git-svn-id: https://svn.eduke32.com/eduke32@8102 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 2 +- source/duke3d/src/gameexec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 5e35086c6..97fa482ff 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -3580,7 +3580,7 @@ ACTOR_STATIC void G_MoveTransports(void) if (onFloor == 0 && klabs(SZ(spriteNum) - pPlayer->pos.z) < 6144) if (!pPlayer->jetpack_on || TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_JUMP) - || (TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_CROUCH) ^ pPlayer->crouch_toggle)) + || TEST_SYNC_KEY(g_player[playerNum].input->bits, SK_CROUCH)) { pPlayer->pos.x += sprite[OW(spriteNum)].x - SX(spriteNum); pPlayer->pos.y += sprite[OW(spriteNum)].y - SY(spriteNum); diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index d03578e21..42995f20c 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -4971,7 +4971,7 @@ badindex: int const playerXVel = sprite[vm.pPlayer->i].xvel; int const syncBits = g_player[vm.playerNum].input->bits; - if (((moveFlags & pducking) && vm.pPlayer->on_ground && (TEST_SYNC_KEY(syncBits, SK_CROUCH) ^ vm.pPlayer->crouch_toggle)) + if (((moveFlags & pducking) && vm.pPlayer->on_ground && TEST_SYNC_KEY(syncBits, SK_CROUCH)) || ((moveFlags & pfalling) && vm.pPlayer->jumping_counter == 0 && !vm.pPlayer->on_ground && vm.pPlayer->vel.z > 2048) || ((moveFlags & pjumping) && vm.pPlayer->jumping_counter > 348) || ((moveFlags & pstanding) && playerXVel >= 0 && playerXVel < 8)