From 795ee54f2b9ccd7110d51021310dab3be0bf80c6 Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 20 Jul 2022 21:44:32 -0700 Subject: [PATCH] Remove use of std::format since Jenkins doesn't like it --- soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp | 2 +- soh/soh/Enhancements/randomizer/randomizer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp index a253cf12d..d41a8a11f 100644 --- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp @@ -373,7 +373,7 @@ static void WriteSettings(const bool printAll = false) { } // 3drando doesn't have a "skip child zelda" setting, manually add it to the spoilerfile - jsonData["settings"]["Skip Child Zelda"] = std::format("{0}", Settings::skipChildZelda); + jsonData["settings"]["Skip Child Zelda"] = Settings::skipChildZelda ? "On" : "Off"; } // spoilerLog.RootElement()->InsertEndChild(parentNode); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index aa9cb5611..d77163456 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1678,9 +1678,9 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) { } break; case RSK_SKIP_CHILD_ZELDA: - if (it.value() == "false") { + if (it.value() == "No") { gSaveContext.randoSettings[index].value = 0; - } else if (it.value() == "true") { + } else if (it.value() == "Yes") { gSaveContext.randoSettings[index].value = 1; } break;