Skip to content

Commit c951d43

Browse files
committed
fix sm64pc#428 and sm64pc#408. enabled mouselook and bettercam by default.
1 parent 6dc6347 commit c951d43

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/game/level_update.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,6 +1003,7 @@ s32 play_mode_normal(void) {
10031003
cancel_rumble();
10041004
gCameraMovementFlags |= CAM_MOVE_PAUSE_SCREEN;
10051005
set_play_mode(PLAY_MODE_PAUSED);
1006+
focus_Lost = FALSE;
10061007
}
10071008
}
10081009

src/game/options_menu.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ static struct SubMenu menuCamera = DEF_SUBMENU( menuStr[1], optsCamera );
310310
static struct SubMenu menuControls = DEF_SUBMENU( menuStr[2], optsControls );
311311
static struct SubMenu menuVideo = DEF_SUBMENU( menuStr[3], optsVideo );
312312
static struct SubMenu menuAudio = DEF_SUBMENU( menuStr[4], optsAudio );
313+
static struct SubMenu menuConfirmExit = DEF_SUBMENU( menuStr[5], optsConfirmExit );
313314
static struct SubMenu menuCheats = DEF_SUBMENU( menuStr[6], optsCheats );
314-
static struct SubMenu menuConfirmExit = DEF_SUBMENU( menuStr[7], optsConfirmExit );
315315

316316
/* main options menu definition */
317317

@@ -322,10 +322,9 @@ static struct Option optsMain[] = {
322322
DEF_OPT_SUBMENU( menuStr[2], &menuControls ),
323323
DEF_OPT_SUBMENU( menuStr[3], &menuVideo ),
324324
DEF_OPT_SUBMENU( menuStr[4], &menuAudio ),
325-
DEF_OPT_BUTTON ( menuStr[5], optmenu_act_exit ),
326-
DEF_OPT_SUBMENU ( menuStr[6], &menuConfirmExit ),
325+
DEF_OPT_SUBMENU ( menuStr[5], &menuConfirmExit ),
327326
// NOTE: always keep cheats the last option here because of the half-assed way I toggle them
328-
DEF_OPT_SUBMENU( menuStr[7], &menuCheats )
327+
DEF_OPT_SUBMENU( menuStr[6], &menuCheats )
329328
};
330329

331330
static struct SubMenu menuMain = DEF_SUBMENU( menuStr[0], optsMain );

src/pc/configfile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ unsigned int configCameraPan = 0;
8484
unsigned int configCameraDegrade = 10; // 0 - 100%
8585
bool configCameraInvertX = true;
8686
bool configCameraInvertY = false;
87-
bool configEnableCamera = false;
87+
bool configEnableCamera = true;
8888
bool configCameraAnalog = true;
89-
bool configCameraMouse = false;
89+
bool configCameraMouse = true;
9090
#endif
9191
bool configSkipIntro = 0;
9292
bool configHUD = true;

0 commit comments

Comments
 (0)