From ebedf46434260de291ec735b6ac8d788e2dcf312 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Mon, 27 Mar 2023 17:10:07 +1100
Subject: [PATCH] - Exhumed: Reset view pitch back to 0 when doing Ramses,
using game's formula.
* Ensure's a smooth return to 0 so the player's actual pitch can be targeted towards Ramses.
* In situations where the player had their view pitch changed in the ticker, this would have never reset.
---
source/games/exhumed/src/player.cpp | 3 +--
source/games/exhumed/src/player.h | 6 ++++++
source/games/exhumed/src/ramses.cpp | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index 70eeb3e20..1e59887b4 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -1573,14 +1573,13 @@ static void doPlayerGravity(DExhumedActor* const pPlayerActor)
static void doPlayerPitch(Player* const pPlayer, const double nDestVertPan)
{
const auto pInput = &pPlayer->input;
- const auto nVertPan = (nDestVertPan * cl_slopetilting - pPlayer->Angles.ViewAngles.Pitch.Tan() * 128) * 0.25;
if (SyncInput())
{
pPlayer->pActor->spr.Angles.Pitch += DAngle::fromDeg(pInput->horz);
}
- pPlayer->Angles.ViewAngles.Pitch += maphoriz(abs(nVertPan) >= 4 ? Sgn(nVertPan) * 4. : nVertPan * 2.);
+ doPlayerVertPanning(pPlayer, nDestVertPan * cl_slopetilting);
pPlayer->Angles.doPitchKeys(pInput);
}
diff --git a/source/games/exhumed/src/player.h b/source/games/exhumed/src/player.h
index 76c1a8fdf..16eac0608 100644
--- a/source/games/exhumed/src/player.h
+++ b/source/games/exhumed/src/player.h
@@ -125,5 +125,11 @@ void SetPlayerMummified(int nPlayer, int bIsMummified);
int AddAmmo(int nPlayer, int nWeapon, int nAmmoAmount);
void ShootStaff(int nPlayer);
+inline void doPlayerVertPanning(Player* const pPlayer, const double nDestVertPan)
+{
+ const auto nVertPan = (nDestVertPan - pPlayer->Angles.ViewAngles.Pitch.Tan() * 128) * 0.25;
+ pPlayer->Angles.ViewAngles.Pitch += maphoriz(abs(nVertPan) >= 4 ? Sgn(nVertPan) * 4. : nVertPan * 2.);
+}
+
END_PS_NS
diff --git a/source/games/exhumed/src/ramses.cpp b/source/games/exhumed/src/ramses.cpp
index 1208e5f01..2b5d1ac2c 100644
--- a/source/games/exhumed/src/ramses.cpp
+++ b/source/games/exhumed/src/ramses.cpp
@@ -200,6 +200,7 @@ void DoSpiritHead()
const auto nSpiritAngle = (pSpiritSprite->spr.pos.XY() - pPlayerActor->spr.pos.XY()).Angle();
pPlayerActor->spr.Angles.Yaw += deltaangle(pPlayerActor->spr.Angles.Yaw, nSpiritAngle) * 0.25;
pPlayerActor->spr.Angles.Pitch += deltaangle(pPlayerActor->spr.Angles.Pitch, currentLevel->ex_ramses_horiz) * 0.25;
+ doPlayerVertPanning(pPlayer, 0);
switch (nHeadStage)
{