From 8f92dea109f8d08da5a8ee88f4a87ec063468771 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Mon, 1 Apr 2024 14:41:01 -0700 Subject: [PATCH] Mirroring last commit from part 1 in randomizer.cpp --- soh/soh/Enhancements/presets.h | 2 +- soh/soh/Enhancements/randomizer/randomizer.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index 1b8c91ec1..837193356 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -479,7 +479,7 @@ const std::vector randomizerCvars = { RANDOMIZER_SEED_CVAR("ZorasFountain"), RANDOMIZER_SEED_CVAR("Shuffle100GSReward"), RANDOMIZER_SEED_CVAR("GregHint"), - "gRandoManualSeedEntry", + RANDOMIZER_SEED_CVAR("ManualSeedEntry"), RANDOMIZER_SEED_CVAR("TriforceHuntTotalPieces"), RANDOMIZER_SEED_CVAR("TriforceHuntRequiredPieces"), RANDOMIZER_SEED_CVAR("TriforceHunt"), diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 5c7daba4d..5c6d1bf5f 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3154,8 +3154,8 @@ void RandomizerSettingsWindow::DrawElement() { ImGui::EndDisabled(); UIWidgets::Spacer(0); - UIWidgets::EnhancementCheckbox("Manual seed entry", "gRandoManualSeedEntry", false, ""); - if (CVarGetInteger("gRandoManualSeedEntry", 0)) { + UIWidgets::EnhancementCheckbox("Manual seed entry", RANDOMIZER_SEED_CVAR("ManualSeedEntry"), false, ""); + if (CVarGetInteger(RANDOMIZER_SEED_CVAR("ManualSeedEntry"), 0)) { ImGui::Text("Seed"); ImGui::InputText("##RandomizerSeed", seedString, MAX_SEED_STRING_SIZE, ImGuiInputTextFlags_CallbackCharFilter, UIWidgets::TextFilters::FilterAlphaNum); UIWidgets::Tooltip( @@ -3176,7 +3176,7 @@ void RandomizerSettingsWindow::DrawElement() { UIWidgets::Spacer(0); ImGui::BeginDisabled(CVarGetInteger(RANDOMIZER_SEED_CVAR("DontGenerateSpoiler"), 0) && gSaveContext.gameMode != GAMEMODE_FILE_SELECT); if (ImGui::Button("Generate Randomizer")) { - GenerateRandomizer(CVarGetInteger("gRandoManualSeedEntry", 0) ? seedString : ""); + GenerateRandomizer(CVarGetInteger(RANDOMIZER_SEED_CVAR("ManualSeedEntry"), 0) ? seedString : ""); } ImGui::EndDisabled();