mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-17 23:15:11 -05:00
Code Issues Projects Releases Wiki Activity

Removed CVar updating in UI

Browse Source
This commit is contained in:
aMannus 2022-07-23 18:44:15 +02:00
parent 59531f89b1
commit 2d2d558657
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -3439,7 +3439,10 @@ void GenerateRandomizerImgui() {
cvarSettings[RSK_SHUFFLE_SONGS] = CVar_GetS32("gRandomizeShuffleSongs", 0); cvarSettings[RSK_SHUFFLE_SONGS] = CVar_GetS32("gRandomizeShuffleSongs", 0);
cvarSettings[RSK_SHUFFLE_TOKENS] = CVar_GetS32("gRandomizeShuffleTokens", 0); cvarSettings[RSK_SHUFFLE_TOKENS] = CVar_GetS32("gRandomizeShuffleTokens", 0);
cvarSettings[RSK_SKIP_CHILD_ZELDA] = CVar_GetS32("gRandomizeSkipChildZelda", 0); cvarSettings[RSK_SKIP_CHILD_ZELDA] = CVar_GetS32("gRandomizeSkipChildZelda", 0);
cvarSettings[RSK_SHUFFLE_WEIRD_EGG] = CVar_GetS32("gRandomizeShuffleWeirdEgg", 0);
// if we skip child zelda, we start with zelda's letter, and malon starts
// at the ranch, so we should *not* shuffle the weird egg
cvarSettings[RSK_SHUFFLE_WEIRD_EGG] = ((CVar_GetS32("gRandomizeSkipChildZelda", 0) == 0) && CVar_GetS32("gRandomizeShuffleWeirdEgg", 0));
cvarSettings[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = CVar_GetS32("gRandomizeShuffleGerudoToken", 0); cvarSettings[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD] = CVar_GetS32("gRandomizeShuffleGerudoToken", 0);
cvarSettings[RSK_ITEM_POOL] = CVar_GetS32("gRandomizeItemPool", 1); cvarSettings[RSK_ITEM_POOL] = CVar_GetS32("gRandomizeItemPool", 1);
@ -3965,9 +3968,6 @@ void DrawRandoEditor(bool& open) {
// Shuffle Weird Egg // Shuffle Weird Egg
// Disabled when Skip Child Zelda is active // Disabled when Skip Child Zelda is active
if (disableZeldaRelatedOptions) {
CVar_SetS32("gRandomizeShuffleWeirdEgg", 0);
}
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions);
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * (disableZeldaRelatedOptions ? 0.5f : 1.0f)); ImGui::GetStyle().Alpha * (disableZeldaRelatedOptions ? 0.5f : 1.0f));
@ -4080,11 +4080,6 @@ void DrawRandoEditor(bool& open) {
// Skip child stealth // Skip child stealth
// Disabled when Skip Child Zelda is active // Disabled when Skip Child Zelda is active
if (disableZeldaRelatedOptions) {
CVar_SetS32("gRandomizeSkipChildStealth", 0);
// Also disable Weird Egg because it's on a different tab and wouldn't be updated otherwise
CVar_SetS32("gRandomizeShuffleWeirdEgg", 0);
}
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions);
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * (disableZeldaRelatedOptions ? 0.5f : 1.0f)); ImGui::GetStyle().Alpha * (disableZeldaRelatedOptions ? 0.5f : 1.0f));