diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index 34fda4a0fc..e809aa0adc 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -76,7 +76,7 @@ void Z2SceneMgr::setFadeOutStart(u8 fadeType) { Z2GetSeMgr()->seMoveVolumeAll(0.0f, 33); Z2GetSeqMgr()->setBattleBgmOff(true); #if TARGET_PC - if (dusk::getSettings().game.fasterSceneTransitions) { + if (dusk::getSettings().game.fastTransitions) { load1stWait = 1; } else { load1stWait = 40; @@ -1786,7 +1786,7 @@ void Z2SceneMgr::_load1stWaveInner_1() { OS_REPORT("[Z2SceneMgr::load1stDynamicWave]bgm StopCount = %d\n", 15); Z2GetSeqMgr()->bgmStop(15, 0); #if TARGET_PC - if (dusk::getSettings().game.fasterSceneTransitions) { + if (dusk::getSettings().game.fastTransitions) { load1stWait = -1; } else { load1stWait = -15; diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index d59fe80382..bbcbb7c4ed 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -139,7 +139,7 @@ dOvlpFd3_c::dOvlpFd3_c() { dCam_getBody()->Stop(); #if TARGET_PC int time = 90; - if (dusk::getSettings().game.fasterSceneTransitions) { + if (dusk::getSettings().game.fastTransitions) { time = 0; } mDoGph_gInf_c::startFadeOut(XREG_S(3) + (field_0x11f >> 1) + time); diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index bbd78bfee1..69ff703972 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -40,7 +40,7 @@ UserSettings g_userSettings = { .biggerWallets {"game.biggerWallets", false}, .noReturnRupees {"game.noReturnRupees", false}, .disableRupeeCutscenes {"game.disableRupeeCutscenes", false}, - .fasterSceneTransitions {"game.fasterSceneTransitions", false}, + .fastTransitions {"game.fastTransitions", false}, .noSwordRecoil {"game.noSwordRecoil", false}, .damageMultiplier {"game.damageMultiplier", 1}, .noHeartDrops {"game.noHeartDrops", false}, @@ -253,7 +253,7 @@ void registerSettings() { Register(g_userSettings.game.biggerWallets); Register(g_userSettings.game.noReturnRupees); Register(g_userSettings.game.disableRupeeCutscenes); - Register(g_userSettings.game.fasterSceneTransitions); + Register(g_userSettings.game.fastTransitions); Register(g_userSettings.game.noSwordRecoil); Register(g_userSettings.game.damageMultiplier); Register(g_userSettings.game.noHeartDrops); diff --git a/src/dusk/settings.h b/src/dusk/settings.h index 220b5ab65f..de2569d5a5 100644 --- a/src/dusk/settings.h +++ b/src/dusk/settings.h @@ -171,7 +171,7 @@ struct UserSettings { ConfigVar biggerWallets; ConfigVar noReturnRupees; ConfigVar disableRupeeCutscenes; - ConfigVar fasterSceneTransitions; + ConfigVar fastTransitions; ConfigVar noSwordRecoil; ConfigVar damageMultiplier; ConfigVar noHeartDrops; diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index d5e9178fb9..49e9521151 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -1204,7 +1204,7 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { "Wallet sizes are like in the HD version. (500, 1000, 2000)"); addOption("Disable Rupee Cutscenes", getSettings().game.disableRupeeCutscenes, "Rupees will not play cutscenes after you have collected them the first time."); - addOption("Faster Scene Transitions", getSettings().game.fasterSceneTransitions, + addOption("Faster Scene Transitions", getSettings().game.fastTransitions, "Reduces how long the transitions take when changing maps."); addOption("Faster Climbing", getSettings().game.fastClimbing, "Quicker climbing on ladders and vines like the HD version.");