From 7fc7acbc2e149419b9ca76c93ca383f11c26312a Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Thu, 14 Apr 2022 00:54:32 -0700
Subject: [PATCH] Mouse controlled camera no longer affects main menu camera

---
 src/game/bettercamera.inc.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/bettercamera.inc.h b/src/game/bettercamera.inc.h
index 79c7e5ba3..78a9770f7 100644
--- a/src/game/bettercamera.inc.h
+++ b/src/game/bettercamera.inc.h
@@ -119,6 +119,8 @@ u16 newcam_modeflags;
 s16 newcam_saved_mode = -1;
 s16 newcam_saved_defmode = -1;
 
+extern bool gDjuiInMainMenu;
+
 ///This is called at every level initialisation.
 void newcam_init(struct Camera *c, u8 dv) {
     newcam_tilt = 1500;
@@ -194,7 +196,6 @@ void newcam_init_settings(void) {
     newcam_degrade      = (f32)configCameraDegrade;
 
     // setup main menu camera
-    extern bool gDjuiInMainMenu;
     if (gDjuiInMainMenu) { newcam_tilt = 5; }
 
     newcam_toggle(configEnableCamera || gDjuiInMainMenu);
@@ -382,7 +383,7 @@ static void newcam_rotate_button(void) {
             newcam_tilt_acc -= (newcam_tilt_acc*((f32)newcam_degrade/100));
     }
 
-    if (newcam_mouse == 1) {
+    if ((newcam_mouse == 1) && !gDjuiInMainMenu) {
         newcam_yaw += ivrt(0) * mouse_x * 16;
         newcam_tilt += ivrt(1) * mouse_y * 16;
     }