zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 12:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Hook up InputPacket::uvel to relevant code.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-24 18:49:37 +10:00
parent 80f2afd6a4
commit c252b19e9a
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/games/exhumed/src/player.cpp
View file

@ -1225,6 +1225,10 @@ static void updatePlayerWeapon(Player* const pPlayer)
static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater) static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
{ {
const auto pPlayerActor = pPlayer->pActor; const auto pPlayerActor = pPlayer->pActor;
const auto pInput = &pPlayer->input;
const auto kbdDir = !!(pInput->actions & SB_CROUCH) - !!(pInput->actions & SB_JUMP);
const double dist = bUnderwater ? 8 : 14;
const double velZ = clamp(dist * kbdDir - dist * pInput->uvel, -dist, dist);
int nextAction = pPlayerActor->nAction; int nextAction = pPlayerActor->nAction;
const auto scaleViewZ = [&](const double target) const auto scaleViewZ = [&](const double target)
@ -1234,27 +1238,27 @@ static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
if (!pPlayer->bIsMummified) if (!pPlayer->bIsMummified)
{ {
processCrouchToggle(pPlayer->crouch_toggle, pPlayer->input.actions, !bUnderwater, bUnderwater); processCrouchToggle(pPlayer->crouch_toggle, pInput->actions, !bUnderwater, bUnderwater);
if (pPlayer->input.actions & SB_JUMP) if (velZ < 0)
{ {
pPlayerActor->vel.Z = velZ;
if (bUnderwater) if (bUnderwater)
{ {
pPlayerActor->vel.Z = -8;
nextAction = 10; nextAction = 10;
} }
else if (pPlayer->bTouchFloor && (pPlayerActor->nAction < 6 || pPlayerActor->nAction > 8)) else if (pPlayer->bTouchFloor && (pPlayerActor->nAction < 6 || pPlayerActor->nAction > 8))
{ {
pPlayer->bJumping = true; pPlayer->bJumping = true;
pPlayerActor->vel.Z = -14;
nextAction = 3; nextAction = 3;
} }
} }
else if (pPlayer->input.actions & SB_CROUCH) else if (velZ > 0)
{ {
if (bUnderwater) if (bUnderwater)
{ {
pPlayerActor->vel.Z = 8; pPlayerActor->vel.Z = velZ;
nextAction = 10; nextAction = 10;
} }
else else
@ -1308,7 +1312,7 @@ static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
} }
} }
if (!bTallerThanSector && (pPlayer->input.actions & SB_FIRE)) // was var_38 if (!bTallerThanSector && (pInput->actions & SB_FIRE)) // was var_38
{ {
if (bUnderwater) if (bUnderwater)
{ {