diff --git a/src/mods/levelselect.c b/src/mods/levelselect.c index cd418711..2d8cc8a8 100644 --- a/src/mods/levelselect.c +++ b/src/mods/levelselect.c @@ -112,27 +112,27 @@ void Map_LevelSelect(void) { } // Bypass briefing - #if DEBUG_SKIP_BRIEFING - if ((timer == 0) && (startLevel == 1)) { - if ((sMapState == 2) && (sMapSubState > 0)) { - if (sCurrentPlanetId == PLANET_VENOM) { - if (startOption) { - gCurrentLevel = LEVEL_VENOM_ANDROSS; - } else if (sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2) { - gCurrentLevel = LEVEL_VENOM_2; + if (CVarGetInteger("gSkipBriefing", 0) == 1) { + if ((timer == 0) && (startLevel == 1)) { + if ((sMapState == 2) && (sMapSubState > 0)) { + if (sCurrentPlanetId == PLANET_VENOM) { + if (startOption) { + gCurrentLevel = LEVEL_VENOM_ANDROSS; + } else if (sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2) { + gCurrentLevel = LEVEL_VENOM_2; + } + } else if ((sCurrentPlanetId == PLANET_AREA_6) && startOption) { + gCurrentLevel = LEVEL_UNK_4; + } + Map_LevelStart_AudioSpecSetup(gCurrentLevel); + sLevelStartState = 0; + D_menu_801CD968 = 0; + Map_PlayLevel(); + if (startOption && ((gCurrentLevel == LEVEL_METEO) || (gCurrentLevel == LEVEL_SECTOR_X) || + (sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2))) { + gLevelPhase = 1; } - } else if ((sCurrentPlanetId == PLANET_AREA_6) && startOption) { - gCurrentLevel = LEVEL_UNK_4; - } - Map_LevelStart_AudioSpecSetup(gCurrentLevel); - sLevelStartState = 0; - D_menu_801CD968 = 0; - Map_PlayLevel(); - if (startOption && ((gCurrentLevel == LEVEL_METEO) || (gCurrentLevel == LEVEL_SECTOR_X) || - (sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2))) { - gLevelPhase = 1; } } } - #endif } diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp index 05496a22..62384e42 100644 --- a/src/port/ui/ImguiUI.cpp +++ b/src/port/ui/ImguiUI.cpp @@ -485,6 +485,10 @@ void DrawDebugMenu() { .tooltip = "Allows you to select any level from the main menu" }); + UIWidgets::CVarCheckbox("Skip Briefing", "gSkipBriefing", { + .tooltip = "Allows you to skip the briefing sequence in level select" + }); + UIWidgets::CVarCheckbox("Enable Expert Mode", "gForceExpertMode", { .tooltip = "Allows you to force expert mode" });