fix sm64pc#428 and sm64pc#408. enabled mouselook and bettercam by def…

…ault.
Bitl · Dec 22, 2020 · c951d43 · c951d43
1 parent 6dc6347
commit c951d43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;