zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-19 23:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Add toggle-able jump rebounding.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-20 18:21:20 +10:00
parent 8255a23833
commit e0964eef7a
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,7 @@ CUSTOM_CVAR(Int, cl_exviewtilting, 0, CVAR_ARCHIVE)
else if (self > 2) self = 2; else if (self > 2) self = 2;
} }
CVAR(Float, cl_extiltscale, 1.f, CVAR_ARCHIVE); CVAR(Float, cl_extiltscale, 1.f, CVAR_ARCHIVE);
CVAR(Bool, cl_exjumprebound, false, CVAR_ARCHIVE);
BEGIN_PS_NS BEGIN_PS_NS
@ -1224,6 +1225,11 @@ static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
const auto pPlayerActor = pPlayer->pActor; const auto pPlayerActor = pPlayer->pActor;
int nextAction = pPlayerActor->nAction; int nextAction = pPlayerActor->nAction;
const auto scaleViewZ = [&](const double target)
{
pPlayerActor->viewzoffset += (target - pPlayerActor->viewzoffset) * 0.5;
};
if (!pPlayer->bIsMummified) if (!pPlayer->bIsMummified)
{ {
processCrouchToggle(pPlayer->crouch_toggle, pPlayer->input.actions, !bUnderwater, bUnderwater); processCrouchToggle(pPlayer->crouch_toggle, pPlayer->input.actions, !bUnderwater, bUnderwater);
@ -1237,6 +1243,7 @@ static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
} }
else if (pPlayer->bTouchFloor && (pPlayerActor->nAction < 6 || pPlayerActor->nAction > 8)) else if (pPlayer->bTouchFloor && (pPlayerActor->nAction < 6 || pPlayerActor->nAction > 8))
{ {
pPlayer->bJumping = true;
pPlayerActor->vel.Z = -14; pPlayerActor->vel.Z = -14;
nextAction = 3; nextAction = 3;
} }
@ -1250,9 +1257,7 @@ static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
} }
else else
{ {
if (pPlayerActor->viewzoffset < -32.5) scaleViewZ(-32.5);
pPlayerActor->viewzoffset += ((-32.5 - pPlayerActor->viewzoffset) * 0.5);
nextAction = 7 - (pPlayer->totalvel < 1); nextAction = 7 - (pPlayer->totalvel < 1);
} }
} }
@ -1263,7 +1268,21 @@ static void updatePlayerAction(Player* const pPlayer, const bool bUnderwater)
if (pPlayer->nHealth > 0) if (pPlayer->nHealth > 0)
{ {
pPlayerActor->viewzoffset += (nActionEyeLevel[pPlayerActor->nAction] - pPlayerActor->viewzoffset) * 0.5; if (pPlayer->bJumping && pPlayer->bTouchFloor)
{
pPlayer->bJumping = false;
pPlayer->bRebound = cl_exjumprebound;
}
if (pPlayer->bRebound)
{
scaleViewZ(-32.5);
if (pPlayerActor->viewzoffset > -37.5) pPlayer->bRebound = false;
}
else
{
scaleViewZ(nActionEyeLevel[pPlayerActor->nAction]);
}
if (bUnderwater) if (bUnderwater)
{ {

2
source/games/exhumed/src/player.h
View file

@ -101,6 +101,8 @@ struct Player
int totalvel; int totalvel;
bool crouch_toggle; bool crouch_toggle;
bool bTouchFloor; bool bTouchFloor;
bool bJumping;
bool bRebound;
TObjPtr<DExhumedActor*> pPlayerGrenade; TObjPtr<DExhumedActor*> pPlayerGrenade;
TObjPtr<DExhumedActor*> pPlayerFloorSprite; TObjPtr<DExhumedActor*> pPlayerFloorSprite;
TObjPtr<DExhumedActor*> pDoppleSprite; TObjPtr<DExhumedActor*> pDoppleSprite;

3
source/games/exhumed/src/runlist.cpp
View file

@ -1790,6 +1790,9 @@ int runlist_CheckRadialDamage(DExhumedActor* pActor)
if (pActor->vel.Z < -14) if (pActor->vel.Z < -14)
pActor->vel.Z = -14; pActor->vel.Z = -14;
if (pActor->spr.statnum == 100)
PlayerList[GetPlayerFromActor(pActor)].bJumping = true;
} }
} }