From aa90ea3c33c125e7706a291d2a7a755b3ba89036 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Tue, 3 Nov 2026 21:15:45 +0000 Subject: [PATCH] Maintenance: Fold two alias globals into their evidenced owner members. 0x14576A4 (gl_24635 g_inputSuggestionsEnabled) and 0x14576A6 Batch #10367 by ragnarok-clanker: no function's compiled code changes; checked with 507 compiled unit(s), including every includer of Source/UI/Edit/UIEditCtrl.h, Source/UI/Window/UIWindowMgr.h. --- Source/Client/Input/Language.cpp | 10 ++++----- Source/Client/Mode/GameMode.cpp | 6 +++--- Source/Contents/CashEmotionMgr.cpp | 2 +- .../Contents/Configuration/ServiceOptions.cpp | 4 ++-- Source/Script/LuaScript.cpp | 2 +- Source/UI/Chat/ChatSuggestions.cpp | 10 ++++----- Source/UI/Edit/ItemTagRetirement.cpp | 4 ++-- Source/UI/Edit/UIEditCtrl.cpp | 7 ++----- Source/UI/Edit/UIEditCtrl.h | 1 - Source/UI/Edit/UIEditVariants.cpp | 2 +- Source/UI/Shortcuts/UIShortCutWnd.cpp | 14 ++++++------- Source/UI/Window/UIHotKeyWnd.cpp | 4 ++-- Source/UI/Window/UIWindow.cpp | 4 ++-- Source/UI/Window/UIWindowMgr.cpp | 21 ++++++++----------- Source/UI/Window/UIWindowMgr.h | 5 ++--- 15 files changed, 44 insertions(+), 52 deletions(-) diff --git a/Source/Client/Input/Language.cpp b/Source/Client/Input/Language.cpp index 1f65a145..162ea148 100644 --- a/Source/Client/Input/Language.cpp +++ b/Source/Client/Input/Language.cpp @@ -53,7 +53,7 @@ void CLanguageBase::DeleteSelection() { this->cursor = begin; this->anchor = begin; - if (g_windowMgr.unknown_0024 && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { + if (g_windowMgr.inputSuggestionsEnabled && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { g_cashEmotionMgr->ProcessChatCommand(this->text.c_str()); } } @@ -66,7 +66,7 @@ void CLanguageBase::Insert(const char* value) { this->anchor = this->cursor + static_cast(std::strlen(value)); this->cursor = this->anchor; - if (g_windowMgr.unknown_0024 && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { + if (g_windowMgr.inputSuggestionsEnabled && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { g_cashEmotionMgr->ProcessChatCommand(this->text.c_str()); } } @@ -283,7 +283,7 @@ void CLanguageBase::Character(unsigned value, LPARAM) { this->anchor = this->cursor + static_cast(std::strlen(bytes)); this->cursor = this->anchor; - if (this->text.c_str() && g_windowMgr.unknown_0024 && ChatWindow() && ChatWindow()->m_suggestions && + if (this->text.c_str() && g_windowMgr.inputSuggestionsEnabled && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { g_cashEmotionMgr->ProcessChatCommand(this->text.c_str()); } @@ -382,7 +382,7 @@ void CLanguageBase::KeyDown(unsigned key, LPARAM) { // OFFSET: 0x00ACEEB0 // FUNCTION: fn_45450 void SuggestChatCommand(const char* text) { - if (text && g_windowMgr.unknown_0024 && ChatWindow() && ChatWindow()->m_suggestions && + if (text && g_windowMgr.inputSuggestionsEnabled && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { g_cashEmotionMgr->ProcessChatCommand(text); } @@ -528,7 +528,7 @@ void CLanguageBase::RefreshComposition() { std::memcpy(combined + committed, this->candidate.data(), pending); combined[committed + pending] = 0; - if (g_windowMgr.unknown_0024 && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { + if (g_windowMgr.inputSuggestionsEnabled && ChatWindow() && ChatWindow()->m_suggestions && g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions) { g_cashEmotionMgr->ProcessChatCommand(combined); } } diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index 49ca2a10..6bf95b7e 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -5027,12 +5027,12 @@ void CGameMode::ExecuteTalkType(int talkType, std::string* arguments) { g_windowMgr.sub_AAB090(); break; case 135: - g_windowCloseByte = g_windowCloseByte == 0; + g_windowMgr.chatModeChanged = g_windowMgr.chatModeChanged == 0; g_windowMgr.SendNotice(3, 0, 0, 0, 0, 0); - if (g_windowCloseByte) { + if (g_windowMgr.chatModeChanged) { g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(0x311)), 0x64FFFF, 0, 0, 0); } else { - if (!g_inputSuggestionsEnabled) { + if (!g_windowMgr.inputSuggestionsEnabled) { ChatWindow()->ToggleInput(); } g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(0x312)), 0x64FFFF, 0, 0, 0); diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index 219ed33e..547ec41b 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -413,7 +413,7 @@ bool CCashEmotionAction_Register::Execute(int packId, int emotionId) { // OFFSET: 0x00591FB0 // FUNCTION: fn_02847 bool CCashEmotionAction_SelectedUnPurchasedPack::Execute(int packId, int) { - if (g_windowMgr.unknown_0024 == 1 && ChatWindow()) { + if (g_windowMgr.inputSuggestionsEnabled == 1 && ChatWindow()) { UINewChatWnd* suggestions = ChatWindow(); suggestions->ShowSuggestions(0); if (suggestions->m_chatEdit) { diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp index bc56c81f..8dc13e05 100644 --- a/Source/Contents/Configuration/ServiceOptions.cpp +++ b/Source/Contents/Configuration/ServiceOptions.cpp @@ -1509,7 +1509,7 @@ void CSession::LoadOptionInfo() { this->m_whisperOpenSound = this->GetOptionInteger("PlaySound_Open1to1Window", 1); this->m_simplifiedSkillList = this->GetOptionInteger("Simplicity_SkillList", 0); this->m_showSkillDescription = this->GetOptionInteger("Show_SkillDescript", 0); - g_windowCloseByte = this->GetOptionInteger("ChangeChatMode", 1) != 0; + g_windowMgr.chatModeChanged = this->GetOptionInteger("ChangeChatMode", 1) != 0; this->m_lockMouse = this->GetOptionInteger("LockMouse", 0) != 0; this->m_channelCopId = this->GetOptionInteger("ChannelCopID", 0); @@ -1689,7 +1689,7 @@ void CSession::SaveOptionInfo() { this->WriteOptionInteger(output, "Window_YPos", rect.top); this->WriteOptionInteger(output, "Simplicity_SkillList", this->m_simplifiedSkillList); this->WriteOptionInteger(output, "Show_SkillDescript", this->m_showSkillDescription); - this->WriteOptionInteger(output, "ChangeChatMode", g_windowCloseByte); + this->WriteOptionInteger(output, "ChangeChatMode", g_windowMgr.chatModeChanged); this->WriteOptionInteger(output, "LockMouse", this->m_lockMouse); this->WriteOptionInteger(output, "ShowBattleFieldIcon", g_showBattleFieldIcon); this->WriteOptionInteger(output, "MouseExclusive", g_serviceOptions.Get(ConfineCursor)); diff --git a/Source/Script/LuaScript.cpp b/Source/Script/LuaScript.cpp index 6dd0ae48..0e69c553 100644 --- a/Source/Script/LuaScript.cpp +++ b/Source/Script/LuaScript.cpp @@ -1261,7 +1261,7 @@ int UIWindowMgr::GetHotkeyBehavior() { return behavior; } - if (this->modifierKey == VK_SHIFT && !g_inputSuggestionsEnabled) { + if (this->modifierKey == VK_SHIFT && !g_windowMgr.inputSuggestionsEnabled) { UIWindow* parent = this->hoverWindow ? this->hoverWindow->parent : nullptr; if (!parent || parent == this->window_01C8 || parent->geometry.visible == 0) { const int count = HotkeyCount(*g_session.m_hotkeyScript, 0); diff --git a/Source/UI/Chat/ChatSuggestions.cpp b/Source/UI/Chat/ChatSuggestions.cpp index 752deb6c..50696316 100644 --- a/Source/UI/Chat/ChatSuggestions.cpp +++ b/Source/UI/Chat/ChatSuggestions.cpp @@ -34,7 +34,7 @@ void UINewChatWnd::ShowSuggestions(std::uint8_t visible) { // OFFSET: 0x00933980 // FUNCTION: fn_12732 void UINewChatWnd::ApplyInputLayout() { - if (g_windowMgr.unknown_0024) { + if (g_windowMgr.inputSuggestionsEnabled) { const int base = this->geometry.height - this->m_inputAreaHeight; this->unknown_00C0->Move(6, base + 4); this->m_chatEdit->Move(110, base + 4); @@ -187,19 +187,19 @@ void UINewChatWnd::ResizeRows(int count) { // OFFSET: 0x00916170 // FUNCTION: fn_12582 void UINewChatWnd::ToggleInput() { - if (g_inputSuggestionsEnabled && g_windowCloseByte) { + if (g_windowMgr.inputSuggestionsEnabled && g_windowMgr.chatModeChanged) { if (*this->m_chatEdit->Text() == '\0') { - g_inputSuggestionsEnabled = false; + g_windowMgr.inputSuggestionsEnabled = false; this->ApplyInputLayout(); SetPressedWindowRoot(g_windowMgr.window_4F1D4, nullptr); } } else { - g_inputSuggestionsEnabled = true; + g_windowMgr.inputSuggestionsEnabled = true; this->ApplyInputLayout(); g_windowMgr.SetFocus(this->m_inputEdit); this->m_inputEdit->SetText(""); - if (!g_windowCloseByte) { + if (!g_windowMgr.chatModeChanged) { this->ResizeRows(static_cast(this->geometry.unknown_0030)); } diff --git a/Source/UI/Edit/ItemTagRetirement.cpp b/Source/UI/Edit/ItemTagRetirement.cpp index a2eaecbe..a1b8ff7b 100644 --- a/Source/UI/Edit/ItemTagRetirement.cpp +++ b/Source/UI/Edit/ItemTagRetirement.cpp @@ -40,7 +40,7 @@ void UIItemTagCtrl::RemoveTagChild(UIWindow* child) { // OFFSET: 0x00896EE0 // FUNCTION: fn_11520 void UIItemTagOnChat::RemoveTagChild(UIWindow* child) { - if (g_inputSuggestionsEnabled == 1 && ChatWindow()->m_chatEdit != nullptr && ChatWindow()->m_chatEdit->Contains(child)) { + if (g_windowMgr.inputSuggestionsEnabled == 1 && ChatWindow()->m_chatEdit != nullptr && ChatWindow()->m_chatEdit->Contains(child)) { ChatWindow()->m_chatEdit->RemoveChild(child, 1); return; } @@ -83,7 +83,7 @@ UIItemTagCtrl::~UIItemTagCtrl() { // FUNCTION: fn_11218 bool UIItemTagOnChat::CanInsertTag(const std::string& name, int width) { if (g_windowMgr.GetHoverWindow()->geometry.id != 490 && g_windowMgr.GetHoverWindow()->geometry.id != 494 && - !g_windowMgr.unknown_0024) { + !g_windowMgr.inputSuggestionsEnabled) { this->ClearTags(); return false; } diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 61e3603f..3760f5eb 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -112,9 +112,6 @@ // GLOBAL: gl_24862 bool g_vendingSaleAlarm; -// GLOBAL: gl_24635 -bool g_inputSuggestionsEnabled; - // GLOBAL: gl_24653 int g_skillTooltipActive; @@ -460,7 +457,7 @@ void UIEditCtrl3::DrawBlinkingCaret(const std::uint32_t& color) { return; } - if (g_windowMgr.IsHoverOnWindow01C8Button() && !g_inputSuggestionsEnabled) { + if (g_windowMgr.IsHoverOnWindow01C8Button() && !g_windowMgr.inputSuggestionsEnabled) { return; } @@ -7589,7 +7586,7 @@ void UIMerchantMirrorItemWnd::Slot28(int x, int y) { // OFFSET: 0x00859200 // FUNCTION: fn_10774 bool IsInputSuggestionAllowed() { - if (g_windowMgr.IsHoverOnWindow01C8Button() && !g_inputSuggestionsEnabled) { + if (g_windowMgr.IsHoverOnWindow01C8Button() && !g_windowMgr.inputSuggestionsEnabled) { return false; } diff --git a/Source/UI/Edit/UIEditCtrl.h b/Source/UI/Edit/UIEditCtrl.h index 963cadf6..616d9296 100644 --- a/Source/UI/Edit/UIEditCtrl.h +++ b/Source/UI/Edit/UIEditCtrl.h @@ -273,7 +273,6 @@ static_assert(sizeof(UIEditCtrl4) == 0x13C); static_assert(sizeof(UIEditCtrl5) == 0x13C); #endif -extern bool g_inputSuggestionsEnabled; bool IsInputSuggestionAllowed(); diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index 0a260a5e..b7df8cef 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -658,7 +658,7 @@ void UIEditCtrl3::PaintText() { this->unknown_014C = caretX; } - if ((timeGetTime() / 500 & 1) == 0 && (!g_windowMgr.IsHoverOnWindow01C8Button() || g_inputSuggestionsEnabled)) { + if ((timeGetTime() / 500 & 1) == 0 && (!g_windowMgr.IsHoverOnWindow01C8Button() || g_windowMgr.inputSuggestionsEnabled)) { this->DrawTextAt(x - 2 + caretX, (wrapped + this->textY - first) * this->unknown_0138, "|", 0, 0, 12, color, 0, 0); const unsigned char* scroll = reinterpret_cast(&this->unknown_015C); diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index ae2f0f6c..ac1f08a9 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -577,8 +577,8 @@ void UINewChatWnd::Slot25(int x, int y) { this->Invalidate(); } - if (g_windowMgr.unknown_0026 && y < 14 && x > this->m_chatModeX && x < this->m_chatModeX + 14) { - g_windowMgr.unknown_0024 = g_windowMgr.unknown_0024 == 0; + if (g_windowMgr.chatModeChanged && y < 14 && x > this->m_chatModeX && x < this->m_chatModeX + 14) { + g_windowMgr.inputSuggestionsEnabled = g_windowMgr.inputSuggestionsEnabled == 0; if (ChatWindow()) { ChatWindow()->ApplyInputLayout(); } @@ -601,15 +601,15 @@ void UINewChatWnd::Paint() { this->FillRegion(this->geometry.width - 4, this->m_inputOffsetY + 2, 1, this->geometry.height - this->m_inputOffsetY - 2, 0x8E8E8E); } - if (g_windowMgr.unknown_0024) { + if (g_windowMgr.inputSuggestionsEnabled) { auto* background = static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\basic_interface\\dialog_bg.bmp"))); this->DrawBitmap(0, this->geometry.height - background->image.height, &background->image, false); } if (static_cast(this->geometry.unknown_0030) > 0) { - if (g_windowMgr.unknown_0026) { + if (g_windowMgr.chatModeChanged) { auto* chatMode = static_cast(ResourceMgr::Instance().Load( - Resolve(g_windowMgr.unknown_0024 ? "유저인터페이스\\basic_interface\\chatmode_on.bmp" : "유저인터페이스\\basic_interface\\chatmode_off.bmp") + Resolve(g_windowMgr.inputSuggestionsEnabled ? "유저인터페이스\\basic_interface\\chatmode_on.bmp" : "유저인터페이스\\basic_interface\\chatmode_off.bmp") )); if (chatMode) { this->m_chatModeX = this->m_chatModeButton->geometry.x - chatMode->image.width - 2; @@ -1543,8 +1543,8 @@ void UINewChatWnd::Slot15(int width, int height) { std::memset(this->unknown_00D4, 0, sizeof(this->unknown_00D4)); this->m_listHeight = this->geometry.height - this->m_inputOffsetY - this->m_inputAreaHeight; - if (!g_windowMgr.unknown_0026) { - g_windowMgr.unknown_0024 = 1; + if (!g_windowMgr.chatModeChanged) { + g_windowMgr.inputSuggestionsEnabled = 1; this->ApplyInputLayout(); g_windowMgr.SetFocus(this->m_inputEdit); } diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index a91c0226..711ecb86 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -141,7 +141,7 @@ void UIHotKeyWnd::Slot15(int, int) { checkBox->SetSize(150, 12); checkBox->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(1775)); checkBox->Move(80, this->geometry.height - 22); - checkBox->SetChecked(g_windowCloseByte); + checkBox->SetChecked(g_windowMgr.chatModeChanged); this->AddChild(this->unknown_0108); this->m_prevButton = new UIBitmapButton(); @@ -776,7 +776,7 @@ int UIHotKeyWnd::SendMsg( return 0; } - g_windowCloseByte = argument2 != 0; + g_windowMgr.chatModeChanged = argument2 != 0; if (ChatWindow()) { if (argument2 != 0) { ChatWindow()->Invalidate(); diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 5361d93f..e69edf58 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -3454,10 +3454,10 @@ void UINavigationV4Wnd::InsertNavigationLink(std::string name, int x, int y) { link += g_windowNaviLinkCloseTag; if (g_windowMgr.GetHoverWindow() && g_windowMgr.GetHoverWindow()->geometry.id != 516) { - if (g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions && !g_windowMgr.unknown_0024) { + if (g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions && !g_windowMgr.inputSuggestionsEnabled) { ChatWindow()->ToggleInput(); } - } else if (!g_windowMgr.unknown_0024) { + } else if (!g_windowMgr.inputSuggestionsEnabled) { ChatWindow()->ToggleInput(); } else { g_windowMgr.SetFocus(ChatWindow()->m_suggestions); diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index c3907aa2..8c27462d 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -92,9 +92,6 @@ CMiniPartyWndAreaMgr* g_miniPartyWndAreaMgr = nullptr; // GLOBAL: gl_24366 UIWindowMgr g_windowMgr; -// GLOBAL: gl_25090 -unsigned char g_windowCloseByte; - // GLOBAL: gl_25159 bool g_windowToggleFlag; @@ -709,8 +706,8 @@ UIWindowMgr::UIWindowMgr() this->unknown_04C0 = 0; this->windowHistory.clear(); this->lastWindowId = -1; - this->unknown_0024 = 0; - this->unknown_0026 = 1; + this->inputSuggestionsEnabled = 0; + this->chatModeChanged = 1; this->unknown_0508 = 0; this->window_4F168 = nullptr; this->window_4F164 = nullptr; @@ -1361,7 +1358,7 @@ bool UIWindowMgr::ProcessKeyDown(int key, int keyData, int pressed) { if (this->LookupWindow(0x9C) != nullptr) { this->unknown_0025 = 0; - } else if (!this->unknown_0024) { + } else if (!this->inputSuggestionsEnabled) { UIWindow* hover = this->hoverWindow; UIWindow* parent = hover ? hover->parent : nullptr; if (!hover || !parent || parent == this->window_01C8 || !parent->geometry.visible) { @@ -1376,7 +1373,7 @@ bool UIWindowMgr::ProcessKeyDown(int key, int keyData, int pressed) { } bool hoverOnButton = false; - if (this->unknown_0024) { + if (this->inputSuggestionsEnabled) { const UIWindow* window = this->window_01C8; if (window) { UIWindow* const* buttons = reinterpret_cast(reinterpret_cast(window) + 0xBC); @@ -2024,7 +2021,7 @@ bool UIWindowMgr::sub_A8CA20() { if (Replay::Instance().state == 2 && handled) { this->hoverWindow->Root()->RecordEditTexts(); } - if (g_windowCloseByte == 0) { + if (g_windowMgr.chatModeChanged == 0) { handled = true; } else if (!handled) { return false; @@ -2034,7 +2031,7 @@ bool UIWindowMgr::sub_A8CA20() { } window = this->window_03D4; if (window == nullptr) { - if (this->window_01C8 != nullptr && g_inputSuggestionsEnabled == 1) { + if (this->window_01C8 != nullptr && g_windowMgr.inputSuggestionsEnabled == 1) { handled = false; this->window_01C8->RecordEditTexts(); window = this->window_01C8; @@ -2298,15 +2295,15 @@ bool UIWindowMgr::ProcessHotkeyAction(int action, int pressed) { g_windowToggleFlag = false; } - if ((this->IsHoverOnWindow01C8Button() || (!this->windowHistory.empty() && this->windowHistory.front() == 1)) && this->unknown_0024 != 0 && - this->unknown_0026 != 0) { + if ((this->IsHoverOnWindow01C8Button() || (!this->windowHistory.empty() && this->windowHistory.front() == 1)) && this->inputSuggestionsEnabled != 0 && + this->chatModeChanged != 0) { UINewChatWnd* suggestions = static_cast(this->window_01C8); if (suggestions && suggestions->SuggestionsVisible()) { suggestions->ShowSuggestions(0); return false; } - this->unknown_0024 = 0; + this->inputSuggestionsEnabled = 0; static_cast(this->window_01C8)->ApplyInputLayout(); return false; } diff --git a/Source/UI/Window/UIWindowMgr.h b/Source/UI/Window/UIWindowMgr.h index 64a13e5f..acb11542 100644 --- a/Source/UI/Window/UIWindowMgr.h +++ b/Source/UI/Window/UIWindowMgr.h @@ -55,9 +55,9 @@ public: /* 0014 */ int modifierKey; /* 0018 */ std::list windowHistory; /* 0020 */ int lastWindowId; - /* 0024 */ unsigned char unknown_0024; + /* 0024 */ unsigned char inputSuggestionsEnabled; /* 0025 */ unsigned char unknown_0025; - /* 0026 */ unsigned char unknown_0026; + /* 0026 */ unsigned char chatModeChanged; /* 0028 */ std::map retainedWindows; /* 0030 */ int unknown_0030; /* 0034 */ int unknown_0034; @@ -609,7 +609,6 @@ extern const char* g_renderDiagnosticFile; extern int g_dragWindowId; extern bool g_windowToggleFlag; extern bool g_randomLoadingScreen; -extern unsigned char g_windowCloseByte; extern int g_windowCloseValue; extern int g_savedWindowCloseValue; extern int g_closeWindow137State;