mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 06:41:52 -05:00
Code Issues Projects Releases Wiki Activity

Removed bool declaration

Browse Source
This commit is contained in:
aMannus 2022-07-23 20:36:46 +02:00
parent 29b944df92
commit 3758d8bb8d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3717,7 +3717,6 @@ void DrawRandoEditor(bool& open) {
} }
bool disableEditingRandoSettings = CVar_GetS32("gRandoGenerating", 0) || CVar_GetS32("gOnFileSelectNameEntry", 0); bool disableEditingRandoSettings = CVar_GetS32("gRandoGenerating", 0) || CVar_GetS32("gOnFileSelectNameEntry", 0);
bool disableZeldaRelatedOptions = CVar_GetS32("gRandomizeSkipChildZelda", 0);
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));
@ -3968,15 +3967,16 @@ 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 (!disableEditingRandoSettings) { if (!disableEditingRandoSettings) {
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, CVar_GetS32("gRandomizeSkipChildZelda", 0));
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * (disableZeldaRelatedOptions ? 0.5f : 1.0f)); ImGui::GetStyle().Alpha *
(CVar_GetS32("gRandomizeSkipChildZelda", 0) ? 0.5f : 1.0f));
} }
SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg"); SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg");
if (!disableEditingRandoSettings) { if (!disableEditingRandoSettings) {
ImGui::PopStyleVar(); ImGui::PopStyleVar();
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
disableZeldaRelatedOptions) { CVar_GetS32("gRandomizeSkipChildZelda", 0)) {
ImGui::SetTooltip("%s", ImGui::SetTooltip("%s",
"This option is disabled because \"Skip Child Zelda\" is enabled"); "This option is disabled because \"Skip Child Zelda\" is enabled");
} }
@ -4086,15 +4086,17 @@ 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 (!disableEditingRandoSettings) { if (!disableEditingRandoSettings) {
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, CVar_GetS32("gRandomizeSkipChildZelda", 0));
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * (disableZeldaRelatedOptions ? 0.5f : 1.0f)); ImGui::GetStyle().Alpha *
(CVar_GetS32("gRandomizeSkipChildZelda", 0) ? 0.5f : 1.0f));
} }
SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(), SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(),
"gRandomizeSkipChildStealth"); "gRandomizeSkipChildStealth");
if (!disableEditingRandoSettings) { if (!disableEditingRandoSettings) {
ImGui::PopStyleVar(); ImGui::PopStyleVar();
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && disableZeldaRelatedOptions) { if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
CVar_GetS32("gRandomizeSkipChildZelda", 0)) {
ImGui::SetTooltip("%s", "This option is disabled because \"Skip Child Zelda\" is enabled"); ImGui::SetTooltip("%s", "This option is disabled because \"Skip Child Zelda\" is enabled");
} }
ImGui::PopItemFlag(); ImGui::PopItemFlag();