From c951d43660ea9201eee9ec9b51a73ff4f418a2a7 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Tue, 22 Dec 2020 13:07:00 -0700
Subject: [PATCH] fix #428 and #408. enabled mouselook and bettercam by
 default.

---
 src/game/level_update.c | 1 +
 src/game/options_menu.c | 7 +++----
 src/pc/configfile.c     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/game/level_update.c b/src/game/level_update.c
index ca9fdf55ee..e8e8ac6e11 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -1003,6 +1003,7 @@ s32 play_mode_normal(void) {
             cancel_rumble();
             gCameraMovementFlags |= CAM_MOVE_PAUSE_SCREEN;
             set_play_mode(PLAY_MODE_PAUSED);
+			focus_Lost = FALSE;
         }
     }
 
diff --git a/src/game/options_menu.c b/src/game/options_menu.c
index 48e2e7a852..1415fc6d7c 100644
--- a/src/game/options_menu.c
+++ b/src/game/options_menu.c
@@ -310,8 +310,8 @@ static struct SubMenu menuCamera   = DEF_SUBMENU( menuStr[1], optsCamera );
 static struct SubMenu menuControls = DEF_SUBMENU( menuStr[2], optsControls );
 static struct SubMenu menuVideo    = DEF_SUBMENU( menuStr[3], optsVideo );
 static struct SubMenu menuAudio    = DEF_SUBMENU( menuStr[4], optsAudio );
+static struct SubMenu menuConfirmExit = DEF_SUBMENU( menuStr[5], optsConfirmExit );
 static struct SubMenu menuCheats   = DEF_SUBMENU( menuStr[6], optsCheats );
-static struct SubMenu menuConfirmExit = DEF_SUBMENU( menuStr[7], optsConfirmExit );
 
 /* main options menu definition */
 
@@ -322,10 +322,9 @@ static struct Option optsMain[] = {
     DEF_OPT_SUBMENU( menuStr[2], &menuControls ),
     DEF_OPT_SUBMENU( menuStr[3], &menuVideo ),
     DEF_OPT_SUBMENU( menuStr[4], &menuAudio ),
-    DEF_OPT_BUTTON ( menuStr[5], optmenu_act_exit ),
-	DEF_OPT_SUBMENU ( menuStr[6], &menuConfirmExit ),
+	DEF_OPT_SUBMENU ( menuStr[5], &menuConfirmExit ),
     // NOTE: always keep cheats the last option here because of the half-assed way I toggle them
-    DEF_OPT_SUBMENU( menuStr[7], &menuCheats )
+    DEF_OPT_SUBMENU( menuStr[6], &menuCheats )
 };
 
 static struct SubMenu menuMain = DEF_SUBMENU( menuStr[0], optsMain );
diff --git a/src/pc/configfile.c b/src/pc/configfile.c
index a68d33a95d..0aaee3f72b 100644
--- a/src/pc/configfile.c
+++ b/src/pc/configfile.c
@@ -84,9 +84,9 @@ unsigned int configCameraPan     = 0;
 unsigned int configCameraDegrade = 10; // 0 - 100%
 bool         configCameraInvertX = true;
 bool         configCameraInvertY = false;
-bool         configEnableCamera  = false;
+bool         configEnableCamera  = true;
 bool         configCameraAnalog  = true;
-bool         configCameraMouse   = false;
+bool         configCameraMouse   = true;
 #endif
 bool         configSkipIntro     = 0;
 bool         configHUD           = true;