nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix excluded locations regressions causing crash (#6375)

Browse Source
This commit is contained in:
Philip Dubé
2026-03-19 15:50:52 +00:00
committed by GitHub
parent 94a02dd53a
commit 04ed1825f0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/SohGui/SohMenuRandomizer.cpp
View File

@@ -105,7 +105,7 @@ void DrawLocationsMenu(WidgetInfo& info) {
if (!excludedLocationString.empty()) { if (!excludedLocationString.empty()) {
excludedLocationString += ","; excludedLocationString += ",";
} }
excludedLocationString += excludedLocationIt; excludedLocationString += std::to_string(excludedLocationIt);
} }
CVarSetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), CVarSetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"),
excludedLocationString.c_str()); excludedLocationString.c_str());
@@ -152,7 +152,7 @@ void DrawLocationsMenu(WidgetInfo& info) {
if (!excludedLocationString.empty()) { if (!excludedLocationString.empty()) {
excludedLocationString += ","; excludedLocationString += ",";
} }
excludedLocationString += excludedLocationIt; excludedLocationString += std::to_string(excludedLocationIt);
} }
if (excludedLocationString == "") { if (excludedLocationString == "") {
CVarClear(CVAR_RANDOMIZER_SETTING("ExcludedLocations")); CVarClear(CVAR_RANDOMIZER_SETTING("ExcludedLocations"));
@@ -188,9 +188,11 @@ void UpdateMenuLocations() {
std::string excludedLocationString; std::string excludedLocationString;
excludedLocations.clear(); excludedLocations.clear();
while (getline(excludedLocationStringStream, excludedLocationString, ',')) { while (getline(excludedLocationStringStream, excludedLocationString, ',')) {
if (!excludedLocationString.empty()) {
excludedLocations.insert((RandomizerCheck)std::stoi(excludedLocationString)); excludedLocations.insert((RandomizerCheck)std::stoi(excludedLocationString));
} }
} }
}
void UpdateMenuTricks() { void UpdateMenuTricks() {
// RandomizerTricks::UpdateImGuiVisibility(); // RandomizerTricks::UpdateImGuiVisibility();
@@ -207,9 +209,11 @@ void UpdateMenuTricks() {
std::string enabledGlitchString; std::string enabledGlitchString;
enabledGlitches.clear(); enabledGlitches.clear();
while (getline(enabledGlitchStringStream, enabledGlitchString, ',')) { while (getline(enabledGlitchStringStream, enabledGlitchString, ',')) {
if (!enabledGlitchString.empty()) {
enabledGlitches.insert((RandomizerTrick)std::stoi(enabledGlitchString)); enabledGlitches.insert((RandomizerTrick)std::stoi(enabledGlitchString));
} }
} }
}
void DrawTricksMenu(WidgetInfo& info) { void DrawTricksMenu(WidgetInfo& info) {
auto ctx = OTRGlobals::Instance->gRandoContext; auto ctx = OTRGlobals::Instance->gRandoContext;