zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-24 16:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Split out player pitch code.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-24 15:53:37 +11:00
parent 806dca975a
commit 9b3c726458
1 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1034,6 +1034,49 @@ static void updatePlayerAction(Player* const pPlayer)
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void doPlayerPitch(Player* const pPlayer)
{
const auto pPlayerActor = pPlayer->pActor;
const auto pInput = &pPlayer->input;
if (SyncInput())
{
pPlayerActor->spr.Angles.Pitch += DAngle::fromDeg(pInput->horz);
}
pPlayer->Angles.doPitchKeys(pInput);
if (pInput->actions & (SB_AIM_UP | SB_AIM_DOWN) || pInput->horz)
{
pPlayer->nDestVertPan = pPlayerActor->spr.Angles.Pitch;
pPlayer->bPlayerPan = pPlayer->bLockPan = true;
}
else if (pInput->actions & (SB_LOOK_UP | SB_LOOK_DOWN | SB_CENTERVIEW))
{
pPlayer->nDestVertPan = pPlayerActor->spr.Angles.Pitch;
pPlayer->bPlayerPan = pPlayer->bLockPan = false;
}
if (pPlayer->totalvel > 20)
{
pPlayer->bPlayerPan = false;
}
if (cl_slopetilting && !pPlayer->bPlayerPan && !pPlayer->bLockPan)
{
if (double nVertPan = deltaangle(pPlayerActor->spr.Angles.Pitch, pPlayer->nDestVertPan).Tan() * 32.)
{
pPlayerActor->spr.Angles.Pitch += maphoriz(abs(nVertPan) >= 4 ? clamp(nVertPan, -4., 4.) : nVertPan * 2.);
}
}
}
//---------------------------------------------------------------------------
//
// this function is pure spaghetti madness... :(
@ -1483,37 +1526,7 @@ sectdone:
}
updatePlayerAction(pPlayer);
if (SyncInput())
{
pPlayer->pActor->spr.Angles.Pitch += DAngle::fromDeg(pPlayer->input.horz);
}
pPlayer->Angles.doPitchKeys(&pPlayer->input);
if (pPlayer->input.actions & (SB_AIM_UP | SB_AIM_DOWN) || pPlayer->input.horz)
{
pPlayer->nDestVertPan = pPlayer->pActor->spr.Angles.Pitch;
pPlayer->bPlayerPan = pPlayer->bLockPan = true;
}
else if (pPlayer->input.actions & (SB_LOOK_UP | SB_LOOK_DOWN | SB_CENTERVIEW))
{
pPlayer->nDestVertPan = pPlayer->pActor->spr.Angles.Pitch;
pPlayer->bPlayerPan = pPlayer->bLockPan = false;
}
if (pPlayer->totalvel > 20)
{
pPlayer->bPlayerPan = false;
}
if (cl_slopetilting && !pPlayer->bPlayerPan && !pPlayer->bLockPan)
{
if (double nVertPan = deltaangle(pPlayer->pActor->spr.Angles.Pitch, pPlayer->nDestVertPan).Tan() * 32.)
{
pPlayer->pActor->spr.Angles.Pitch += maphoriz(abs(nVertPan) >= 4 ? clamp(nVertPan, -4., 4.) : nVertPan * 2.);
}
}
doPlayerPitch(pPlayer);
}
else // else, player's health is less than 0
{