From 9bd966c77e8691da8ccbee91bb993111390b659d Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 11 Feb 2020 09:22:00 +0000 Subject: [PATCH] Macros for a couple hardcoded values git-svn-id: https://svn.eduke32.com/eduke32@8641 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/player.cpp | 6 +++--- source/duke3d/src/player.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index d163abbc7..9fe0b4946 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -5307,14 +5307,14 @@ void P_ProcessInput(int playerNum) int playerSpeedReduction = 0; if (sectorLotag == ST_2_UNDERWATER) - playerSpeedReduction = 0x1400; + playerSpeedReduction = PWATERSPEEDMODIFIER; else if (((pPlayer->on_ground && TEST_SYNC_KEY(playerBits, SK_CROUCH)) || (*weaponFrame > 10 && PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) == KNEE_WEAPON))) - playerSpeedReduction = 0x2000; + playerSpeedReduction = PCROUCHSPEEDMODIFIER; else if (pPlayer->on_ground && !pPlayer->jumping_toggle && !TEST_SYNC_KEY(playerBits, SK_CROUCH) && (klabs(pPlayer->truefz - pPlayer->truecz) - (PMINHEIGHT << 1)) < stepHeight) { - playerSpeedReduction = 0x2000; + playerSpeedReduction = PCROUCHSPEEDMODIFIER; // pPlayer->pos.z += PCROUCHINCREMENT; } diff --git a/source/duke3d/src/player.h b/source/duke3d/src/player.h index e2bac2d96..0bf261bb3 100644 --- a/source/duke3d/src/player.h +++ b/source/duke3d/src/player.h @@ -46,6 +46,9 @@ extern int32_t g_mostConcurrentPlayers; #define PCRACKTIME 777 +#define PWATERSPEEDMODIFIER 0x1400 +#define PCROUCHSPEEDMODIFIER 0x2000 + #define TRIPBOMB_TRIPWIRE 0x00000001 #define TRIPBOMB_TIMER 0x00000002