From c0aa3deb93a0d5568c5a3ed918d239883902805b Mon Sep 17 00:00:00 2001 From: Malkierian Date: Wed, 15 Oct 2025 16:43:57 -0700 Subject: [PATCH] Fix Notes Conditions (#5847) * Fix conditions for personal notes being displayed and the notes display type option being disabled. * clang --- .../randomizer/randomizer_item_tracker.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index 0288539d1..f019432eb 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -1595,10 +1595,7 @@ void ItemTrackerWindow::DrawElement() { DrawItemsInRows(mainWindowItems, 6); if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) == - SECTION_DISPLAY_MAIN_WINDOW && - (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING && - CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == - TRACKER_DISPLAY_ALWAYS)) { + SECTION_DISPLAY_MAIN_WINDOW) { DrawNotes(); } EndFloatingWindows(); @@ -2104,10 +2101,9 @@ void RegisterItemTrackerWidgets() { .Color(THEME_COLOR) .ComboMap(displayTypes)) .PreFunc([&](WidgetInfo& info) { - if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW || - (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING && - CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) != - TRACKER_DISPLAY_COMBO_BUTTON)) { + if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING && + CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == + TRACKER_DISPLAY_COMBO_BUTTON) { info.options.get()->disabled = true; info.options.get()->disabledTooltip = notesDisabledTooltip; }