diff --git a/include/dusk/settings.h b/include/dusk/settings.h index 7f7aa8cd69..766fa506c1 100644 --- a/include/dusk/settings.h +++ b/include/dusk/settings.h @@ -67,7 +67,6 @@ struct UserSettings { // QoL ConfigVar enableQuickTransform; ConfigVar hideTvSettingsScreen; - ConfigVar skipWarningScreen; ConfigVar biggerWallets; ConfigVar noReturnRupees; ConfigVar disableRupeeCutscenes; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index cc5d0114a4..db0cfa1387 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -1120,26 +1120,12 @@ int dScnLogo_c::create() { checkProgSelect(); if (field_0x20a != 0) { mExecCommand = EXEC_PROG_IN; - #if TARGET_PC - mTimer = dusk::getSettings().game.skipWarningScreen ? 1 : 30; - #else mTimer = 30; - #endif field_0x218 = getProgressiveMode(); } else { #if TARGET_PC - if (dusk::getSettings().game.skipWarningScreen) { - mTimer = 0; // Possibly unnecessary but just in case - mExecCommand = EXEC_DVD_WAIT; - } else { - if (mDoRst::getWarningDispFlag()) { - mTimer = 90; - mExecCommand = EXEC_NINTENDO_IN; - } else { - mTimer = 120; - mExecCommand = EXEC_WARNING_IN; - } - } + mTimer = 0; // Possibly unnecessary but just in case + mExecCommand = EXEC_DVD_WAIT; #else if (mDoRst::getWarningDispFlag()) { mTimer = 90; diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index 9114bfbee3..2b84c8bb47 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -27,7 +27,6 @@ UserSettings g_userSettings = { // Quality of Life .enableQuickTransform {"game.enableQuickTransform", false}, .hideTvSettingsScreen {"game.hideTvSettingsScreen", true}, - .skipWarningScreen {"game.skipWarningScreen", true}, .biggerWallets {"game.biggerWallets", false}, .noReturnRupees {"game.noReturnRupees", false}, .disableRupeeCutscenes {"game.disableRupeeCutscenes", false}, @@ -143,7 +142,6 @@ void registerSettings() { Register(g_userSettings.game.language); Register(g_userSettings.game.enableQuickTransform); Register(g_userSettings.game.hideTvSettingsScreen); - Register(g_userSettings.game.skipWarningScreen); Register(g_userSettings.game.biggerWallets); Register(g_userSettings.game.noReturnRupees); Register(g_userSettings.game.disableRupeeCutscenes); diff --git a/src/dusk/ui/preset.cpp b/src/dusk/ui/preset.cpp index ebd442d7d7..4cbd1aa673 100644 --- a/src/dusk/ui/preset.cpp +++ b/src/dusk/ui/preset.cpp @@ -18,14 +18,12 @@ void applyPresetClassic() { s.game.internalResolutionScale.setValue(1); s.game.shadowResolutionMultiplier.setValue(1); s.game.hideTvSettingsScreen.setValue(false); - s.game.skipWarningScreen.setValue(false); AuroraSetViewportPolicy(AURORA_VIEWPORT_FIT); } void applyPresetDusk() { auto& s = getSettings(); s.game.hideTvSettingsScreen.setValue(true); - s.game.skipWarningScreen.setValue(true); s.game.noReturnRupees.setValue(true); s.game.disableRupeeCutscenes.setValue(true); s.game.noSwordRecoil.setValue(true); diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index a08ef2d11f..0c712aeda5 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -849,11 +849,6 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { .key = "Skip TV Settings Screen", .helpText = "Skips the TV calibration screen shown when loading a save.", }); - config_bool_select(leftPane, rightPane, getSettings().game.skipWarningScreen, - { - .key = "Skip Warning Screen", - .helpText = "Skips the warning screen shown when starting the game.", - }); config_bool_select(leftPane, rightPane, getSettings().backend.showPipelineCompilation, { .key = "Show Pipeline Compilation",