From ff0ef4a6b472e9e11692b03cb24073826f27fab0 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sat, 27 Aug 2022 14:27:02 -0400 Subject: [PATCH] ImGui/Commented out code cleanup. --- soh/soh/Enhancements/randomizer/3drando/settings.cpp | 10 ---------- soh/soh/Enhancements/randomizer/randomizer.cpp | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp index 9e496598e..cb9820cec 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp @@ -2518,17 +2518,7 @@ namespace Settings { BridgeDungeonCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT]); BridgeTokenCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_TOKEN_COUNT]); RandomGanonsTrials.SetSelectedIndex(cvarSettings[RSK_RANDOM_TRIALS]); - // RANDTODO: Switch this back once Ganon's Trials Count is properly implemented. GanonsTrialsCount.SetSelectedIndex(cvarSettings[RSK_TRIAL_COUNT]); - // switch (cvarSettings[RSK_TRIAL_COUNT]) { - // case 0: - // GanonsTrialsCount.SetSelectedIndex(6); - // break; - // case 1: - // GanonsTrialsCount.SetSelectedIndex(0); - // break; - // } - ShuffleRewards.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_DUNGEON_REWARDS]); ShuffleSongs.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SONGS]); Tokensanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_TOKENS]); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 6dff5a627..11335d275 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3399,17 +3399,13 @@ void DrawRandoEditor(bool& open) { PaddedSeparator(); // Random Ganon's Trials - ImGui::Text("Random Ganon's Trials"); SohImGui::EnhancementCheckbox("Random Ganon's Trials", "gRandomizeGanonTrial"); - InsertHelpHoverText("Sets a random number or required trials to enter\nGanon's Tower."); + InsertHelpHoverText("Sets a random number or required trials to enter Ganon's Tower."); if (CVar_GetS32("gRandomizeGanonTrial", 0) == 0) { SohImGui::EnhancementSliderInt("Ganon's Trial Count: %d", "##RandoTrialCount", "gRandomizeGanonTrialCount", 0, 6, "", 6); InsertHelpHoverText("Set the number of trials required to enter Ganon's Tower."); } - // SohImGui::EnhancementCheckbox("Skip Ganon's Trials", "gRandomizeGanonTrialCount"); - // InsertHelpHoverText( - // "Sets whether or not Ganon's Castle Trials are required to enter Ganon's Tower."); } // COLUMN 2 - Shuffle Settings