mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 15:00:13 -05:00
Code Issues Projects Releases Wiki Activity

Exclude locations fix (#4969)

Browse Source 
* Properly check for Excluded Location option.

* Remove GetOption overloads, weren't working anyway
This commit is contained in:
Christopher Leggett 2025-01-29 10:12:42 -05:00 committed by GitHub
parent 1f65bde583
commit 7df9641297
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View File

@ -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;
}

8
soh/soh/Enhancements/randomizer/context.cpp
View File

@ -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];
}

2
soh/soh/Enhancements/randomizer/context.h
View File

@ -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);