nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Notes Conditions (#5847)

Browse Source 
* Fix conditions for personal notes being displayed and the notes display type option being disabled.

* clang
This commit is contained in:
Malkierian
2025-10-15 16:43:57 -07:00
committed by GitHub
parent 56ab4c51fd
commit c0aa3deb93
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@@ -1595,10 +1595,7 @@ void ItemTrackerWindow::DrawElement() {
DrawItemsInRows(mainWindowItems, 6); DrawItemsInRows(mainWindowItems, 6);
if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) == if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) ==
SECTION_DISPLAY_MAIN_WINDOW && 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)) {
DrawNotes(); DrawNotes();
} }
EndFloatingWindows(); EndFloatingWindows();
@@ -2104,10 +2101,9 @@ void RegisterItemTrackerWidgets() {
.Color(THEME_COLOR) .Color(THEME_COLOR)
.ComboMap(displayTypes)) .ComboMap(displayTypes))
.PreFunc([&](WidgetInfo& info) { .PreFunc([&](WidgetInfo& info) {
if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW || if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING &&
(CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING && CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) ==
CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) != TRACKER_DISPLAY_COMBO_BUTTON) {
TRACKER_DISPLAY_COMBO_BUTTON)) {
info.options.get()->disabled = true; info.options.get()->disabled = true;
info.options.get()->disabledTooltip = notesDisabledTooltip; info.options.get()->disabledTooltip = notesDisabledTooltip;
} }