From a9f73ee641259ef27bcf331efc502b4d69635c02 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Wed, 26 Oct 2022 15:57:14 -0400 Subject: [PATCH] Makes merchant prices array size not depend on Rando Setting Values (#1860) --- soh/soh/SaveManager.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index dbb224fa8..25a60b4b5 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -177,12 +177,7 @@ void SaveManager::LoadRandomizerVersion2() { std::shared_ptr randomizer = OTRGlobals::Instance->gRandomizer; size_t merchantPricesSize = 0; - if (randomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) > 0) { - merchantPricesSize += NUM_SCRUBS; - } - if (randomizer->GetRandoSettingValue(RSK_SHOPSANITY) > 0) { - merchantPricesSize += NUM_SHOP_ITEMS; - } + SaveManager::Instance->LoadData("merchantPricesSize", merchantPricesSize); SaveManager::Instance->LoadArray("merchantPrices", merchantPricesSize, [&](size_t i) { SaveManager::Instance->LoadStruct("", [&]() { @@ -247,6 +242,7 @@ void SaveManager::SaveRandomizer() { merchantPrices.push_back(std::make_pair(check, price)); } + SaveManager::Instance->SaveData("merchantPricesSize", merchantPrices.size()); SaveManager::Instance->SaveArray("merchantPrices", merchantPrices.size(), [&](size_t i) { SaveManager::Instance->SaveStruct("", [&]() { SaveManager::Instance->SaveData("check", merchantPrices[i].first);