mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-22 21:51:55 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1423 from garrettjoecox/fix-for-scrubs-being-disabled

Browse Source 
Fix issue when merchantPrices is empty
This commit is contained in:
briaguya 2022-09-06 01:05:16 -04:00 committed by GitHub
commit d2682998c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/SaveManager.cpp
View File

@ -94,7 +94,13 @@ void SaveManager::LoadRandomizerVersion1() {
std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer; std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
SaveManager::Instance->LoadArray("merchantPrices", NUM_SCRUBS, [&](size_t i) { size_t merchantPricesSize = 0;
if (randomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) > 0) {
merchantPricesSize += NUM_SCRUBS;
}
// TODO: Add shop item count when shopsanity is enabled
SaveManager::Instance->LoadArray("merchantPrices", merchantPricesSize, [&](size_t i) {
SaveManager::Instance->LoadStruct("", [&]() { SaveManager::Instance->LoadStruct("", [&]() {
RandomizerCheck rc; RandomizerCheck rc;
SaveManager::Instance->LoadData("check", rc); SaveManager::Instance->LoadData("check", rc);
@ -155,7 +161,7 @@ void SaveManager::SaveRandomizer() {
merchantPrices.push_back(std::make_pair(check, price)); merchantPrices.push_back(std::make_pair(check, price));
} }
SaveManager::Instance->SaveArray("merchantPrices", NUM_SCRUBS, [&](size_t i) { SaveManager::Instance->SaveArray("merchantPrices", merchantPrices.size(), [&](size_t i) {
SaveManager::Instance->SaveStruct("", [&]() { SaveManager::Instance->SaveStruct("", [&]() {
SaveManager::Instance->SaveData("check", merchantPrices[i].first); SaveManager::Instance->SaveData("check", merchantPrices[i].first);
SaveManager::Instance->SaveData("price", merchantPrices[i].second); SaveManager::Instance->SaveData("price", merchantPrices[i].second);