mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-12 22:48:04 -05:00
Code Issues Projects Releases Wiki Activity

Adressed first comments

Browse Source
This commit is contained in:
aMannus 2022-07-23 11:28:07 +02:00
parent 061c8c9fff
commit 59531f89b1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3714,16 +3714,11 @@ void DrawRandoEditor(bool& open) {
return; return;
} }
bool disableEditingRandoSettings = CVar_GetS32("gRandoGenerating", 0) || bool disableEditingRandoSettings = CVar_GetS32("gRandoGenerating", 0) || CVar_GetS32("gOnFileSelectNameEntry", 0);
CVar_GetS32("gOnFileSelectNameEntry", 0); bool disableZeldaRelatedOptions = CVar_GetS32("gRandomizeSkipChildZelda", 0) || disableEditingRandoSettings;
bool disableZeldaRelatedOptions = CVar_GetS32("gRandomizeSkipChildZelda", 0);
if (disableEditingRandoSettings) {
disableZeldaRelatedOptions = true;
}
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableEditingRandoSettings); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableEditingRandoSettings);
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * disableEditingRandoSettings ? 0.5f : 1.0f); ImGui::GetStyle().Alpha * (disableEditingRandoSettings ? 0.5f : 1.0f));
SohImGui::EnhancementCheckbox("Enable Randomizer", "gRandomizer"); SohImGui::EnhancementCheckbox("Enable Randomizer", "gRandomizer");
if (CVar_GetS32("gRandomizer", 0) == 1) { if (CVar_GetS32("gRandomizer", 0) == 1) {
@ -3975,7 +3970,7 @@ void DrawRandoEditor(bool& open) {
} }
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));
SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg"); SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg");
ImGui::PopStyleVar(); ImGui::PopStyleVar();
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && disableZeldaRelatedOptions) { if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && disableZeldaRelatedOptions) {
@ -4092,7 +4087,7 @@ void DrawRandoEditor(bool& open) {
} }
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));
SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(), SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(),
"gRandomizeSkipChildStealth"); "gRandomizeSkipChildStealth");
ImGui::PopStyleVar(); ImGui::PopStyleVar();