diff --git a/Source/Client/Input/ImeHelper.cpp b/Source/Client/Input/ImeHelper.cpp index 095e8686..590fad65 100644 --- a/Source/Client/Input/ImeHelper.cpp +++ b/Source/Client/Input/ImeHelper.cpp @@ -4,7 +4,6 @@ #include "Contents/MessageTable.h" #include "Network/Connection/Connection.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index 80ded2f3..9197b42e 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -32,7 +32,6 @@ #include "UI/Chat/UINewChatWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Contents/Actors/GrannyGameActor.h" #include "Utility/Text/FormatString.h" #include "Client/Application/Launcher.h" diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index ed3d2c0e..91245a7b 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -45,7 +45,6 @@ #include "UI/Window/UISeekPartyWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Math/Vector3d.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index 1ea33283..e56495e7 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -68,7 +68,6 @@ #include "UI/Window/UIRodexContentsWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include "Utility/Math/AffineMatrix.h" #include "UI/UIBroadcastBalloon.h" diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index f9aae184..4ba1b904 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -65,7 +65,6 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/UIRefiningWnd.h" #include "UI/Dialogs/UIWaitWnd.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Math/Vector3d.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/StringUtil.h" diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp index f218640e..5416b9bc 100644 --- a/Source/Client/Mode/LoginMode.cpp +++ b/Source/Client/Mode/LoginMode.cpp @@ -46,7 +46,6 @@ #include "UI/Dialogs/UIWaitWnd.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UISelCharForUServerWnd.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Async/NAsyncWorkMgr.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/GGHashMgr.h" diff --git a/Source/Client/Mode/LoginModeNotices.cpp b/Source/Client/Mode/LoginModeNotices.cpp index 1fa9cb92..ff4fcc21 100644 --- a/Source/Client/Mode/LoginModeNotices.cpp +++ b/Source/Client/Mode/LoginModeNotices.cpp @@ -4,7 +4,6 @@ #include "Contents/MessageTable.h" #include "Network/Connection/Connection.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Cipher/XorBytes.h" #include diff --git a/Source/Client/Mode/ModeCursor.h b/Source/Client/Mode/ModeCursor.h deleted file mode 100644 index 10ba2b5c..00000000 --- a/Source/Client/Mode/ModeCursor.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_MODE_MODECURSOR_H -#define RAGNAROK_SOURCE_CLIENT_MODE_MODECURSOR_H - -#include -#include - -struct ModeCursor { - /* 0050 */ std::int32_t type; - /* 0054 */ std::uint32_t frame; - - void Set(std::int32_t value, std::uint32_t& changeTick); -}; - -#if defined(_WIN32) && !defined(_WIN64) -static_assert(sizeof(ModeCursor) == 8); -static_assert(offsetof(ModeCursor, type) + 0x50 == 0x50); -static_assert(offsetof(ModeCursor, frame) + 0x50 == 0x54); -#endif - -#endif diff --git a/Source/Client/Mode/ModeTooltip.h b/Source/Client/Mode/ModeTooltip.h deleted file mode 100644 index 4a428145..00000000 --- a/Source/Client/Mode/ModeTooltip.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_MODE_MODETOOLTIP_H -#define RAGNAROK_SOURCE_CLIENT_MODE_MODETOOLTIP_H - -#include -#include - -class UITransBalloonText; -class UIWindow; -class UIWindowMgr; -class UIWindowMgr; - -struct ModeTooltip { - UITransBalloonText*& window; - std::uint32_t& tick; - std::list& rendered; - UIWindowMgr& ordering; - const int& screenWidth; - const int& screenHeight; - - void Show(const char* value, int x, int y, std::uint32_t color, unsigned char option, unsigned char convert); -}; - -#endif diff --git a/Source/Client/Stove/StoveMgr.cpp b/Source/Client/Stove/StoveMgr.cpp index a5580574..af6dad16 100644 --- a/Source/Client/Stove/StoveMgr.cpp +++ b/Source/Client/Stove/StoveMgr.cpp @@ -10,7 +10,6 @@ #include "UI/UIBroadcastBalloon.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowMouseHit.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index 88f7c2f0..0e763369 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -38,7 +38,6 @@ #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UINormalMB.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowBorder.h" #include "Utility/Text/FormatString.h" #include "Contents/Schedule/CheckGDISchedule.h" diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp index 5aa45f3a..711b7ad8 100644 --- a/Source/Contents/Configuration/ServiceOptions.cpp +++ b/Source/Contents/Configuration/ServiceOptions.cpp @@ -27,7 +27,6 @@ #include "Network/Packets/PacketLengths.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Script/LuaInstance.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Emblems/EmblemUpload.cpp b/Source/Contents/Emblems/EmblemUpload.cpp index 9352684e..017e9579 100644 --- a/Source/Contents/Emblems/EmblemUpload.cpp +++ b/Source/Contents/Emblems/EmblemUpload.cpp @@ -2,7 +2,6 @@ #include "Contents/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Async/AsyncDiagnostic.h" diff --git a/Source/Contents/EntryQueueMgr.cpp b/Source/Contents/EntryQueueMgr.cpp index 773490d3..4da98f47 100644 --- a/Source/Contents/EntryQueueMgr.cpp +++ b/Source/Contents/EntryQueueMgr.cpp @@ -6,7 +6,6 @@ #include "Network/Packets/PacketLengths.h" #include "UI/EntryQueue/UIEntryQueueWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Script/LuaScript.h" #include #include diff --git a/Source/Contents/Messenger/MessengerMember.cpp b/Source/Contents/Messenger/MessengerMember.cpp index c35a4d62..d675e98e 100644 --- a/Source/Contents/Messenger/MessengerMember.cpp +++ b/Source/Contents/Messenger/MessengerMember.cpp @@ -25,7 +25,6 @@ #include "Contents/PlayerNameDictionary.h" #include "Utility/Text/FormatString.h" #include "Resource/SkinPalette.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Text/UIStaticText.h" #include "File/ShortcutFilename.h" #include "UI/Buttons/UITextButton.h" diff --git a/Source/Contents/MonsterXmlActions.cpp b/Source/Contents/MonsterXmlActions.cpp index a5247978..56c3d17e 100644 --- a/Source/Contents/MonsterXmlActions.cpp +++ b/Source/Contents/MonsterXmlActions.cpp @@ -1,6 +1,5 @@ #include "Client/Session.h" #include "Contents/MessageTable.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/Contents/NavigationCandidates.cpp b/Source/Contents/NavigationCandidates.cpp index 106582a8..9d76f5a0 100644 --- a/Source/Contents/NavigationCandidates.cpp +++ b/Source/Contents/NavigationCandidates.cpp @@ -5,7 +5,6 @@ #include "Contents/MessageTable.h" #include "Resource/ResourceMgr.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/Contents/NavigationRoute.cpp b/Source/Contents/NavigationRoute.cpp index 97fc132e..99694e47 100644 --- a/Source/Contents/NavigationRoute.cpp +++ b/Source/Contents/NavigationRoute.cpp @@ -18,7 +18,6 @@ #include "UI/Window/UINavigationWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIPayConfirmWnd.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/RegistryKey.h" #include diff --git a/Source/Contents/Schedule/CheckGDISchedule.cpp b/Source/Contents/Schedule/CheckGDISchedule.cpp index 1099c976..5c6a0a1c 100644 --- a/Source/Contents/Schedule/CheckGDISchedule.cpp +++ b/Source/Contents/Schedule/CheckGDISchedule.cpp @@ -7,7 +7,6 @@ #include "Network/Connection/Connection.h" #include "Network/Connection/ConnectionRuntime.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/Contents/Skills/ClientSkills.cpp b/Source/Contents/Skills/ClientSkills.cpp index 83f293f2..50f28777 100644 --- a/Source/Contents/Skills/ClientSkills.cpp +++ b/Source/Contents/Skills/ClientSkills.cpp @@ -17,7 +17,6 @@ #include "Script/LuaScript.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Tokenizer.h" #include "Contents/Messenger/ClientMessenger.h" diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 20bfa6e1..1709417b 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -117,7 +117,6 @@ #include "UI/Window/InputFocus.h" #include "UI/Window/UIMonsterDisplayWnd.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "UI/Layout/SnapMgr.h" diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index 8e01972f..25ff430e 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -1,6 +1,5 @@ #include "Client/Replay.h" #include "UI/Window/WindowPolicy.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UINewSelectCharWnd.h" #include "Contents/MessageTable.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/Buttons/UITextureButton.cpp b/Source/UI/Buttons/UITextureButton.cpp index 549a5be4..9cdc196a 100644 --- a/Source/UI/Buttons/UITextureButton.cpp +++ b/Source/UI/Buttons/UITextureButton.cpp @@ -1,6 +1,5 @@ #include "Client/Replay.h" #include "UI/Window/WindowPolicy.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UINewSelectCharWnd.h" #include "Contents/MessageTable.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp index 364053c2..c2c4a816 100644 --- a/Source/UI/CashShop/UICashShopWnd.cpp +++ b/Source/UI/CashShop/UICashShopWnd.cpp @@ -25,7 +25,6 @@ #include "UI/UIStaticBitmap.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp index 3119b580..2a49f06c 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.cpp +++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp @@ -24,7 +24,6 @@ #include "UI/Window/InputFocus.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 85d80718..53a7d434 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -81,7 +81,6 @@ #include "UI/Lists/UIScrollBar.h" #include "UI/PriceCommission.h" #include "UI/Shop/PriceColor.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/GroupedInteger.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index 9ce8b2ed..d12e9601 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -20,7 +20,6 @@ #include "UI/Text/UITextViewer.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" -#include "UI/Window/WindowDialogs.h" #include #include #include diff --git a/Source/UI/Exchange/UIExchangeUI.cpp b/Source/UI/Exchange/UIExchangeUI.cpp index c5a21321..de4a9d39 100644 --- a/Source/UI/Exchange/UIExchangeUI.cpp +++ b/Source/UI/Exchange/UIExchangeUI.cpp @@ -16,7 +16,6 @@ #include "UI/Shop/PriceColor.h" #include "UI/Text/UIStaticTextControl.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/GroupedInteger.h" diff --git a/Source/UI/GameSettings/GameSettingsUI.h b/Source/UI/GameSettings/GameSettingsUI.h index a6e3e092..f437780a 100644 --- a/Source/UI/GameSettings/GameSettingsUI.h +++ b/Source/UI/GameSettings/GameSettingsUI.h @@ -7,7 +7,6 @@ #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Window/UIControl.h" #include "UI/Window/UIFrameWnd.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index bed5d9d8..f0ef529d 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -26,7 +26,6 @@ #include "UI/Text/UIStaticText.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index 04f5daaa..127ad9d8 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -29,7 +29,6 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/TipOfTheDay.h" #include "Contents/MessageTable.h" -#include "UI/Window/WindowDialogs.h" #include #include #include diff --git a/Source/UI/Menu/UIMenuIconWnd.cpp b/Source/UI/Menu/UIMenuIconWnd.cpp index 603f9329..a99cb901 100644 --- a/Source/UI/Menu/UIMenuIconWnd.cpp +++ b/Source/UI/Menu/UIMenuIconWnd.cpp @@ -15,7 +15,6 @@ #include "Script/LuaScript.h" #include "UI/Window/UINavigationWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/MiniPartyManager.cpp b/Source/UI/MiniPartyManager.cpp index 09c17f4b..a42f8eac 100644 --- a/Source/UI/MiniPartyManager.cpp +++ b/Source/UI/MiniPartyManager.cpp @@ -8,7 +8,6 @@ #include "UI/Window/MiniPartyWndAreaMgr.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIWindow.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include diff --git a/Source/UI/Party/UIMiniPartyWnd.cpp b/Source/UI/Party/UIMiniPartyWnd.cpp index 3514fd19..0f47724c 100644 --- a/Source/UI/Party/UIMiniPartyWnd.cpp +++ b/Source/UI/Party/UIMiniPartyWnd.cpp @@ -17,7 +17,6 @@ #include "UI/Layout/SnapMgr.h" #include "UI/Window/MiniPartyWndAreaMgr.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Client/Mode/CMode.h" #include diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp index 72258681..8b19b653 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp @@ -9,7 +9,6 @@ #include "UI/Text/UIStaticTextControl.h" #include "Contents/MessageTable.h" #include "Render/Renderer.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/StringUtil.h" diff --git a/Source/UI/Quest/UIOngoingQuestInfo.cpp b/Source/UI/Quest/UIOngoingQuestInfo.cpp index baa8778d..a0effc26 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.cpp +++ b/Source/UI/Quest/UIOngoingQuestInfo.cpp @@ -15,7 +15,6 @@ #include "UI/Text/UIStaticTextControl.h" #include "UI/Text/UITextViewerControl.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.cpp b/Source/UI/Quest/UIRecommendedQuestInfo.cpp index 3272aa7b..d894d6b3 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.cpp +++ b/Source/UI/Quest/UIRecommendedQuestInfo.cpp @@ -6,7 +6,6 @@ #include "UI/Quest/UIRenewQuestWnd.h" #include "UI/Text/UIStaticTextControl.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index 93776f53..edd0d367 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -14,7 +14,6 @@ #include "UI/Quest/UIRecommendedQuestInfo.h" #include "UI/Text/UIStaticTextControl.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Cipher/XorBytes.h" #include diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index 3f4ec57c..009936a3 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -32,7 +32,6 @@ #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UITab.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Rodex/UIRodexInboxWnd.cpp b/Source/UI/Rodex/UIRodexInboxWnd.cpp index fff90489..0d373bde 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.cpp +++ b/Source/UI/Rodex/UIRodexInboxWnd.cpp @@ -6,7 +6,6 @@ #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp index 51d3233a..6225facf 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp @@ -1,4 +1,3 @@ -#include "UI/Window/WindowDialogs.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Items/RuneSystem.h" #include "Contents/MessageTable.h" diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.h b/Source/UI/RuneSystem/UIRuneSystemWnd.h index 0b099cab..2d46616f 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.h +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.h @@ -20,7 +20,6 @@ #include "UI/Text/UIStaticText.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIWindow.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index c1a0651c..ad5fa94e 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -12,7 +12,6 @@ #include "UI/Items/UIGameItem.h" #include "UI/Text/UIStaticTextControl.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp index 88b9ee18..ec0a0af1 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp @@ -23,7 +23,6 @@ #include "UI/UIBasicCtrl.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 352ac294..ca7be1e7 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -29,7 +29,6 @@ #include "UI/Window/UIWindow.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UIWindowCallBtnWnd.h" #include "UI/Window/UIRoMapWnd.h" @@ -1213,7 +1212,6 @@ void UISubChatHisWnd::Resize(int width, int height) { } #include "UI/Edit/UIEditCtrl.h" -#include "UI/Window/WindowDialogs.h" #include diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index 7a7d054f..2f550c2c 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -14,7 +14,6 @@ #include "Resource/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include #include diff --git a/Source/UI/UIGradeEnchantWnd.cpp b/Source/UI/UIGradeEnchantWnd.cpp index 041b60e6..773e379d 100644 --- a/Source/UI/UIGradeEnchantWnd.cpp +++ b/Source/UI/UIGradeEnchantWnd.cpp @@ -1,4 +1,3 @@ -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/UIGradeEnchantWnd.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/UIMacroUserInfoWnd.cpp b/Source/UI/UIMacroUserInfoWnd.cpp index dd05ee00..37401c21 100644 --- a/Source/UI/UIMacroUserInfoWnd.cpp +++ b/Source/UI/UIMacroUserInfoWnd.cpp @@ -29,7 +29,6 @@ #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Window/UIBasicInfoWnd.cpp b/Source/UI/Window/UIBasicInfoWnd.cpp index 826e5a86..df0e7489 100644 --- a/Source/UI/Window/UIBasicInfoWnd.cpp +++ b/Source/UI/Window/UIBasicInfoWnd.cpp @@ -19,7 +19,6 @@ #include "UI/Items/UIEquipWnd.h" #include "UI/Layout/SnapMgr.h" #include "UI/Lists/UITabControl.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/GroupedInteger.h" diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Window/UIChangeNameWnd.cpp index 5a13bde7..31c7056c 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Window/UIChangeNameWnd.cpp @@ -9,7 +9,6 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Text/NavigationLink.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" diff --git a/Source/UI/Window/UIEscOptionWnd.cpp b/Source/UI/Window/UIEscOptionWnd.cpp index a6053b29..b9215b9f 100644 --- a/Source/UI/Window/UIEscOptionWnd.cpp +++ b/Source/UI/Window/UIEscOptionWnd.cpp @@ -83,7 +83,6 @@ UIEscOptionWnd::UIEscOptionWnd() #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" // OFFSET: 0x00934FA0 // FUNCTION: fn_12744 diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 195a208e..b4e041e1 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -44,7 +44,6 @@ #include "UI/Lists/UIMemberListBox.h" #include "UI/Text/NavigationLink.h" #include "UI/Text/TextWrapping.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UIResizer.h" #include "UI/Window/UINewSelectCharWnd.h" diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index 12b1feee..04daa628 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -21,7 +21,6 @@ #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UISerachStoreInfoWnd.h" #include "UI/Window/WindowBorder.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UIJobListWnd.cpp b/Source/UI/Window/UIJobListWnd.cpp index 6435ffd1..c5a1c205 100644 --- a/Source/UI/Window/UIJobListWnd.cpp +++ b/Source/UI/Window/UIJobListWnd.cpp @@ -12,7 +12,6 @@ #include "UI/Buttons/UICheckBox.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 870791ba..d95e804e 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -27,7 +27,6 @@ #include "UI/Window/WindowBorder.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIMerInfoWnd.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UIMessageBoxAutoreturn.h" #include "UI/Window/UIMonsterInfoWnd.h" #include "UI/Window/UITalkboxTrapInputWnd.h" diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp index a8692985..0fcdc0e7 100644 --- a/Source/UI/Window/UINavigationWnd.cpp +++ b/Source/UI/Window/UINavigationWnd.cpp @@ -23,7 +23,6 @@ #include "UI/Window/UIResizer.h" #include "UI/Window/UIRoMapWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Window/UINewMakeCharWnd.cpp b/Source/UI/Window/UINewMakeCharWnd.cpp index f45626fe..3b131e52 100644 --- a/Source/UI/Window/UINewMakeCharWnd.cpp +++ b/Source/UI/Window/UINewMakeCharWnd.cpp @@ -1,5 +1,4 @@ #include "Render/DeviceContext/DCSurface.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UINewMakeCharWnd.h" diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h index 63ae0d75..b6995bb6 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Window/UINewMakeCharWnd.h @@ -10,7 +10,6 @@ #include "UI/Window/InputFocus.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Client/Mode/CLoginMode.h" #include "Contents/ForbiddenWords.h" #include "Contents/Jobs/JobInheritance.h" diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Window/UINewSelectCharWnd.cpp index a91cf195..1ddec508 100644 --- a/Source/UI/Window/UINewSelectCharWnd.cpp +++ b/Source/UI/Window/UINewSelectCharWnd.cpp @@ -19,7 +19,6 @@ #include "Contents/Actors/Pc.h" #include "Contents/SpriteRidingOffset.h" #include "UI/UIStaticBitmap.h" -#include "UI/Window/WindowDialogs.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Hotkeys/EmotionHotkeys.h" #include "Contents/Sound/SoundMgr.h" diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp index 7fec16bc..5430a78a 100644 --- a/Source/UI/Window/UINewSkillListWnd.cpp +++ b/Source/UI/Window/UINewSkillListWnd.cpp @@ -24,7 +24,6 @@ #include "UI/Window/WindowMouseHit.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Window/InputFocus.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Skill/UISkillDescribeWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp index 2eecabea..81eec16c 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Window/UIRodexContentsWnd.cpp @@ -27,7 +27,6 @@ #include "UI/Shop/ItemDrawing.h" #include "UI/Text/NavigationLink.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/GroupedInteger.h" diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp index 0d32412e..81b7ed0b 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Window/UISeekPartyListWnd.cpp @@ -17,7 +17,6 @@ #include "UI/Text/UIStaticText.h" #include "UI/Window/UISeekPartyWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Window/UISeekPartyMBWnd.cpp index d08f2c62..b28372d8 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.cpp +++ b/Source/UI/Window/UISeekPartyMBWnd.cpp @@ -12,7 +12,6 @@ #include "UI/Text/UIStaticText.h" #include "UI/Window/UISeekPartyWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UISelCharForUServerWnd.cpp b/Source/UI/Window/UISelCharForUServerWnd.cpp index 6f7bc6ba..a249849d 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.cpp +++ b/Source/UI/Window/UISelCharForUServerWnd.cpp @@ -10,7 +10,6 @@ #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Client/Mode/ModeMgr.h" #include "Render/Renderer.h" #include "UI/Text/UICharInfoBalloonText.h" diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Window/UISerachStoreInfoWnd.cpp index b083dadd..bfd3a1a3 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.cpp +++ b/Source/UI/Window/UISerachStoreInfoWnd.cpp @@ -13,7 +13,6 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/Window/UIVideoWnd.cpp b/Source/UI/Window/UIVideoWnd.cpp index fdf951b9..f0e2bb46 100644 --- a/Source/UI/Window/UIVideoWnd.cpp +++ b/Source/UI/Window/UIVideoWnd.cpp @@ -6,7 +6,6 @@ #include "Contents/Sound/SoundMgr.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowManagerWindows.h" #include diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 3b3fce4b..313f5101 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -4,7 +4,6 @@ #include "Client/Mode/CMode.h" #include "Render/DeviceContext/DCSurface.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/UIRoMapWnd.h" #include "File/FileEnumeration.h" #include "Contents/World/World.h" diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index c13b9d62..b6a1949b 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -21,7 +21,6 @@ #include "UI/Chat/UINewChatWnd.h" #include "UI/Lists/UITabControl.h" #include "UI/Window/MiniPartyWndAreaMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UINavigationWnd.h" #include "UI/Window/UIRoMapWnd.h" diff --git a/Source/UI/Window/UIWindowMgr.h b/Source/UI/Window/UIWindowMgr.h index a350b338..0294fb3c 100644 --- a/Source/UI/Window/UIWindowMgr.h +++ b/Source/UI/Window/UIWindowMgr.h @@ -614,6 +614,8 @@ extern int g_windowCloseValue; extern int g_savedWindowCloseValue; extern int g_closeWindow137State; extern int g_closeWindow164State; +extern int g_dialogKeyboardEnabled; +extern int g_dialogKeyboardBlocked; void __fastcall RefreshItemWindows(UIWindowMgr* mgr); diff --git a/Source/UI/Window/WindowDialogs.cpp b/Source/UI/Window/WindowDialogs.cpp index 8aebf2a6..3f68b14e 100644 --- a/Source/UI/Window/WindowDialogs.cpp +++ b/Source/UI/Window/WindowDialogs.cpp @@ -6,7 +6,6 @@ #include "UI/Window/UIMessageBox.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" // GLOBAL: gl_24604 int g_dialogKeyboardEnabled; diff --git a/Source/UI/Window/WindowDialogs.h b/Source/UI/Window/WindowDialogs.h deleted file mode 100644 index 006e9e56..00000000 --- a/Source/UI/Window/WindowDialogs.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_WINDOWDIALOGS_H -#define RAGNAROK_SOURCE_UI_WINDOW_WINDOWDIALOGS_H - -extern int g_dialogKeyboardEnabled; -extern int g_dialogKeyboardBlocked; - -#endif diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp index 733d4419..64ac12ca 100644 --- a/Source/UI/Window/WindowMgrState.cpp +++ b/Source/UI/Window/WindowMgrState.cpp @@ -28,7 +28,6 @@ #include "UI/Window/UIRoulletteWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/WindowDialogs.h" #include "UI/Window/WindowMouseHit.h" #include #include diff --git a/Source/UI/Window/WindowRegistration.h b/Source/UI/Window/WindowRegistration.h deleted file mode 100644 index 26109a3b..00000000 --- a/Source/UI/Window/WindowRegistration.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_WINDOWREGISTRATION_H -#define RAGNAROK_SOURCE_UI_WINDOW_WINDOWREGISTRATION_H - -#include - -class UIWindow; - -struct WindowRegistration { - /* 018C */ std::list windows; - - void Add(UIWindow* window); -}; - -#if defined(_WIN32) && !defined(_WIN64) -static_assert(sizeof(WindowRegistration) == 8); -#endif - -#endif