github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-25 07:35:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

ImGui/Commented out code cleanup.

Browse source
This commit is contained in:
Christopher Leggett 2022-08-27 14:27:02 -04:00
commit ff0ef4a6b4
No known key found for this signature in database
GPG key ID: 7093AE5FF7037D79
2 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/soh/Enhancements/randomizer/3drando/settings.cpp
View file

@ -2518,17 +2518,7 @@ namespace Settings {
BridgeDungeonCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT]); BridgeDungeonCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT]);
BridgeTokenCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_TOKEN_COUNT]); BridgeTokenCount.SetSelectedIndex(cvarSettings[RSK_RAINBOW_BRIDGE_TOKEN_COUNT]);
RandomGanonsTrials.SetSelectedIndex(cvarSettings[RSK_RANDOM_TRIALS]); RandomGanonsTrials.SetSelectedIndex(cvarSettings[RSK_RANDOM_TRIALS]);
// RANDTODO: Switch this back once Ganon's Trials Count is properly implemented.
GanonsTrialsCount.SetSelectedIndex(cvarSettings[RSK_TRIAL_COUNT]); 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]); ShuffleRewards.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_DUNGEON_REWARDS]);
ShuffleSongs.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SONGS]); ShuffleSongs.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SONGS]);
Tokensanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_TOKENS]); Tokensanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_TOKENS]);

6
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -3399,17 +3399,13 @@ void DrawRandoEditor(bool& open) {
PaddedSeparator(); PaddedSeparator();
// Random Ganon's Trials // Random Ganon's Trials
ImGui::Text("Random Ganon's Trials");
SohImGui::EnhancementCheckbox("Random Ganon's Trials", "gRandomizeGanonTrial"); 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) { if (CVar_GetS32("gRandomizeGanonTrial", 0) == 0) {
SohImGui::EnhancementSliderInt("Ganon's Trial Count: %d", "##RandoTrialCount", SohImGui::EnhancementSliderInt("Ganon's Trial Count: %d", "##RandoTrialCount",
"gRandomizeGanonTrialCount", 0, 6, "", 6); "gRandomizeGanonTrialCount", 0, 6, "", 6);
InsertHelpHoverText("Set the number of trials required to enter Ganon's Tower."); 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 // COLUMN 2 - Shuffle Settings