From 08c72612629c0a5e96dcc5fc0523e57c48b0537e Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Sun, 10 May 2026 21:00:09 -0400
Subject: [PATCH] fix going into first person with orbital cam (#923)

---
 src/d/d_camera.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 0adf6d4bd6..266504d98c 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -7648,7 +7648,10 @@ bool dCamera_c::freeCamera() {
     cXyz camMovement = {mPadInfo.mCStick.mLastPosX, mPadInfo.mCStick.mLastPosY, 0.0f};
     f32 magnitude = sqrt(mPadInfo.mCStick.mLastPosX * mPadInfo.mCStick.mLastPosX + mPadInfo.mCStick.mLastPosY * mPadInfo.mCStick.mLastPosY);
 
-    if (mPadInfo.mCStick.mLastPosX != 0 || mPadInfo.mCStick.mLastPosY != 0) {
+    // If we aren't in manual cam mode, don't trigger it if the player tries to hit C-up
+    // for first person
+    if (mPadInfo.mCStick.mLastPosX != 0 || mPadInfo.mCStick.mLastPosY < 0 ||
+        (mCamParam.mManualMode == 1 && mPadInfo.mCStick.mLastPosY != 0)) {
         mCamParam.mManualMode = 1;
         camMovement = camMovement.normalize();
         camMovement.y *= dusk::getSettings().game.invertCameraYAxis ? 1.0f : -1.0f;