Exclude locations fix (HarbourMasters#4969)

* Properly check for Excluded Location option. * Remove GetOption overloads, weren't working anyway
Sarge-117 · Jan 29, 2025 · 7df9641 · 7df9641
1 parent 1f65bde
commit 7df9641
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -159,7 +159,7 @@ static void WriteExcludedLocations() {
 
   for (size_t i = 1; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size(); i++) {
     for (const auto& location : Rando::Settings::GetInstance()->GetExcludeLocationsOptions()[i]) {
-      if (ctx->GetOption(location->GetKey()).Get() == RO_LOCATION_INCLUDE) {
+      if (ctx->GetLocationOption(static_cast<RandomizerCheck>(location->GetKey())).Get() == RO_LOCATION_INCLUDE) {
         continue;
       }
 

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
@@ -438,14 +438,6 @@ OptionValue& Context::GetOption(const RandomizerSettingKey key) {
     return mOptions[key];
 }
 
-OptionValue& Context::GetOption(const RandomizerTrick key) {
-    return mTrickOptions[key];
-}
-
-OptionValue& Context::GetOption(const RandomizerCheck key) {
-    return itemLocationTable[key].GetExcludedOption();
-}
-
 OptionValue& Context::GetTrickOption(const RandomizerTrick key) {
     return mTrickOptions[key];
 }

diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
@@ -91,8 +91,6 @@ class Context {
     TrialInfo* GetTrial(TrialKey key) const;
     static Sprite* GetSeedTexture(uint8_t index);
     OptionValue& GetOption(RandomizerSettingKey key);
-    OptionValue& GetOption(RandomizerTrick key);
-    OptionValue& GetOption(RandomizerCheck key);
     OptionValue& GetTrickOption(RandomizerTrick key);
     OptionValue& GetLocationOption(RandomizerCheck key);