From 0f362ab975990ab470fa37b003cb93ec6f0e4f37 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 17 Apr 2021 16:12:18 -0700 Subject: [PATCH] AGS: Apply upstream rename of vis constants This applies commit b31631d749e8a8ce7dd06d47e87e0193d8fb8871 --- engines/ags/shared/gui/guimain.cpp | 4 ++-- engines/ags/shared/gui/guimain.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engines/ags/shared/gui/guimain.cpp b/engines/ags/shared/gui/guimain.cpp index 59b3344d24d..472cf0b3b38 100644 --- a/engines/ags/shared/gui/guimain.cpp +++ b/engines/ags/shared/gui/guimain.cpp @@ -806,8 +806,8 @@ void WriteGUI(const std::vector &theGuis, Stream *out) { void ApplyLegacyVisibility(GUIMain &gui, LegacyGUIVisState vis) { // kGUIPopupMouseY had its own rules, which we practically reverted now if (gui.PopupStyle == kGUIPopupMouseY) { - // it was only !Visible if the legacy Visibility was Concealed - gui.SetVisible(vis != kGUIVisibility_Concealed); + // it was only !Visible if the legacy Visibility was LockedOff + gui.SetVisible(vis != kGUIVisibility_LockedOff); // and you could tell it's overridden by behavior when legacy Visibility is Off gui.SetConceal(vis == kGUIVisibility_Off); } diff --git a/engines/ags/shared/gui/guimain.h b/engines/ags/shared/gui/guimain.h index e6936a8129a..3a3039ea497 100644 --- a/engines/ags/shared/gui/guimain.h +++ b/engines/ags/shared/gui/guimain.h @@ -58,9 +58,9 @@ namespace Shared { // Legacy GUIMain visibility state, which combined Visible property and override factor enum LegacyGUIVisState { - kGUIVisibility_Concealed = -1, // gui is hidden by command - kGUIVisibility_Off = 0, // gui is disabled (won't show up by command) - kGUIVisibility_On = 1 // gui is shown by command + kGUIVisibility_LockedOff = -1, // locked hidden (used by PopupMouseY guis) + kGUIVisibility_Off = 0, // hidden + kGUIVisibility_On = 1 // shown }; class Bitmap;