From 72660e2cfd8abd858417efa36ad7116b3a9b93ae Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sat, 3 Sep 2022 15:28:59 -0500 Subject: [PATCH 1/2] Fix for beans obtainability --- soh/soh/Enhancements/randomizer/randomizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 083e231d9..0187d5486 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1360,7 +1360,7 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe return INV_CONTENT(ITEM_LENS) == ITEM_NONE ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE; case RG_MAGIC_BEAN: case RG_MAGIC_BEAN_PACK: - return BEANS_BOUGHT < 10 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE; + return AMMO(ITEM_BEAN) < 10 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE; case RG_MEGATON_HAMMER: return INV_CONTENT(ITEM_HAMMER) == ITEM_NONE ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE; case RG_FIRE_ARROWS: From 1bbde39439b3cd11bf7b3ea8bab77c25af744c56 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sun, 4 Sep 2022 02:03:16 -0500 Subject: [PATCH 2/2] Ensure itemTrackerNotes vector is not fully empty --- .../Enhancements/randomizer/randomizer_item_tracker.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index 5b52047ab..cf9ccfdbd 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -511,9 +511,6 @@ void DrawNotes(bool resizeable = false) { (void*)itemTrackerNotes); } }; - if (itemTrackerNotes.empty()) { - itemTrackerNotes.push_back(0); - } ImVec2 size = resizeable ? ImVec2(-FLT_MIN, ImGui::GetContentRegionAvail().y) : ImVec2(((iconSize + iconSpacing) * 6) - 8, 200); ItemTrackerNotes::TrackerNotesInputTextMultiline("##ItemTrackerNotes", &itemTrackerNotes, size, ImGuiInputTextFlags_AllowTabInput); if (ImGui::IsItemDeactivatedAfterEdit() && IsValidSaveFile()) { @@ -926,6 +923,10 @@ void InitItemTracker() { trackerBgB, trackerBgA }; // Float value, 1 = 255 in rgb value. + // Crashes when the itemTrackerNotes is empty, so add an empty character to it + if (itemTrackerNotes.empty()) { + itemTrackerNotes.push_back(0); + } Ship::RegisterHook([](OSContPad* cont_pad) { buttonsPressed = cont_pad; });