From ba7e3afaf4c6270f71da7186f3140139fc5b9ca1 Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Tue, 15 Apr 2025 20:58:16 +0000
Subject: [PATCH] CheckBeatable: move clearing ctx->playthroughBeatable into
 function

---
 soh/soh/Enhancements/randomizer/3drando/fill.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index dcae4842c..c8c43c492 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -327,13 +327,12 @@ bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem,
     auto ctx = Rando::Context::GetInstance();
     RandomizerGet copy = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet(); // Copy out item
     ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);                        // Write in empty item
-    ctx->playthroughBeatable = false;
     logic->Reset();
-    CheckBeatable(ignore);
+    bool result = CheckBeatable(ignore);
     if (replaceItem) {
         ctx->GetItemLocation(excludedCheck)->SetPlacedItem(copy); // Immediately put item back
     }
-    return ctx->playthroughBeatable;
+    return result;
 }
 
 // Reset non-Logic-class logic, and optionally apply the initial inventory
@@ -581,6 +580,7 @@ void GeneratePlaythrough() {
 // return if the seed is currently beatable or not
 bool CheckBeatable(RandomizerGet ignore /* = RG_NONE*/) {
     auto ctx = Rando::Context::GetInstance();
+    ctx->playthroughBeatable = false;
     GetAccessibleLocationsStruct gals(0);
     ResetLogic(ctx, gals, true);
     do {
@@ -929,10 +929,8 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
             // If ALR is off, then we check beatability after placing the item.
             // If the game is beatable, then we can stop placing items with logic.
             if (!ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE)) {
-                ctx->playthroughBeatable = false;
                 logic->Reset();
-                CheckBeatable();
-                if (ctx->playthroughBeatable) {
+                if (CheckBeatable()) {
                     SPDLOG_DEBUG("Game beatable, now placing items randomly. " + std::to_string(itemsToPlace.size()) +
                                  " major items remaining.\n\n");
                     FastFill(itemsToPlace, GetEmptyLocations(allowedLocations), true);