diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index a21dacaaf..d78f1ef90 100644 --- 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(location->GetKey())).Get() == RO_LOCATION_INCLUDE) { continue; } diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp index 3e846c4b7..79a60cc70 100644 --- 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 index 0fbb18748..cc71609eb 100644 --- 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);