From c153162fa9f6eeb447880ff2640f68ae6e59ff9f Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Wed, 17 Jul 2024 13:55:41 -0400
Subject: [PATCH] Disable demos for now, this whole main menu needs a rewrite

---
 src/game/level_update.c               |  4 ++--
 src/pc/configfile.c                   |  2 +-
 src/pc/djui/djui_panel_menu_options.c | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/level_update.c b/src/game/level_update.c
index d11ec2ea..5f44367f 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -1493,11 +1493,11 @@ void update_menu_level(void) {
     stop_cap_music();
     if (!configMenuSound || configMenuStaffRoll || curLevel == LEVEL_CASTLE_GROUNDS) {
         reset_volume();
-        sound_banks_disable(SEQ_PLAYER_SFX, SOUND_BANKS_BACKGROUND);
+        disable_background_sound();
         set_background_music(0, SEQ_MENU_TITLE_SCREEN, 0);
     } else {
         reset_volume();
-        sound_banks_disable(SEQ_PLAYER_SFX, SOUND_BANKS_BACKGROUND);
+        disable_background_sound();
         if (gCurrentArea != NULL) {
             set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
         }
diff --git a/src/pc/configfile.c b/src/pc/configfile.c
index e8a8c88d..e661662b 100644
--- a/src/pc/configfile.c
+++ b/src/pc/configfile.c
@@ -298,7 +298,7 @@ static const struct ConfigOption options[] = {
     {.name = "coop_menu_level",                .type = CONFIG_TYPE_UINT,   .uintValue   = &configMenuLevel},
     {.name = "coop_menu_sound",                .type = CONFIG_TYPE_BOOL,   .boolValue   = &configMenuSound},
     {.name = "coop_menu_random",               .type = CONFIG_TYPE_BOOL,   .boolValue   = &configMenuRandom},
-    {.name = "coop_menu_demos",                .type = CONFIG_TYPE_BOOL,   .boolValue   = &configMenuDemos},
+    // {.name = "coop_menu_demos",                .type = CONFIG_TYPE_BOOL,   .boolValue   = &configMenuDemos},
     {.name = "disable_popups",                 .type = CONFIG_TYPE_BOOL,   .boolValue   = &configDisablePopups},
     {.name = "language",                       .type = CONFIG_TYPE_STRING, .stringValue = (char*)&configLanguage, .maxStringLength = MAX_CONFIG_STRING},
     {.name = "dynos_local_player_model_only",  .type = CONFIG_TYPE_BOOL,   .boolValue   = &configDynosLocalPlayerModelOnly},
diff --git a/src/pc/djui/djui_panel_menu_options.c b/src/pc/djui/djui_panel_menu_options.c
index c0adb639..0808cac9 100644
--- a/src/pc/djui/djui_panel_menu_options.c
+++ b/src/pc/djui/djui_panel_menu_options.c
@@ -14,7 +14,7 @@
 static struct DjuiSelectionbox* sLevelBox = NULL;
 static struct DjuiCheckbox* sUseStageMusicCheckbox = NULL;
 static struct DjuiCheckbox* sRandomStageCheckbox = NULL;
-static struct DjuiCheckbox* sVanillaDemosCheckbox = NULL;
+// static struct DjuiCheckbox* sVanillaDemosCheckbox = NULL;
 
 void djui_panel_main_menu_create(struct DjuiBase* caller);
 
@@ -22,7 +22,7 @@ static void djui_panel_level_menu(UNUSED struct DjuiBase* caller) {
     djui_base_set_enabled(&sLevelBox->base, !(configMenuRandom || configMenuStaffRoll));
     djui_base_set_enabled(&sUseStageMusicCheckbox->base, !configMenuStaffRoll);
     djui_base_set_enabled(&sRandomStageCheckbox->base, !configMenuStaffRoll);
-    djui_base_set_enabled(&sVanillaDemosCheckbox->base, !configMenuStaffRoll);
+    // djui_base_set_enabled(&sVanillaDemosCheckbox->base, !configMenuStaffRoll);
     if (configMenuStaffRoll) {
         warp_credits();
         level_trigger_warp(gMarioState, WARP_OP_CREDITS_NEXT);
@@ -100,9 +100,9 @@ void djui_panel_main_menu_create(struct DjuiBase* caller) {
             struct DjuiCheckbox* checkbox2 = djui_checkbox_create(body, DLANG(MENU_OPTIONS, RANDOM_STAGE), &configMenuRandom, djui_panel_level_menu);
             djui_base_set_enabled(&checkbox2->base, !configMenuStaffRoll);
             sRandomStageCheckbox = checkbox2;
-            struct DjuiCheckbox* checkbox3 = djui_checkbox_create(body, DLANG(MENU_OPTIONS, PLAY_VANILLA_DEMOS), &configMenuDemos, stop_demo);
-            djui_base_set_enabled(&checkbox3->base, !configMenuStaffRoll);
-            sVanillaDemosCheckbox = checkbox3;
+            // struct DjuiCheckbox* checkbox3 = djui_checkbox_create(body, DLANG(MENU_OPTIONS, PLAY_VANILLA_DEMOS), &configMenuDemos, stop_demo);
+            // djui_base_set_enabled(&checkbox3->base, !configMenuStaffRoll);
+            // sVanillaDemosCheckbox = checkbox3;
         }
 
         djui_button_create(body, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back);