Fixes

aMannus · Jan 5, 2024 · 350d521 · 350d521
1 parent 8c78154
commit 350d521
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -759,15 +759,15 @@ void GenerateItemPool() {
   } else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
       if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
-        ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GREEN_RUPEE, false, true);
+        ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
       } else {
         AddItemToMainPool(RG_GREEN_RUPEE);
       }
     }
   } else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD)) {
     for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
       if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
-        ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GREEN_RUPEE, false, true);
+        ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
       } else {
         AddItemToMainPool(RG_GREEN_RUPEE);
       }

diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -119,7 +119,7 @@ void WriteIngameSpoilerLog() {
             continue;
         }
         // Shuffle Pots
-        else if (!ctx->GetOption(RSK_SHUFFLE_POTS) && loc->IsCategory(Category::cPot)) {
+        else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OFF) && loc->IsCategory(Category::cPot)) {
             continue;
         }
         // Merchants

diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
@@ -75,7 +75,7 @@ typedef enum {
 } SpoilerItemRevealType;
 
 #define SPOILER_SPHERES_MAX 50
-#define SPOILER_ITEMS_MAX 512
+#define SPOILER_ITEMS_MAX 1024
 #define SPOILER_STRING_DATA_SIZE 16384
 
 typedef struct {

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -153,7 +153,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
              ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
               RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
             (location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
-            (location.GetRCType() != RCTYPE_POT || CVarGetInteger("gRandomizeShufflePotContents", RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_POT || CVarGetInteger("gRandomizeShufflePots", RO_GENERIC_NO)) &&
             (location.GetRCType() != RCTYPE_ADULT_TRADE ||
              CVarGetInteger("gRandomizeShuffleAdultTrade", RO_GENERIC_NO)) &&
             (location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1096,8 +1096,8 @@ void LoadSettings() {
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) == RO_GENERIC_YES
         : true;
     showPots = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_POTS) == RO_GENERIC_YES
-        : true;
+        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_POTS) != RO_SHUFFLE_POTS_OFF
+        : false;
     showFrogSongRupees = IS_RANDO ?
         OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FROG_SONG_RUPEES) == RO_GENERIC_YES
         : false;