Force Warp Song Hints off when Warp Songs are not shuffled (#4229)

This commit is contained in:
Pepper0ni 2024-07-11 15:38:52 +01:00 committed by GitHub
parent 77770ba3b2
commit a0fda39a75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1739,6 +1739,12 @@ void Settings::UpdateOptionProperties() {
mOptions[RSK_HINT_DISTRIBUTION].Unhide(); mOptions[RSK_HINT_DISTRIBUTION].Unhide();
} }
if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"), RO_GENERIC_ON)) {
mOptions[RSK_WARP_SONG_HINTS].Enable();
} else {
mOptions[RSK_WARP_SONG_HINTS].Disable("This option is disabled since warp song locations not shuffled.");
}
if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_OFF)) { if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_OFF)) {
mOptions[RSK_MALON_HINT].Enable(); mOptions[RSK_MALON_HINT].Enable();
} else { } else {
@ -2039,6 +2045,10 @@ void Settings::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocatio
mOptions[RSK_KEYSANITY].SetSelectedIndex(3); mOptions[RSK_KEYSANITY].SetSelectedIndex(3);
} }
if (!mOptions[RSK_SHUFFLE_WARP_SONGS]) {
mOptions[RSK_WARP_SONG_HINTS].SetSelectedIndex(RO_GENERIC_OFF);
}
if (!mOptions[RSK_SHUFFLE_COWS]) { if (!mOptions[RSK_SHUFFLE_COWS]) {
mOptions[RSK_MALON_HINT].SetSelectedIndex(RO_GENERIC_OFF); mOptions[RSK_MALON_HINT].SetSelectedIndex(RO_GENERIC_OFF);
} }