From dcab1c62f31813e38e6b2fb8799f4566ffde39b2 Mon Sep 17 00:00:00 2001
From: fgsfds <pvt.fgsfds@gmail.com>
Date: Sat, 16 May 2020 19:59:59 +0300
Subject: [PATCH] only include camera options if BETTERCAM==1

---
 src/game/options_menu.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/game/options_menu.c b/src/game/options_menu.c
index c9feeb39..81c56c0f 100644
--- a/src/game/options_menu.c
+++ b/src/game/options_menu.c
@@ -9,7 +9,9 @@
 #include "game/print.h"
 #include "game/segment2.h"
 #include "game/save_file.h"
+#ifdef BETTERCAMERA
 #include "game/bettercamera.h"
+#endif
 #include "game/mario_misc.h"
 #include "game/game_init.h"
 #include "game/ingame_menu.h"
@@ -162,6 +164,7 @@ static void optmenu_act_exit(UNUSED struct Option *self, s32 arg) {
 
 /* submenu option lists */
 
+#ifdef BETTERCAMERA
 static struct Option optsCamera[] = {
     DEF_OPT_TOGGLE( optsCameraStr[6], &configEnableCamera ),
     DEF_OPT_TOGGLE( optsCameraStr[7], &configCameraMouse ),
@@ -172,6 +175,7 @@ static struct Option optsCamera[] = {
     DEF_OPT_SCROLL( optsCameraStr[4], &configCameraAggr, 0, 100, 1 ),
     DEF_OPT_SCROLL( optsCameraStr[5], &configCameraPan, 0, 100, 1 ),
 };
+#endif
 
 static struct Option optsControls[] = {
     DEF_OPT_BIND( bindStr[ 2], configKeyA ),
@@ -201,7 +205,9 @@ static struct Option optsAudio[] = {
 
 /* submenu definitions */
 
+#ifdef BETTERCAMERA
 static struct SubMenu menuCamera   = DEF_SUBMENU( menuStr[4], optsCamera );
+#endif
 static struct SubMenu menuControls = DEF_SUBMENU( menuStr[5], optsControls );
 static struct SubMenu menuVideo    = DEF_SUBMENU( menuStr[6], optsVideo );
 static struct SubMenu menuAudio    = DEF_SUBMENU( menuStr[7], optsAudio );
@@ -209,7 +215,9 @@ static struct SubMenu menuAudio    = DEF_SUBMENU( menuStr[7], optsAudio );
 /* main options menu definition */
 
 static struct Option optsMain[] = {
+#ifdef BETTERCAMERA
     DEF_OPT_SUBMENU( menuStr[4], &menuCamera ),
+#endif
     DEF_OPT_SUBMENU( menuStr[5], &menuControls ),
     DEF_OPT_SUBMENU( menuStr[6], &menuVideo ),
     DEF_OPT_SUBMENU( menuStr[7], &menuAudio ),
@@ -410,7 +418,9 @@ void optmenu_toggle(void) {
         play_sound(SOUND_MENU_MARIO_CASTLE_WARP2, gDefaultSoundArgs);
         #endif
         optmenu_open = 0;
+        #ifdef BETTERCAMERA
         newcam_init_settings(); // load bettercam settings from config vars
+        #endif
         controller_reconfigure(); // rebind using new config values
         configfile_save(CONFIG_FILE);
     }