From 0f561a5dca3ee6e6225b8e8a816d9a905be7939a Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 11 Nov 2026 01:05:24 +0000 Subject: [PATCH] Maintenance: Source reorganisation, parts 2+3: Source/UI, Client, Render, Resource, Utility, Network, Archive, Interface and loose So Batch #16644 by ragnarok-clanker: no function's compiled code changes; checked with 593 compiled unit(s), including every includer of Source/Client/Application/Registry.h, Source/Client/Application/RegistryKey.h, Source/Client/Application/Timer.h, Source/Client/Mode/ModeFade.h, Source/Client/Mode/ModeFadeOut.h, Source/Client/Mode/ModeScreenshot.h, Source/Client/Replay/Replay.h, Source/Client/Replay/ReplayRecordOption.h, Source/Client/Session/Session.h, Source/Contents/Actors/ActorPickNode.h, Source/Contents/Effects/Core/RagEffectState.h, Source/Contents/Effects/Particles/Particle.h, Source/Contents/Movies/BinkMovie.h, Source/Contents/Sprites/SpriteLayerDrawing.h, Source/File/NFileLog.h, Source/Network/NIPAddr.h, Source/Network/Packets/ActorNamePacket.h, Source/Network/Packets/ClientKeepalive.h, Source/Network/Packets/ClientOptionPacket.h, Source/Network/Packets/ExecutableDigestPacket.h, Source/Network/Packets/GameTickPacket.h, Source/Render/DX7/QueuedDrawingDX7.h, Source/Render/DX7/RendererDX7.h, Source/Render/DX9/RenderSystemDX9.h, Source/Render/Device/DeviceSelection.h, Source/Render/Device/Direct3DErrors.h, Source/Render/Device/DisplayMode.h, Source/Render/Device/RenderAdapter.h, Source/Render/Device/RenderBackends.h, Source/Render/Drawing/ActionSpriteDrawing.h, Source/Render/Drawing/BitmapDrawing.h, Source/Render/Drawing/BlendColor.h, Source/Render/Drawing/SpriteGeometry.h, Source/Render/Drawing/TextureStageModes.h, Source/Render/Primitives/AuxiliarySubmission.h, Source/Render/Primitives/SpriteQuad.h, Source/Render/Primitives/TextureQuad.h, Source/Render/Projection/ScreenGeometry.h, Source/Render/Projection/ScreenRectangle.h, Source/Resource/Audio/BinkRuntime.h, Source/Resource/Bitmap/EmblemResource.h, Source/Resource/Bitmap/GifLzw.h, Source/Resource/Bitmap/GifResource.h, Source/Resource/Bitmap/PaletteResource.h, Source/Resource/Bitmap/SkinPalette.h, Source/Resource/Bitmap/TextureNames.h, Source/Resource/Effects/EZeffectResource.h, Source/Resource/Json/JsonCppLoader.h, Source/Resource/Models/RmaResource.h, Source/Resource/Sprites/ImfResource.h, Source/Resource/Xml/XmlNode.h, Source/Security/FileSignatureVerifier.h, Source/Security/ProcessSecurity.h, Source/UI/Achievement/UIAchWnd.h, Source/UI/AdventureGuide/UIAdventureGuide.h, Source/UI/Buttons/UIBalloonOpenBtn.h, Source/UI/Buttons/UIMiniBtnWnd.h, Source/UI/Buttons/UISlotBitmap.h, Source/UI/Buttons/UIStaticBitmap.h, Source/UI/Buttons/UIStaticItem.h, Source/UI/Buttons/UIWindowCallBtnWnd.h, Source/UI/CashEmotion/UICashEmotionSprBtn.h, Source/UI/CashShop/UIMileageWnd.h, Source/UI/CashShop/UIPayConfirmWnd.h, Source/UI/Chat/UIChatRoomWnd.h, Source/UI/Dialogs/UIAccountLimitedToolWnd.h, Source/UI/Dialogs/UICntWnd.h, Source/UI/Dialogs/UILoadingWnd.h, Source/UI/Dialogs/UIMessageBox.h, Source/UI/Dialogs/UIMessageBoxAutoreturn.h, Source/UI/Dialogs/UINormalMB.h, Source/UI/Dialogs/UINoteWnd.h, Source/UI/Dialogs/UINoticeWnd.h, Source/UI/Dialogs/UIRPImageWnd.h, Source/UI/Dialogs/UIRPImageWnd2.h, Source/UI/Dialogs/UITalkboxTrapInputWnd.h, Source/UI/Dialogs/UITransMenuWnd.h, Source/UI/Dialogs/UIVideoWnd.h, Source/UI/Dialogs/UIWordDisplayWnd.h, Source/UI/Edit/UIItemTagCtrl.h, Source/UI/Enchant/EnchantUI.h, Source/UI/Events/UICheckAttendanceWnd.h, Source/UI/Events/UIOpenRoulletteWnd.h, Source/UI/Events/UIRoulletteWnd.h, Source/UI/Exchange/UIExchangeUI.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/GameSettings/UIBattleMsgOptionWnd.h, Source/UI/GameSettings/UIEscOptionWnd.h, Source/UI/GameSettings/UIHotKeyWnd.h, Source/UI/GameSettings/UIHotkeyGuideWnd.h, Source/UI/GameSettings/UIViewCameraInfoWnd.h, Source/UI/Gauges/UIBarGraph.h, Source/UI/Guild/UIEmblemWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Items/UIChangeMaterialWnd.h, Source/UI/Items/UICollectionSystemWnd.h, Source/UI/Items/UIEquipmentPropertiesWnd.h, Source/UI/Items/UIGradeEnchantWnd.h, Source/UI/Items/UIIngredientInfoWnd.h, Source/UI/Items/UIItemBaseWnd.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemMoveInfo.h, Source/UI/Items/UIItemPurchaseWnd.h, Source/UI/Items/UIItemReformWnd.h, Source/UI/Items/UIItemSellWnd.h, Source/UI/Items/UIItemSellWnd2.h, Source/UI/Items/UIItemShopWnd.h, Source/UI/Items/UIItemShopWnd2.h, Source/UI/Items/UIItemStoreComboBox.h, Source/UI/Items/UIItemStoreFindWnd.h, Source/UI/Items/UIItemStoreSubWnd.h, Source/UI/Items/UIItemStoreWnd.h, Source/UI/Items/UIItemWnd.h, Source/UI/Items/UILapineScrollBar.h, Source/UI/Items/UILapineUpgradeBoxWnd.h, Source/UI/Items/UIMerchantItemLogWnd.h, Source/UI/Items/UIParaItemShopWnd.h, Source/UI/Items/UIPreviewEquipWnd.h, Source/UI/Items/UIRefiningWnd.h, Source/UI/Items/UISecondCostumeWnd.h, Source/UI/Items/UISelectCartWnd.h, Source/UI/Lists/UIComboBoxEx.h, Source/UI/Lists/UIScrollBarVariants.h, Source/UI/Lists/UIScrollWnd.h, Source/UI/Lists/UITagListBox.h, Source/UI/Login/FuncDrawWNDChar.h, Source/UI/Login/UIChangeNameWnd.h, Source/UI/Login/UIDescriptRace.h, Source/UI/Login/UIEmailAddressWnd.h, Source/UI/Login/UILoginOTPWnd.h, Source/UI/Login/UILoginWnd.h, Source/UI/Login/UIMakeCharWnd.h, Source/UI/Login/UINewMakeCharWnd.h, Source/UI/Login/UINewSelectCharWnd.h, Source/UI/Login/UIPasswordWnd.h, Source/UI/Login/UISecondPasswordEditWnd.h, Source/UI/Login/UISelCharForUServerWnd.h, Source/UI/Login/UISelectServerWnd.h, Source/UI/Login/UIWaitDBSaveWnd.h, Source/UI/Macro/UICaptchaPreviewWnd.h, Source/UI/Macro/UICaptchaRegisterWnd.h, Source/UI/Macro/UIMacroBlackListCheckWnd.h, Source/UI/Macro/UIMacroDetectorWnd.h, Source/UI/Macro/UIMacroReport.h, Source/UI/Macro/UIMacroUserInfoWnd.h, Source/UI/Monster/UIMonsterDisplayWnd.h, Source/UI/Monster/UIMonsterInfoWnd.h, Source/UI/Navigation/NavigationLink.h, Source/UI/Navigation/UIChooseWarpWnd.h, Source/UI/Navigation/UIListBoxNavi.h, Source/UI/Navigation/UIListBoxNaviSearch.h, Source/UI/Navigation/UIMemorialDunWnd.h, Source/UI/Navigation/UIMiniMapWnd.h, Source/UI/Navigation/UIMinimapZoomWnd.h, Source/UI/Navigation/UINavigationHelpWnd.h, Source/UI/Navigation/UINavigationWnd.h, Source/UI/Navigation/UIRoMapWnd.h, Source/UI/Navigation/UIScrollBarNavi.h, Source/UI/Navigation/UIShowWarpWnd.h, Source/UI/Party/MiniPartyGrid.h, Source/UI/Party/MiniPartyPlacement.h, Source/UI/Party/MiniPartyWndAreaMgr.h, Source/UI/Party/UIJobSlotButton.h, Source/UI/Party/UIPartyBookingHelpWnd.h, Source/UI/Party/UISeekPartyListWnd.h, Source/UI/Party/UISeekPartyMBWnd.h, Source/UI/Party/UISeekPartyWnd.h, Source/UI/ProbabilityTable/UIProbabilityTable.h, Source/UI/Quest/UINotifyQuestWnd.h, Source/UI/Quest/UIOngoingQuestInfo.h, Source/UI/Quest/UIRecommendedQuestInfo.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Replay/UIReplayButton.h, Source/UI/Replay/UIReplayControlWnd.h, Source/UI/Replay/UIReplayListBox.h, Source/UI/Replay/UIReplayRECControlWnd.h, Source/UI/Replay/UISelectReplayDataWnd.h, Source/UI/Repute/UIReputeWnd.h, Source/UI/Rodex/UIOpenMailBoxWnd.h, Source/UI/Rodex/UIRodexContentsWnd.h, Source/UI/Rodex/UIRodexInboxWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/SelectPackageItemBox/SelectPackageItemBox.h, Source/UI/SelectPackageItemBox/UIPackageBoxNameList.h, Source/UI/Shop/PriceCommission.h, Source/UI/Shop/UIBank_NewWnd.h, Source/UI/Shop/UIBartermarketWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantItemWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UISerachStoreInfoWnd.h, Source/UI/Shop/UInCash_CallWnd.h, Source/UI/Skill/UIDebuffRemoveWnd.h, Source/UI/Skill/UIGraffiStrboxWnd.h, Source/UI/Skill/UINewSkillListWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/Status/UIBasicInfoWnd.h, Source/UI/Status/UIHomunInfoWnd.h, Source/UI/Status/UIJobListWnd.h, Source/UI/Status/UIMerInfoWnd.h, Source/UI/Status/UIPetEvolutionWnd.h, Source/UI/Status/UIPetInfoWnd.h, Source/UI/Status/UIPetTamingDeceiveWnd.h, Source/UI/Status/UIRebirthWnd.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/TextTags.h, Source/UI/Text/UIBroadcastBalloon.h, Source/UI/Text/UIRoundBoxTooltipWnd.h, Source/UI/Window/FrameSkin.h, Source/UI/Window/UIBasicCtrl.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIWindowMgr.inl, Source/Utility/Cipher/EncryptedName.h, Source/Utility/Hash/CRC32.h, Source/Utility/Hash/GGHash.h, Source/Utility/Hash/GGHashMgr.h, Source/Utility/Hash/Md5State.h, Source/Utility/Hash/SHA3.h, Source/Utility/Hash/XxHash3.h, Source/Utility/Text/GuidParse.h, Source/Utility/Text/Tokenizer.h, Source/Utility/Zlib.h, Source/ActorPickNode.h, Source/Client/ModeFade.h, Source/Client/ModeFadeOut.h, Source/Client/ModeScreenshot.h, Source/Client/Registry.h, Source/Client/Replay.h, Source/Client/ReplayRecordOption.h, Source/Client/Session.h, Source/Client/Timer.h, Source/Network/ActorNamePacket.h, Source/Network/ClientKeepalive.h, Source/Network/ClientOptionPacket.h, Source/Network/ExecutableDigestPacket.h, Source/Network/GameTickPacket.h, Source/Render/ActionSpriteDrawing.h, Source/Render/AuxiliarySubmission.h, Source/Render/BitmapDrawing.h, Source/Render/BlendColor.h, Source/Render/DeviceSelection.h, Source/Render/Direct3DErrors.h, Source/Render/DisplayMode.h, Source/Render/RenderAdapter.h, Source/Render/RenderBackends.h, Source/Render/RendererDX7.h, Source/Render/ScreenGeometry.h, Source/Render/ScreenRectangle.h, Source/Render/SpriteGeometry.h, Source/Render/SpriteQuad.h, Source/Render/TextureQuad.h, Source/Render/TextureStageModes.h, Source/Resource/BinkRuntime.h, Source/Resource/EZeffectResource.h, Source/Resource/EmblemResource.h, Source/Resource/GifLzw.h, Source/Resource/GifResource.h, Source/Resource/ImfResource.h, Source/Resource/PaletteResource.h, Source/Resource/RmaResource.h, Source/Resource/SkinPalette.h, Source/Resource/TextureNames.h, Source/Resource/XmlNode.h, Source/UI/Buttons/UICashEmotionSprBtn.h, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemMoveInfo.h, Source/UI/Buttons/UIJobSlotButton.h, Source/UI/Buttons/UIReplayButton.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIEmailAddressWnd.h, Source/UI/Dialogs/UIGraffiStrboxWnd.h, Source/UI/Dialogs/UIMemorialDunWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINotifyQuestWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIPetTamingDeceiveWnd.h, Source/UI/Dialogs/UISecondPasswordEditWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UIWaitDBSaveWnd.h, Source/UI/FrameSkin.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Item/UIParaItemShopWnd.h, Source/UI/Lists/UIItemStoreComboBox.h, Source/UI/Lists/UIListBoxNavi.h, Source/UI/Lists/UIListBoxNaviSearch.h, Source/UI/Lists/UIPackageBoxNameList.h, Source/UI/Lists/UIReplayListBox.h, Source/UI/Lists/UIScrollBarNavi.h, Source/UI/MiniPartyGrid.h, Source/UI/MiniPartyPlacement.h, Source/UI/PriceCommission.h, Source/UI/Text/NavigationLink.h, Source/UI/Text/UIAchWnd.h, Source/UI/TextTags.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.h, Source/UI/UIBasicCtrl.h, Source/UI/UIBroadcastBalloon.h, Source/UI/UICaptchaPreviewWnd.h, Source/UI/UICaptchaRegisterWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UICheckAttendanceWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UIHotkeyGuideWnd.h, Source/UI/UIIngredientInfoWnd.h, Source/UI/UIItemReformWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UILapineUpgradeBoxWnd.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroReport.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIReputeWnd.h, Source/UI/UIRoundBoxTooltipWnd.h, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.h, Source/UI/UIStaticBitmap.h, Source/UI/UIStaticItem.h, Source/UI/Window/FuncDrawWNDChar.h, Source/UI/Window/MiniPartyWndAreaMgr.h, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIBalloonOpenBtn.h, Source/UI/Window/UIBank_NewWnd.h, Source/UI/Window/UIBasicInfoWnd.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChangeNameWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICntWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIDebuffRemoveWnd.h, Source/UI/Window/UIEmblemWnd.h, Source/UI/Window/UIEscOptionWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMerInfoWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMessageBoxAutoreturn.h, Source/UI/Window/UIMileageWnd.h, Source/UI/Window/UIMiniBtnWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINewSkillListWnd.h, Source/UI/Window/UINormalMB.h, Source/UI/Window/UINoteWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIOpenMailBoxWnd.h, Source/UI/Window/UIOpenRoulletteWnd.h, Source/UI/Window/UIPartyBookingHelpWnd.h, Source/UI/Window/UIPayConfirmWnd.h, Source/UI/Window/UIPetEvolutionWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRPImageWnd.h, Source/UI/Window/UIRPImageWnd2.h, Source/UI/Window/UIRebirthWnd.h, Source/UI/Window/UIReplayControlWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UIRoulletteWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyListWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UISelectReplayDataWnd.h, Source/UI/Window/UISelectServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UIShowWarpWnd.h, Source/UI/Window/UITalkboxTrapInputWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIVideoWnd.h, Source/UI/Window/UIViewCameraInfoWnd.h, Source/UI/Window/UIWindowCallBtnWnd.h, Source/UI/Window/UIWordDisplayWnd.h, Source/Utility/CRC32.h, Source/Utility/Compression/Zlib.h, Source/Utility/EncryptedName.h, Source/Utility/FileSignatureVerifier.h, Source/Utility/GGHash.h, Source/Utility/GGHashMgr.h, Source/Utility/GuidParse.h, Source/Utility/JsonCppLoader.h, Source/Utility/Md5State.h, Source/Utility/NFileLog.h, Source/Utility/NIPAddr.h, Source/Utility/ProcessSecurity.h, Source/Utility/RegistryKey.h, Source/Utility/SHA3.h, Source/Utility/Tokenizer.h, Source/Utility/XxHash3.h. Adds to the build: Source/Client/Application/ClientOptions.cpp, Source/Client/Application/Registry.cpp, Source/Client/Application/RegistryKey.cpp, Source/Client/Application/Timer.cpp, Source/Client/Mode/EntityInit.cpp, Source/Client/Mode/ModeBaseEvents.cpp, Source/Client/Mode/ModeCursorDrawing.cpp, Source/Client/Mode/ModeFade.cpp, Source/Client/Mode/ModeFadeOut.cpp, Source/Client/Mode/ModeScreenshot.cpp, Source/Client/Mode/ModeTransitions.cpp, Source/Client/Replay/Replay.cpp, Source/Client/Replay/ReplayControl.cpp, Source/Client/Replay/ReplayPacketRecorder.cpp, Source/Client/Session/Session.cpp, Source/Client/Session/SessionAchievements.cpp, Source/Client/Session/SessionParty.cpp, Source/Client/Session/SessionPredicates.cpp, Source/Client/Session/SessionState.cpp, Source/Contents/Actors/ActorPickNode.cpp, Source/File/NFileLog.cpp, Source/Network/NIPAddr.cpp, Source/Network/Packets/ActorNamePacket.cpp, Source/Network/Packets/ClientKeepalive.cpp, Source/Network/Packets/ClientOptionPacket.cpp, Source/Network/Packets/ExecutableDigestPacket.cpp, Source/Network/Packets/GameTickPacket.cpp, Source/Render/DX7/AlphaQueuesDX7.cpp, Source/Render/DX7/AuxiliaryQueuesDX7.cpp, Source/Render/DX7/OpaqueQueuesDX7.cpp, Source/Render/DX7/RendererDX7.cpp, Source/Render/DX9/DeviceCapabilitiesDX9.cpp, Source/Render/Device/DeviceSelection.cpp, Source/Render/Device/Direct3DErrors.cpp, Source/Render/Device/DisplayMode.cpp, Source/Render/Device/RenderAdapter.cpp, Source/Render/Device/RenderBackends.cpp, Source/Render/Drawing/ActionSpriteDrawing.cpp, Source/Render/Drawing/BitmapDrawing.cpp, Source/Render/Drawing/BlendColor.cpp, Source/Render/Drawing/SpriteGeometry.cpp, Source/Render/Primitives/AlphaRectangle.cpp, Source/Render/Primitives/AuxiliarySubmission.cpp, Source/Render/Primitives/SpriteQuad.cpp, Source/Render/Primitives/TextureQuad.cpp, Source/Render/Primitives/UIRPDataDrawing.cpp, Source/Render/Projection/ScreenGeometry.cpp, Source/Render/Projection/ScreenRectangle.cpp, Source/Render/Projection/ViewportProjection.cpp, Source/Resource/Bitmap/EmblemResource.cpp, Source/Resource/Bitmap/GifLzw.cpp, Source/Resource/Bitmap/GifResource.cpp, Source/Resource/Bitmap/PaletteResource.cpp, Source/Resource/Bitmap/SkinPalette.cpp, Source/Resource/Bitmap/TextureNames.cpp, Source/Resource/Effects/EZeffectResource.cpp, Source/Resource/Json/JsonCppLoader.cpp, Source/Resource/Models/RmaResource.cpp, Source/Resource/Sprites/ImfLayerIndex.cpp, Source/Resource/Sprites/ImfResource.cpp, Source/Resource/Xml/XmlNode.cpp, Source/Resource/Xml/XmlParsing.cpp, Source/Security/FileSignatureVerifier.cpp, Source/Security/ProcessSecurity.cpp, Source/Security/UnknownA68.cpp, Source/UI/Achievement/UIAchWnd.cpp, Source/UI/Buttons/UIBalloonOpenBtn.cpp, Source/UI/Buttons/UIMiniBtnWnd.cpp, Source/UI/Buttons/UISlotBitmap.cpp, Source/UI/Buttons/UIStaticBitmap.cpp, Source/UI/Buttons/UIStaticItem.cpp, Source/UI/CashShop/UIMileageWnd.cpp, Source/UI/Chat/UIZeroChatWnd.cpp, Source/UI/Dialogs/UIAccountLimitedToolWnd.cpp, Source/UI/Dialogs/UILocaleTextWnd.cpp, Source/UI/Dialogs/UIMessageBox.cpp, Source/UI/Dialogs/UINormalMB.cpp, Source/UI/Dialogs/UINoteWnd.cpp, Source/UI/Dialogs/UINoticeWnd.cpp, Source/UI/Dialogs/UIRPImageWnd.cpp, Source/UI/Dialogs/UIRPImageWnd2.cpp, Source/UI/Dialogs/UITransMenuWnd.cpp, Source/UI/Dialogs/UIVideoWnd.cpp, Source/UI/Dialogs/UIWordDisplayWnd.cpp, Source/UI/Events/UICheckAttendanceWnd.cpp, Source/UI/Events/UIOpenRoulletteWnd.cpp, Source/UI/Events/UIRoulletteWnd.cpp, Source/UI/GameSettings/UIBattleMsgOptionWnd.cpp, Source/UI/GameSettings/UIEscOptionWnd.cpp, Source/UI/GameSettings/UIHotKeyWnd.cpp, Source/UI/GameSettings/UIHotkeyGuideWnd.cpp, Source/UI/GameSettings/UIViewCameraInfoWnd.cpp, Source/UI/Gauges/UIBarGraph.cpp, Source/UI/Guild/UIEmblemWnd.cpp, Source/UI/Items/UIChangeMaterialWnd.cpp, Source/UI/Items/UICollectionSystemWnd.cpp, Source/UI/Items/UIEquipmentPropertiesWnd.cpp, Source/UI/Items/UIGradeEnchantWnd.cpp, Source/UI/Items/UIItemMoveInfo.cpp, Source/UI/Items/UIItemReformWnd.cpp, Source/UI/Items/UIItemStoreComboBox.cpp, Source/UI/Items/UIItemStoreWnd.cpp, Source/UI/Items/UILapineBoxWnd.cpp, Source/UI/Items/UILapineScrollBar.cpp, Source/UI/Items/UILapineUpgradeBoxWnd.cpp, Source/UI/Items/UIMerchantItemLogWnd.cpp, Source/UI/Items/UIParaItemShopWnd.cpp, Source/UI/Items/UIPreviewEquipWnd.cpp, Source/UI/Items/UIRefiningWnd.cpp, Source/UI/Items/UISecondCostumeWnd.cpp, Source/UI/Lists/UIScrollWnd.cpp, Source/UI/Login/FuncDrawWNDChar.cpp, Source/UI/Login/UIChangeNameWnd.cpp, Source/UI/Login/UIDescriptRace.cpp, Source/UI/Login/UIEmailAddressWnd.cpp, Source/UI/Login/UILoginWnd.cpp, Source/UI/Login/UINewMakeCharWnd.cpp, Source/UI/Login/UINewSelectCharWnd.cpp, Source/UI/Login/UIPasswordWnd.cpp, Source/UI/Login/UISelCharForUServerWnd.cpp, Source/UI/Login/UIWaitDBSaveWnd.cpp, Source/UI/Macro/UICaptchaPreviewWnd.cpp, Source/UI/Macro/UICaptchaRegisterWnd.cpp, Source/UI/Macro/UIMacroBlackListCheckWnd.cpp, Source/UI/Macro/UIMacroDetectorWnd.cpp, Source/UI/Macro/UIMacroReport.cpp, Source/UI/Macro/UIMacroUserInfoWnd.cpp, Source/UI/Navigation/NavigationLink.cpp, Source/UI/Navigation/UIListBoxNavi.cpp, Source/UI/Navigation/UIMinimapZoomWnd.cpp, Source/UI/Navigation/UINavigationHelpWnd.cpp, Source/UI/Navigation/UINavigationWnd.cpp, Source/UI/Navigation/UIRoMapWnd.cpp, Source/UI/Navigation/UIScrollBarNavi.cpp, Source/UI/Navigation/UIShowWarpWnd.cpp, Source/UI/Party/MiniPartyGrid.cpp, Source/UI/Party/MiniPartyManager.cpp, Source/UI/Party/MiniPartyPlacement.cpp, Source/UI/Party/MiniPartyUsableArea.cpp, Source/UI/Party/UIJobSlotButton.cpp, Source/UI/Party/UIPartyBookingHelpWnd.cpp, Source/UI/Party/UISeekPartyListWnd.cpp, Source/UI/Party/UISeekPartyMBWnd.cpp, Source/UI/Party/UISeekPartyWnd.cpp, Source/UI/Repute/UIReputeWnd.cpp, Source/UI/Rodex/UIOpenMailBoxWnd.cpp, Source/UI/Rodex/UIRodexContentsWnd.cpp, Source/UI/SelectPackageItemBox/UIPackageBoxNameList.cpp, Source/UI/Shop/PriceCommission.cpp, Source/UI/Shop/UIBartermarketWnd.cpp, Source/UI/Shop/UISerachStoreInfoWnd.cpp, Source/UI/Skill/UIDebuffRemoveWnd.cpp, Source/UI/Skill/UIGraffiStrboxWnd.cpp, Source/UI/Skill/UINewSkillListWnd.cpp, Source/UI/Skill/UINewSkillListWndHitTest.cpp, Source/UI/Status/UIBasicInfoWnd.cpp, Source/UI/Status/UIJobListWnd.cpp, Source/UI/Status/UIPetEvolutionWnd.cpp, Source/UI/Status/UIRebirthWnd.cpp, Source/UI/Text/TextTagExtraction.cpp, Source/UI/Text/TextTagRegistry.cpp, Source/UI/Text/UIBroadcastBalloon.cpp, Source/UI/Text/UIRoundBoxTooltipWnd.cpp, Source/UI/Window/FrameSkin.cpp, Source/UI/Window/UIBasicCtrl.cpp, Source/UI/Window/WindowBackground.cpp, Source/UI/Window/WindowLowerBorder.cpp, Source/UI/Window/WindowOverlay.cpp, Source/UI/Window/WindowSprite.cpp, Source/UI/Window/WindowTitlebar.cpp, Source/Utility/BoolStubs.cpp, Source/Utility/Hash/CRC32.cpp, Source/Utility/Hash/GGHash.cpp, Source/Utility/Hash/GGHashMgr.cpp, Source/Utility/Hash/Md5State.cpp, Source/Utility/Hash/SHA3.cpp, Source/Utility/Hash/XxHash3.cpp, Source/Utility/Lexicon/LexiconTrie.cpp, Source/Utility/Text/GuidParse.cpp, Source/Utility/Text/Tokenizer.cpp Deletes: Source/ActorPickNode.cpp, Source/ActorPickNode.h, Source/Archive/UnknownA68.cpp, Source/Client/ClientOptions.cpp, Source/Client/ModeBaseEvents.cpp, Source/Client/ModeCursorDrawing.cpp, Source/Client/ModeFade.cpp, Source/Client/ModeFade.h, Source/Client/ModeFadeOut.cpp, Source/Client/ModeFadeOut.h, Source/Client/ModeScreenshot.cpp, Source/Client/ModeScreenshot.h, Source/Client/ModeTransitions.cpp, Source/Client/Registry.cpp, Source/Client/Registry.h, Source/Client/Replay.cpp, Source/Client/Replay.h, Source/Client/ReplayControl.cpp, Source/Client/ReplayPacketRecorder.cpp, Source/Client/ReplayRecordOption.h, Source/Client/Session.cpp, Source/Client/Session.h, Source/Client/SessionAchievements.cpp, Source/Client/SessionParty.cpp, Source/Client/SessionPredicates.cpp, Source/Client/SessionState.cpp, Source/Client/Timer.cpp, Source/Client/Timer.h, Source/EntityInit.cpp, Source/Interface/BoolStubs.cpp, Source/LexiconTrie.cpp, Source/Network/ActorNamePacket.cpp, Source/Network/ActorNamePacket.h, Source/Network/ClientKeepalive.cpp, Source/Network/ClientKeepalive.h, Source/Network/ClientOptionPacket.cpp, Source/Network/ClientOptionPacket.h, Source/Network/ExecutableDigestPacket.cpp, Source/Network/ExecutableDigestPacket.h, Source/Network/GameTickPacket.cpp, Source/Network/GameTickPacket.h, Source/Render/ActionSpriteDrawing.cpp, Source/Render/ActionSpriteDrawing.h, Source/Render/AlphaQueuesDX7.cpp, Source/Render/AlphaRectangle.cpp, Source/Render/AuxiliaryQueuesDX7.cpp, Source/Render/AuxiliarySubmission.cpp, Source/Render/AuxiliarySubmission.h, Source/Render/BitmapDrawing.cpp, Source/Render/BitmapDrawing.h, Source/Render/BlendColor.cpp, Source/Render/BlendColor.h, Source/Render/DeviceCapabilitiesDX9.cpp, Source/Render/DeviceSelection.cpp, Source/Render/DeviceSelection.h, Source/Render/Direct3DErrors.cpp, Source/Render/Direct3DErrors.h, Source/Render/DisplayMode.cpp, Source/Render/DisplayMode.h, Source/Render/OpaqueQueuesDX7.cpp, Source/Render/RenderAdapter.cpp, Source/Render/RenderAdapter.h, Source/Render/RenderBackends.cpp, Source/Render/RenderBackends.h, Source/Render/RendererDX7.cpp, Source/Render/RendererDX7.h, Source/Render/ScreenGeometry.cpp, Source/Render/ScreenGeometry.h, Source/Render/ScreenRectangle.cpp, Source/Render/ScreenRectangle.h, Source/Render/SpriteGeometry.cpp, Source/Render/SpriteGeometry.h, Source/Render/SpriteQuad.cpp, Source/Render/SpriteQuad.h, Source/Render/TextureQuad.cpp, Source/Render/TextureQuad.h, Source/Render/TextureStageModes.h, Source/Render/UIRPDataDrawing.cpp, Source/Render/ViewportProjection.cpp, Source/Resource/BinkRuntime.h, Source/Resource/EZeffectResource.cpp, Source/Resource/EZeffectResource.h, Source/Resource/EmblemResource.cpp, Source/Resource/EmblemResource.h, Source/Resource/GifLzw.cpp, Source/Resource/GifLzw.h, Source/Resource/GifResource.cpp, Source/Resource/GifResource.h, Source/Resource/ImfLayerIndex.cpp, Source/Resource/ImfResource.cpp, Source/Resource/ImfResource.h, Source/Resource/PaletteResource.cpp, Source/Resource/PaletteResource.h, Source/Resource/RmaResource.cpp, Source/Resource/RmaResource.h, Source/Resource/SkinPalette.cpp, Source/Resource/SkinPalette.h, Source/Resource/TextureNames.cpp, Source/Resource/TextureNames.h, Source/Resource/XmlNode.cpp, Source/Resource/XmlNode.h, Source/Resource/XmlParsing.cpp, Source/UI/Buttons/UICashEmotionSprBtn.h, Source/UI/Buttons/UIDescriptRace.cpp, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemMoveInfo.cpp, Source/UI/Buttons/UIItemMoveInfo.h, Source/UI/Buttons/UIJobSlotButton.cpp, Source/UI/Buttons/UIJobSlotButton.h, Source/UI/Buttons/UIReplayButton.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIEmailAddressWnd.cpp, Source/UI/Dialogs/UIEmailAddressWnd.h, Source/UI/Dialogs/UIGraffiStrboxWnd.cpp, Source/UI/Dialogs/UIGraffiStrboxWnd.h, Source/UI/Dialogs/UIMemorialDunWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.cpp, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINotifyQuestWnd.h, Source/UI/Dialogs/UIPasswordWnd.cpp, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIPetTamingDeceiveWnd.h, Source/UI/Dialogs/UISecondPasswordEditWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UIWaitDBSaveWnd.cpp, Source/UI/Dialogs/UIWaitDBSaveWnd.h, Source/UI/FrameSkin.cpp, Source/UI/FrameSkin.h, Source/UI/Item/UIEquipmentPropertiesWnd.cpp, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.cpp, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.cpp, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Item/UIParaItemShopWnd.cpp, Source/UI/Item/UIParaItemShopWnd.h, Source/UI/Lists/UIItemStoreComboBox.cpp, Source/UI/Lists/UIItemStoreComboBox.h, Source/UI/Lists/UIListBoxNavi.cpp, Source/UI/Lists/UIListBoxNavi.h, Source/UI/Lists/UIListBoxNaviSearch.h, Source/UI/Lists/UIPackageBoxNameList.cpp, Source/UI/Lists/UIPackageBoxNameList.h, Source/UI/Lists/UIReplayListBox.h, Source/UI/Lists/UIScrollBarNavi.cpp, Source/UI/Lists/UIScrollBarNavi.h, Source/UI/MiniPartyGrid.cpp, Source/UI/MiniPartyGrid.h, Source/UI/MiniPartyManager.cpp, Source/UI/MiniPartyPlacement.cpp, Source/UI/MiniPartyPlacement.h, Source/UI/MiniPartyUsableArea.cpp, Source/UI/PriceCommission.cpp, Source/UI/PriceCommission.h, Source/UI/Text/NavigationLink.cpp, Source/UI/Text/NavigationLink.h, Source/UI/Text/UIAchWnd.cpp, Source/UI/Text/UIAchWnd.h, Source/UI/TextTagExtraction.cpp, Source/UI/TextTagRegistry.cpp, Source/UI/TextTags.h, Source/UI/UIBarGraph.cpp, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.cpp, Source/UI/UIBartermarketWnd.h, Source/UI/UIBasicCtrl.cpp, Source/UI/UIBasicCtrl.h, Source/UI/UIBroadcastBalloon.cpp, Source/UI/UIBroadcastBalloon.h, Source/UI/UICaptchaPreviewWnd.cpp, Source/UI/UICaptchaPreviewWnd.h, Source/UI/UICaptchaRegisterWnd.cpp, Source/UI/UICaptchaRegisterWnd.h, Source/UI/UIChangeMaterialWnd.cpp, Source/UI/UIChangeMaterialWnd.h, Source/UI/UICheckAttendanceWnd.cpp, Source/UI/UICheckAttendanceWnd.h, Source/UI/UIGradeEnchantWnd.cpp, Source/UI/UIGradeEnchantWnd.h, Source/UI/UIHotkeyGuideWnd.cpp, Source/UI/UIHotkeyGuideWnd.h, Source/UI/UIIngredientInfoWnd.h, Source/UI/UIItemReformWnd.cpp, Source/UI/UIItemReformWnd.h, Source/UI/UILapineBoxWnd.cpp, Source/UI/UILapineScrollBar.cpp, Source/UI/UILapineScrollBar.h, Source/UI/UILapineUpgradeBoxWnd.cpp, Source/UI/UILapineUpgradeBoxWnd.h, Source/UI/UIMacroBlackListCheckWnd.cpp, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.cpp, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroReport.cpp, Source/UI/UIMacroReport.h, Source/UI/UIMacroUserInfoWnd.cpp, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.cpp, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.cpp, Source/UI/UIRefiningWnd.h, Source/UI/UIReputeWnd.cpp, Source/UI/UIReputeWnd.h, Source/UI/UIRoundBoxTooltipWnd.cpp, Source/UI/UIRoundBoxTooltipWnd.h, Source/UI/UIScrollWnd.cpp, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.cpp, Source/UI/UISlotBitmap.h, Source/UI/UIStaticBitmap.cpp, Source/UI/UIStaticBitmap.h, Source/UI/UIStaticItem.cpp, Source/UI/UIStaticItem.h, Source/UI/Window/FuncDrawWNDChar.cpp, Source/UI/Window/FuncDrawWNDChar.h, Source/UI/Window/MiniPartyWndAreaMgr.h, Source/UI/Window/UIAccountLimitedToolWnd.cpp, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIBalloonOpenBtn.cpp, Source/UI/Window/UIBalloonOpenBtn.h, Source/UI/Window/UIBank_NewWnd.h, Source/UI/Window/UIBasicInfoWnd.cpp, Source/UI/Window/UIBasicInfoWnd.h, Source/UI/Window/UIBattleMsgOptionWnd.cpp, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChangeNameWnd.cpp, Source/UI/Window/UIChangeNameWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICntWnd.h, Source/UI/Window/UICollectionSystemWnd.cpp, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIDebuffRemoveWnd.cpp, Source/UI/Window/UIDebuffRemoveWnd.h, Source/UI/Window/UIEmblemWnd.cpp, Source/UI/Window/UIEmblemWnd.h, Source/UI/Window/UIEscOptionWnd.cpp, Source/UI/Window/UIEscOptionWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.cpp, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.cpp, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILocaleTextWnd.cpp, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.cpp, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMerInfoWnd.h, Source/UI/Window/UIMessageBox.cpp, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMessageBoxAutoreturn.h, Source/UI/Window/UIMileageWnd.cpp, Source/UI/Window/UIMileageWnd.h, Source/UI/Window/UIMiniBtnWnd.cpp, Source/UI/Window/UIMiniBtnWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.cpp, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.cpp, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.cpp, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.cpp, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINewSkillListWnd.cpp, Source/UI/Window/UINewSkillListWnd.h, Source/UI/Window/UINewSkillListWndHitTest.cpp, Source/UI/Window/UINormalMB.cpp, Source/UI/Window/UINormalMB.h, Source/UI/Window/UINoteWnd.cpp, Source/UI/Window/UINoteWnd.h, Source/UI/Window/UINoticeWnd.cpp, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIOpenMailBoxWnd.cpp, Source/UI/Window/UIOpenMailBoxWnd.h, Source/UI/Window/UIOpenRoulletteWnd.cpp, Source/UI/Window/UIOpenRoulletteWnd.h, Source/UI/Window/UIPartyBookingHelpWnd.cpp, Source/UI/Window/UIPartyBookingHelpWnd.h, Source/UI/Window/UIPayConfirmWnd.h, Source/UI/Window/UIPetEvolutionWnd.cpp, Source/UI/Window/UIPetEvolutionWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRPImageWnd.cpp, Source/UI/Window/UIRPImageWnd.h, Source/UI/Window/UIRPImageWnd2.cpp, Source/UI/Window/UIRPImageWnd2.h, Source/UI/Window/UIRebirthWnd.cpp, Source/UI/Window/UIRebirthWnd.h, Source/UI/Window/UIReplayControlWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIRoMapWnd.cpp, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.cpp, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UIRoulletteWnd.cpp, Source/UI/Window/UIRoulletteWnd.h, Source/UI/Window/UISecondCostumeWnd.cpp, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyListWnd.cpp, Source/UI/Window/UISeekPartyListWnd.h, Source/UI/Window/UISeekPartyMBWnd.cpp, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.cpp, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelCharForUServerWnd.cpp, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UISelectReplayDataWnd.h, Source/UI/Window/UISelectServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.cpp, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UIShowWarpWnd.cpp, Source/UI/Window/UIShowWarpWnd.h, Source/UI/Window/UITalkboxTrapInputWnd.h, Source/UI/Window/UITransMenuWnd.cpp, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIVideoWnd.cpp, Source/UI/Window/UIVideoWnd.h, Source/UI/Window/UIViewCameraInfoWnd.cpp, Source/UI/Window/UIViewCameraInfoWnd.h, Source/UI/Window/UIWindowCallBtnWnd.h, Source/UI/Window/UIWordDisplayWnd.cpp, Source/UI/Window/UIWordDisplayWnd.h, Source/UI/Window/UIZeroChatWnd.cpp, Source/UI/WindowBackground.cpp, Source/UI/WindowLowerBorder.cpp, Source/UI/WindowOverlay.cpp, Source/UI/WindowSprite.cpp, Source/UI/WindowTitlebar.cpp, Source/Utility/CRC32.cpp, Source/Utility/CRC32.h, Source/Utility/Compression/Zlib.h, Source/Utility/EncryptedName.h, Source/Utility/FileSignatureVerifier.cpp, Source/Utility/FileSignatureVerifier.h, Source/Utility/GGHash.cpp, Source/Utility/GGHash.h, Source/Utility/GGHashMgr.cpp, Source/Utility/GGHashMgr.h, Source/Utility/GuidParse.cpp, Source/Utility/GuidParse.h, Source/Utility/JsonCppLoader.cpp, Source/Utility/JsonCppLoader.h, Source/Utility/Md5State.cpp, Source/Utility/Md5State.h, Source/Utility/NFileLog.cpp, Source/Utility/NFileLog.h, Source/Utility/NIPAddr.cpp, Source/Utility/NIPAddr.h, Source/Utility/ProcessSecurity.cpp, Source/Utility/ProcessSecurity.h, Source/Utility/RegistryKey.cpp, Source/Utility/RegistryKey.h, Source/Utility/SHA3.cpp, Source/Utility/SHA3.h, Source/Utility/Tokenizer.cpp, Source/Utility/Tokenizer.h, Source/Utility/XxHash3.cpp, Source/Utility/XxHash3.h --- Source/Archive/GPak.cpp | 2 +- Source/Archive/PakRegistry.cpp | 2 +- .../Application/ApplicationActivation.cpp | 2 +- .../Client/Application/ApplicationWindow.cpp | 4 +- Source/Client/Application/ClientInfo.cpp | 4 +- .../{ => Application}/ClientOptions.cpp | 2 +- Source/Client/Application/Launcher.cpp | 14 +- Source/Client/{ => Application}/Registry.cpp | 2 +- Source/Client/Application/Registry.h | 6 + .../Application}/RegistryKey.cpp | 2 +- .../Application}/RegistryKey.h | 4 +- Source/Client/{ => Application}/Timer.cpp | 2 +- Source/Client/{ => Application}/Timer.h | 4 +- .../Application/UnhandledExceptionHandler.cpp | 2 +- Source/Client/Input/Language.cpp | 8 +- Source/{ => Client/Mode}/EntityInit.cpp | 0 Source/Client/Mode/GameMode.cpp | 48 +-- Source/Client/Mode/GameModeEquipWindow.cpp | 2 +- Source/Client/Mode/GameModeHandlers.cpp | 14 +- Source/Client/Mode/GameModeItemLists.cpp | 4 +- Source/Client/Mode/GameModeMiniMap.cpp | 6 +- Source/Client/Mode/GameModeNames.cpp | 2 +- Source/Client/Mode/GameModeNotices.cpp | 36 +- Source/Client/Mode/GameModePackets.cpp | 40 +- Source/Client/Mode/GameModeReplay.cpp | 2 +- Source/Client/Mode/LoginMode.cpp | 34 +- Source/Client/Mode/LoginModeNotices.cpp | 2 +- Source/Client/{ => Mode}/ModeBaseEvents.cpp | 0 .../Client/{ => Mode}/ModeCursorDrawing.cpp | 2 +- Source/Client/Mode/ModeDragState.cpp | 2 +- Source/Client/{ => Mode}/ModeFade.cpp | 4 +- Source/Client/Mode/ModeFade.h | 8 + Source/Client/{ => Mode}/ModeFadeOut.cpp | 8 +- Source/Client/{ => Mode}/ModeFadeOut.h | 4 +- Source/Client/Mode/ModeLifetime.cpp | 2 +- Source/Client/{ => Mode}/ModeScreenshot.cpp | 4 +- Source/Client/Mode/ModeScreenshot.h | 8 + Source/Client/Mode/ModeTooltip.cpp | 2 +- Source/Client/{ => Mode}/ModeTransitions.cpp | 0 Source/Client/ModeFade.h | 8 - Source/Client/ModeScreenshot.h | 8 - Source/Client/Registry.h | 6 - Source/Client/{ => Replay}/Replay.cpp | 4 +- Source/Client/{ => Replay}/Replay.h | 6 +- Source/Client/{ => Replay}/ReplayControl.cpp | 2 +- .../{ => Replay}/ReplayPacketRecorder.cpp | 4 +- .../Client/{ => Replay}/ReplayRecordOption.h | 4 +- Source/Client/{ => Session}/Session.cpp | 10 +- Source/Client/{ => Session}/Session.h | 6 +- .../{ => Session}/SessionAchievements.cpp | 2 +- Source/Client/{ => Session}/SessionParty.cpp | 2 +- .../{ => Session}/SessionPredicates.cpp | 2 +- Source/Client/{ => Session}/SessionState.cpp | 4 +- Source/Client/Stove/StoveMgr.cpp | 6 +- .../Contents/Achievement/AchievementMgr.cpp | 2 +- Source/Contents/Actors/ActorGeometry.cpp | 6 +- .../{ => Contents/Actors}/ActorPickNode.cpp | 4 +- Source/{ => Contents/Actors}/ActorPickNode.h | 4 +- Source/Contents/Actors/CharacterRender.cpp | 10 +- Source/Contents/Actors/GameActor.cpp | 2 +- Source/Contents/Actors/GameObject.cpp | 18 +- Source/Contents/Actors/GroundScope.cpp | 2 +- Source/Contents/Actors/Item.cpp | 4 +- Source/Contents/Actors/MercenaryAI.cpp | 2 +- Source/Contents/Actors/Player.cpp | 10 +- Source/Contents/Actors/RenderObject.cpp | 12 +- Source/Contents/Actors/RenderObjectState.cpp | 2 +- .../Actors/Resources/BodyResources.cpp | 4 +- .../Actors/Resources/EquipmentResources.cpp | 2 +- .../Actors/Resources/HeadResources.cpp | 2 +- .../Actors/Resources/MonsterResources.cpp | 2 +- .../Actors/Resources/RobeResources.cpp | 2 +- .../Actors/Resources/StatusIconImages.cpp | 2 +- Source/Contents/Actors/Skill.cpp | 6 +- .../Contents/Actors/SpriteDrawingPolicy.cpp | 2 +- .../AdventureGuide/AdventureGuideMgr.cpp | 2 +- Source/Contents/Camera/CameraSmoothing.cpp | 2 +- .../Contents/CashEmotion/CashEmotionMgr.cpp | 16 +- Source/Contents/ClientState.cpp | 2 +- .../Contents/Configuration/OptionWriter.cpp | 4 +- .../Contents/Configuration/ScriptOptions.cpp | 4 +- .../Configuration/ServiceConfiguration.cpp | 8 +- .../Contents/Configuration/ServiceOptions.cpp | 10 +- Source/Contents/Effects/Core/Effect.cpp | 2 +- .../Effects/Core/EffectForceRender.cpp | 2 +- Source/Contents/Effects/Core/EffectLists.cpp | 2 +- .../Effects/Core/EffectVisibility.cpp | 2 +- Source/Contents/Effects/Core/MsgEffect.cpp | 2 +- Source/Contents/Effects/Core/RagEffect.cpp | 6 +- .../Effects/Core/RagEffectInitialization.cpp | 2 +- Source/Contents/Effects/Core/RagEffectState.h | 2 +- Source/Contents/Effects/Core/ShowEffect.cpp | 2 +- .../Effects/EffectResourceSwitcher.cpp | 2 +- .../Effects/Particles/EZ2STREffect.cpp | 6 +- .../Contents/Effects/Particles/Particle.cpp | 2 +- Source/Contents/Effects/Particles/Particle.h | 2 +- .../Effects/Particles/SpriteEffect.cpp | 2 +- .../Effects/Particles/SpriteParticle.cpp | 2 +- .../Primitives/EffectPrimitiveArcs.cpp | 4 +- .../Primitives/EffectPrimitiveMotion.cpp | 4 +- .../Primitives/EffectPrimitiveRendering.cpp | 10 +- .../Primitives/EffectPrimitiveSprites.cpp | 6 +- Source/Contents/Effects/Skills/Bash.cpp | 2 +- .../Effects/Skills/MonsterSkillEffects.cpp | 4 +- .../Effects/Skills/NyanggrassEffect.cpp | 2 +- .../Effects/Skills/PartyMemberEffects.cpp | 2 +- Source/Contents/Emblems/EmblemCache.cpp | 2 +- Source/Contents/Emblems/EmblemCacheRaw.cpp | 2 +- Source/Contents/Emblems/EmblemDataMgr.cpp | 4 +- Source/Contents/Emblems/GuildEmblemLookup.cpp | 2 +- Source/Contents/EntryQueue/EntryQueueMgr.cpp | 2 +- Source/Contents/Events/RouletteMgr.cpp | 4 +- .../Contents/Events/ShowRankingScheduler.cpp | 2 +- Source/Contents/Ground/GroundDecals.cpp | 2 +- Source/Contents/Ground/GroundLighting.cpp | 4 +- Source/Contents/Ground/GroundRendering.cpp | 4 +- .../Contents/Ground/GroundWaterRendering.cpp | 2 +- Source/Contents/Guild/GuildInfo.cpp | 2 +- Source/Contents/Hotkeys/EmotionHotkeys.cpp | 2 +- Source/Contents/Hotkeys/UserHotkeyScript.cpp | 2 +- Source/Contents/Items/BarterMarketItemMgr.cpp | 2 +- Source/Contents/Items/ClientItemLists.cpp | 4 +- Source/Contents/Items/EnchantMgr.cpp | 2 +- Source/Contents/Items/ItemDescription.cpp | 2 +- Source/Contents/Items/ItemInfo.cpp | 2 +- Source/Contents/Items/ItemLink.cpp | 2 +- Source/Contents/Items/ItemNaming.cpp | 4 +- Source/Contents/Items/ItemResources.cpp | 2 +- .../Contents/Items/SelectPackageItemMgr.cpp | 2 +- Source/Contents/Jobs/JobInheritance.cpp | 2 +- .../Contents/Jobs/JobNameInitialization.cpp | 2 +- Source/Contents/Jobs/JobNames.cpp | 2 +- Source/Contents/Map/FlyingShipRouteInfo.cpp | 6 +- Source/Contents/Map/MapInfoMgr.cpp | 2 +- Source/Contents/Map/MapNameTable.cpp | 2 +- Source/Contents/Map/MapSkyMgr.cpp | 2 +- Source/Contents/Messenger/ClientMessenger.cpp | 6 +- Source/Contents/Messenger/MessengerMember.cpp | 8 +- Source/Contents/Models/ModelRendering.cpp | 4 +- Source/Contents/Monster/EnemyMonsterTalk.cpp | 2 +- Source/Contents/Monster/MonsterSpeech.cpp | 2 +- Source/Contents/Monster/MonsterXmlActions.cpp | 2 +- .../Contents/Movement/ActorMovementRoute.cpp | 4 +- Source/Contents/Movies/BinkMovie.h | 2 +- .../Navigation/NavigationCandidates.cpp | 2 +- .../Contents/Navigation/NavigationRequest.cpp | 2 +- .../Contents/Navigation/NavigationRoute.cpp | 14 +- .../Contents/Navigation/NavigationSource.cpp | 4 +- .../Contents/Navigation/NpcLocationRadius.cpp | 2 +- Source/Contents/Party/AdventurerAgencyMgr.cpp | 2 +- Source/Contents/Party/AgencyRequests.cpp | 2 +- Source/Contents/Party/PartyBookingMgr.cpp | 4 +- Source/Contents/Party/PartyInfoCompletion.cpp | 4 +- Source/Contents/Party/PartyJoinResult.cpp | 2 +- .../Contents/Party/RegisterPartyAsyncWork.cpp | 2 +- .../Party/StopRecruitingCompletion.cpp | 2 +- Source/Contents/Pet/PetEvolutionMgr.cpp | 2 +- Source/Contents/Pet/PetStatus.cpp | 2 +- Source/Contents/Pet/PetStrings.cpp | 2 +- Source/Contents/Pet/PetTalk.cpp | 2 +- Source/Contents/Pet/PetTalkNames.cpp | 2 +- Source/Contents/Quest/RenewQuestMgr.cpp | 2 +- Source/Contents/Repute/ReputeMgr.cpp | 2 +- Source/Contents/RuneSystem/RuneSystem.cpp | 2 +- Source/Contents/SignBoard/SignBoard.cpp | 6 +- Source/Contents/Skills/AutomaticSkills.cpp | 2 +- Source/Contents/Skills/ClientSkills.cpp | 4 +- Source/Contents/Skills/GraffiSkill.cpp | 2 +- Source/Contents/Skills/PlayerSkillBundle.cpp | 2 +- Source/Contents/Skills/SkillActionAlitea.cpp | 2 +- Source/Contents/Skills/SkillActionInfo.cpp | 2 +- Source/Contents/Skills/SkillInfo.cpp | 2 +- Source/Contents/Skills/SkillLevelConfig.cpp | 2 +- Source/Contents/Skills/SkillLevelRegistry.cpp | 4 +- Source/Contents/Skills/SkillTreeScript.cpp | 2 +- Source/Contents/Sound/HitSounds.cpp | 2 +- Source/Contents/Sound/SoundConfiguration.cpp | 4 +- Source/Contents/Sound/SoundMaker.cpp | 4 +- Source/Contents/Sprites/RobeOpacity.cpp | 2 +- Source/Contents/Sprites/RobeTopLayer.cpp | 2 +- .../Sprites/SpriteFrameSynchronization.cpp | 2 +- Source/Contents/Sprites/SpriteJob.cpp | 2 +- Source/Contents/Sprites/SpriteLayerDepth.cpp | 4 +- .../Contents/Sprites/SpriteLayerDrawing.cpp | 8 +- Source/Contents/Sprites/SpriteLayerDrawing.h | 2 +- Source/Contents/Sprites/SpriteLayerOrder.cpp | 2 +- .../Contents/Sprites/SpriteRidingPolicy.cpp | 2 +- Source/Contents/Sprites/SpriteRobe.cpp | 6 +- .../Contents/Sprites/SpriteRobeCommands.cpp | 6 +- Source/Contents/Sprites/SpriteShadow.cpp | 4 +- Source/Contents/Store/MCStoreInfoBackup.cpp | 2 +- .../Store/MCStoreInfoBackupAsyncWork.cpp | 2 +- Source/Contents/Store/StoreBackupData.cpp | 2 +- Source/Contents/Tables/ClientXmlTables.cpp | 4 +- Source/Contents/Tables/TipBoxTitles.cpp | 2 +- Source/Contents/Time/ClientTiming.cpp | 2 +- .../UserData/AccountLinkedUserDataMgr.cpp | 2 +- .../Contents/UserData/CharacterConfigLoad.cpp | 2 +- .../Contents/UserData/CharacterConfigSave.cpp | 4 +- .../UserData/CharacterLinkedUserDataMgr.cpp | 4 +- Source/Contents/UserData/NormalItemSlots.cpp | 2 +- Source/Contents/World/SkyBox.cpp | 2 +- Source/Contents/World/WorldModelLoading.cpp | 2 +- Source/Contents/World/WorldModelView.cpp | 2 +- Source/Contents/World/WorldObjects.cpp | 10 +- Source/Contents/World/WorldProximity.cpp | 2 +- Source/Contents/World/WorldSpatialTree.cpp | 2 +- Source/Contents/World/WorldViewData.cpp | 4 +- Source/File/FileCreation.cpp | 2 +- Source/{Utility => File}/NFileLog.cpp | 2 +- Source/{Utility => File}/NFileLog.h | 4 +- Source/File/ResourcePath.cpp | 2 +- Source/Network/ClientKeepalive.h | 4 - Source/Network/ClientOptionPacket.h | 4 - Source/Network/Connection/Connection.cpp | 2 +- Source/{Utility => Network}/NIPAddr.cpp | 2 +- Source/{Utility => Network}/NIPAddr.h | 4 +- .../Network/{ => Packets}/ActorNamePacket.cpp | 6 +- .../Network/{ => Packets}/ActorNamePacket.h | 4 +- .../Network/{ => Packets}/ClientKeepalive.cpp | 2 +- Source/Network/Packets/ClientKeepalive.h | 4 + .../{ => Packets}/ClientOptionPacket.cpp | 4 +- Source/Network/Packets/ClientOptionPacket.h | 4 + .../{ => Packets}/ExecutableDigestPacket.cpp | 4 +- .../{ => Packets}/ExecutableDigestPacket.h | 4 +- .../Network/{ => Packets}/GameTickPacket.cpp | 2 +- Source/Network/{ => Packets}/GameTickPacket.h | 4 +- Source/Network/Packets/SkillUpdatePacket.cpp | 2 +- Source/Render/BlendColor.cpp | 1 - Source/Render/BlendColor.h | 6 - Source/Render/{ => DX7}/AlphaQueuesDX7.cpp | 0 .../Render/{ => DX7}/AuxiliaryQueuesDX7.cpp | 0 Source/Render/DX7/BackBufferDX7.cpp | 2 +- Source/Render/DX7/DeviceCapabilitiesDX7.cpp | 2 +- Source/Render/DX7/DirectDrawEnumeration.cpp | 2 +- Source/Render/DX7/DisplayModeDX7.cpp | 2 +- Source/Render/{ => DX7}/OpaqueQueuesDX7.cpp | 0 Source/Render/DX7/QueuedDrawingDX7.h | 2 +- Source/Render/DX7/RenderAdapterDX7.cpp | 2 +- Source/Render/DX7/RenderSystemDX7.cpp | 4 +- Source/Render/DX7/RenderToTextureDX7.cpp | 2 +- Source/Render/{ => DX7}/RendererDX7.cpp | 2 +- Source/Render/{ => DX7}/RendererDX7.h | 4 +- Source/Render/DX7/RendererDX7Operations.cpp | 6 +- Source/Render/DX7/RendererFogDX7.cpp | 4 +- Source/Render/DX7/RendererPresentationDX7.cpp | 2 +- Source/Render/DX7/ScreenshotDX7.cpp | 4 +- Source/Render/DX7/TextureBindingDX7.cpp | 2 +- Source/Render/DX7/TextureDX7.cpp | 2 +- Source/Render/DX7/TextureModesDX7.cpp | 2 +- .../{ => DX9}/DeviceCapabilitiesDX9.cpp | 0 Source/Render/DX9/DeviceRecoveryDX9.cpp | 2 +- Source/Render/DX9/GroundQueuesDX9.cpp | 2 +- Source/Render/DX9/RenderSystemDX9.cpp | 2 +- Source/Render/DX9/RenderSystemDX9.h | 2 +- Source/Render/DX9/RendererDX9.cpp | 4 +- Source/Render/DX9/RendererDX9Operations.cpp | 4 +- Source/Render/DX9/RendererFogDX9.cpp | 2 +- Source/Render/DX9/TextureDX9.cpp | 2 +- .../Render/{ => Device}/DeviceSelection.cpp | 2 +- Source/Render/{ => Device}/DeviceSelection.h | 4 +- Source/Render/{ => Device}/Direct3DErrors.cpp | 2 +- Source/Render/{ => Device}/Direct3DErrors.h | 4 +- Source/Render/{ => Device}/DisplayMode.cpp | 6 +- Source/Render/{ => Device}/DisplayMode.h | 4 +- Source/Render/{ => Device}/RenderAdapter.cpp | 6 +- Source/Render/{ => Device}/RenderAdapter.h | 4 +- Source/Render/{ => Device}/RenderBackends.cpp | 2 +- Source/Render/{ => Device}/RenderBackends.h | 4 +- Source/Render/DeviceContext/DCSurface.cpp | 2 +- .../{ => Drawing}/ActionSpriteDrawing.cpp | 4 +- .../{ => Drawing}/ActionSpriteDrawing.h | 4 +- Source/Render/{ => Drawing}/BitmapDrawing.cpp | 2 +- Source/Render/{ => Drawing}/BitmapDrawing.h | 4 +- Source/Render/Drawing/BlendColor.cpp | 1 + Source/Render/Drawing/BlendColor.h | 6 + .../Render/{ => Drawing}/SpriteGeometry.cpp | 2 +- Source/Render/{ => Drawing}/SpriteGeometry.h | 4 +- .../Render/{ => Drawing}/TextureStageModes.h | 4 +- .../{ => Primitives}/AlphaRectangle.cpp | 2 +- .../{ => Primitives}/AuxiliarySubmission.cpp | 2 +- .../{ => Primitives}/AuxiliarySubmission.h | 4 +- Source/Render/Primitives/DepthAlpha.cpp | 2 +- Source/Render/Primitives/ScreenLine.cpp | 8 +- Source/Render/{ => Primitives}/SpriteQuad.cpp | 4 +- Source/Render/{ => Primitives}/SpriteQuad.h | 4 +- .../Render/{ => Primitives}/TextureQuad.cpp | 2 +- Source/Render/{ => Primitives}/TextureQuad.h | 4 +- .../{ => Primitives}/UIRPDataDrawing.cpp | 0 Source/Render/Projection/RendererViewport.cpp | 2 +- .../{ => Projection}/ScreenGeometry.cpp | 4 +- .../Render/{ => Projection}/ScreenGeometry.h | 4 +- .../{ => Projection}/ScreenRectangle.cpp | 4 +- .../Render/{ => Projection}/ScreenRectangle.h | 4 +- .../{ => Projection}/ViewportProjection.cpp | 0 Source/Render/Renderer.cpp | 6 +- Source/Render/Textures/TextureCache.cpp | 2 +- Source/Resource/{ => Audio}/BinkRuntime.h | 4 +- .../Resource/{ => Bitmap}/EmblemResource.cpp | 2 +- Source/Resource/{ => Bitmap}/EmblemResource.h | 6 +- Source/Resource/{ => Bitmap}/GifLzw.cpp | 2 +- Source/Resource/{ => Bitmap}/GifLzw.h | 4 +- Source/Resource/{ => Bitmap}/GifResource.cpp | 4 +- Source/Resource/{ => Bitmap}/GifResource.h | 4 +- .../Resource/{ => Bitmap}/PaletteResource.cpp | 2 +- .../Resource/{ => Bitmap}/PaletteResource.h | 4 +- Source/Resource/{ => Bitmap}/SkinPalette.cpp | 4 +- Source/Resource/{ => Bitmap}/SkinPalette.h | 4 +- Source/Resource/{ => Bitmap}/TextureNames.cpp | 2 +- Source/Resource/Bitmap/TextureNames.h | 6 + .../{ => Effects}/EZeffectResource.cpp | 2 +- .../Resource/{ => Effects}/EZeffectResource.h | 4 +- .../Json}/JsonCppLoader.cpp | 2 +- .../Json}/JsonCppLoader.h | 4 +- Source/Resource/Models/ModelResource.cpp | 2 +- Source/Resource/{ => Models}/RmaResource.cpp | 4 +- Source/Resource/{ => Models}/RmaResource.h | 4 +- .../Resource/{ => Sprites}/ImfLayerIndex.cpp | 2 +- Source/Resource/{ => Sprites}/ImfResource.cpp | 2 +- Source/Resource/{ => Sprites}/ImfResource.h | 4 +- Source/Resource/TextureNames.h | 6 - Source/Resource/{ => Xml}/XmlNode.cpp | 2 +- Source/Resource/{ => Xml}/XmlNode.h | 4 +- Source/Resource/{ => Xml}/XmlParsing.cpp | 2 +- Source/Script/LuaScript.cpp | 8 +- .../FileSignatureVerifier.cpp | 2 +- .../FileSignatureVerifier.h | 4 +- Source/Security/NProtectGameGuardMgr.cpp | 2 +- .../{Utility => Security}/ProcessSecurity.cpp | 2 +- .../{Utility => Security}/ProcessSecurity.h | 4 +- Source/{Archive => Security}/UnknownA68.cpp | 0 Source/UI/Acceptance/UIChooseSellBuyWnd.cpp | 38 +- Source/UI/Acceptance/UIExchangeAcceptWnd.cpp | 6 +- Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp | 4 +- Source/UI/{Text => Achievement}/UIAchWnd.cpp | 6 +- Source/UI/{Text => Achievement}/UIAchWnd.h | 4 +- Source/UI/AdventureGuide/UIAdventureGuide.cpp | 2 +- Source/UI/AdventureGuide/UIAdventureGuide.h | 4 +- .../{Window => Buttons}/UIBalloonOpenBtn.cpp | 4 +- .../UI/{Window => Buttons}/UIBalloonOpenBtn.h | 4 +- Source/UI/Buttons/UIBasicButton.cpp | 2 +- Source/UI/Buttons/UIBitmapButton.cpp | 2 +- Source/UI/Buttons/UIBmpTextButton.cpp | 2 +- Source/UI/Buttons/UIBmpTextButton2.cpp | 2 +- Source/UI/Buttons/UIButton.cpp | 8 +- Source/UI/Buttons/UICheckBox.cpp | 6 +- Source/UI/Buttons/UIColorButton.cpp | 2 +- .../UI/{Window => Buttons}/UIMiniBtnWnd.cpp | 4 +- Source/UI/{Window => Buttons}/UIMiniBtnWnd.h | 4 +- Source/UI/Buttons/UINaviLinkButton.cpp | 2 +- Source/UI/Buttons/UIRadioBtn.cpp | 2 +- Source/UI/{ => Buttons}/UISlotBitmap.cpp | 2 +- Source/UI/{ => Buttons}/UISlotBitmap.h | 6 +- Source/UI/{ => Buttons}/UIStaticBitmap.cpp | 4 +- Source/UI/{ => Buttons}/UIStaticBitmap.h | 4 +- Source/UI/{ => Buttons}/UIStaticItem.cpp | 2 +- Source/UI/{ => Buttons}/UIStaticItem.h | 4 +- Source/UI/Buttons/UITextButton.cpp | 32 +- Source/UI/Buttons/UITextureButton.cpp | 4 +- .../{Window => Buttons}/UIWindowCallBtnWnd.h | 4 +- .../UICashEmotionSprBtn.h | 4 +- Source/UI/CashShop/UICashShopWnd.cpp | 12 +- .../UI/{Window => CashShop}/UIMileageWnd.cpp | 8 +- Source/UI/{Window => CashShop}/UIMileageWnd.h | 4 +- .../UI/{Window => CashShop}/UIPayConfirmWnd.h | 6 +- Source/UI/Chat/ChatSuggestions.cpp | 2 +- Source/UI/Chat/UIChatRoomTitle.cpp | 4 +- Source/UI/{Window => Chat}/UIChatRoomWnd.h | 4 +- Source/UI/Chat/UINewChatWnd.cpp | 6 +- Source/UI/Chat/UISubChatHisWnd.cpp | 2 +- Source/UI/{Window => Chat}/UIZeroChatWnd.cpp | 4 +- Source/UI/Clan/UIClanWnd.cpp | 6 +- Source/UI/Cooldowns/CooldownState.cpp | 2 +- .../UIAccountLimitedToolWnd.cpp | 2 +- .../UIAccountLimitedToolWnd.h | 4 +- Source/UI/{Window => Dialogs}/UICntWnd.h | 4 +- Source/UI/Dialogs/UIEditctrlWnd.cpp | 8 +- Source/UI/Dialogs/UILoadingWnd.h | 2 +- .../{Window => Dialogs}/UILocaleTextWnd.cpp | 0 .../UI/{Window => Dialogs}/UIMessageBox.cpp | 64 ++-- Source/UI/{Window => Dialogs}/UIMessageBox.h | 4 +- .../UIMessageBoxAutoreturn.h | 4 +- Source/UI/{Window => Dialogs}/UINormalMB.cpp | 6 +- Source/UI/{Window => Dialogs}/UINormalMB.h | 4 +- Source/UI/{Window => Dialogs}/UINoteWnd.cpp | 2 +- Source/UI/{Window => Dialogs}/UINoteWnd.h | 6 +- Source/UI/{Window => Dialogs}/UINoticeWnd.cpp | 2 +- Source/UI/{Window => Dialogs}/UINoticeWnd.h | 4 +- .../UI/{Window => Dialogs}/UIRPImageWnd.cpp | 2 +- Source/UI/{Window => Dialogs}/UIRPImageWnd.h | 4 +- .../UI/{Window => Dialogs}/UIRPImageWnd2.cpp | 2 +- Source/UI/{Window => Dialogs}/UIRPImageWnd2.h | 4 +- .../UITalkboxTrapInputWnd.h | 4 +- .../UI/{Window => Dialogs}/UITransMenuWnd.cpp | 2 +- .../UI/{Window => Dialogs}/UITransMenuWnd.h | 4 +- Source/UI/{Window => Dialogs}/UIVideoWnd.cpp | 2 +- Source/UI/{Window => Dialogs}/UIVideoWnd.h | 4 +- .../{Window => Dialogs}/UIWordDisplayWnd.cpp | 6 +- .../UI/{Window => Dialogs}/UIWordDisplayWnd.h | 4 +- Source/UI/Edit/UICandidateWnd.cpp | 2 +- Source/UI/Edit/UIEditCtrl.cpp | 48 +-- Source/UI/Edit/UIEditCtrl3.cpp | 2 +- Source/UI/Edit/UIEditLinks.cpp | 2 +- Source/UI/Edit/UIEditVariants.cpp | 4 +- Source/UI/Edit/UIItemTagCtrl.h | 2 +- Source/UI/Emotion/UIEmotionWnd.cpp | 2 +- Source/UI/Enchant/EnchantUI.h | 2 +- Source/UI/Enchant/UIEnchantUI.cpp | 2 +- Source/UI/EntryQueue/UIEntryQueueWnd.cpp | 8 +- .../UI/{ => Events}/UICheckAttendanceWnd.cpp | 12 +- Source/UI/{ => Events}/UICheckAttendanceWnd.h | 4 +- .../{Window => Events}/UIOpenRoulletteWnd.cpp | 2 +- .../{Window => Events}/UIOpenRoulletteWnd.h | 4 +- .../UI/{Window => Events}/UIRoulletteWnd.cpp | 6 +- Source/UI/{Window => Events}/UIRoulletteWnd.h | 4 +- Source/UI/Exchange/UIExchangeUI.cpp | 4 +- Source/UI/Exchange/UIExchangeUI.h | 2 +- Source/UI/GameSettings/GameSettingsUI.cpp | 14 +- Source/UI/GameSettings/GameSettingsUI.h | 8 +- .../UIBattleMsgOptionWnd.cpp | 8 +- .../UIBattleMsgOptionWnd.h | 4 +- .../UIEscOptionWnd.cpp | 4 +- .../{Window => GameSettings}/UIEscOptionWnd.h | 4 +- .../{Window => GameSettings}/UIHotKeyWnd.cpp | 8 +- .../UI/{Window => GameSettings}/UIHotKeyWnd.h | 4 +- .../{ => GameSettings}/UIHotkeyGuideWnd.cpp | 6 +- .../UI/{ => GameSettings}/UIHotkeyGuideWnd.h | 4 +- .../UIViewCameraInfoWnd.cpp | 2 +- .../UIViewCameraInfoWnd.h | 4 +- Source/UI/{ => Gauges}/UIBarGraph.cpp | 6 +- Source/UI/{ => Gauges}/UIBarGraph.h | 4 +- Source/UI/Gauges/UIPetInfoBarGraph.cpp | 4 +- Source/UI/Guild/UIAgitWnd.cpp | 8 +- Source/UI/{Window => Guild}/UIEmblemWnd.cpp | 8 +- Source/UI/{Window => Guild}/UIEmblemWnd.h | 4 +- Source/UI/Guild/UIGuildHelperWnd.cpp | 2 +- Source/UI/Guild/UIGuildWnd.cpp | 10 +- Source/UI/Guild/UIGuildWnd.h | 2 +- Source/UI/Guild/UIGuild_Storage_Log.cpp | 2 +- Source/UI/Items/MergeItemWnd.cpp | 4 +- Source/UI/{ => Items}/UIChangeMaterialWnd.cpp | 8 +- Source/UI/{ => Items}/UIChangeMaterialWnd.h | 4 +- .../UICollectionSystemWnd.cpp | 2 +- .../{Window => Items}/UICollectionSystemWnd.h | 4 +- .../UIEquipmentPropertiesWnd.cpp | 6 +- .../UIEquipmentPropertiesWnd.h | 6 +- Source/UI/Items/UIGameItem.cpp | 4 +- Source/UI/{ => Items}/UIGradeEnchantWnd.cpp | 8 +- Source/UI/{ => Items}/UIGradeEnchantWnd.h | 4 +- Source/UI/Items/UIIllustWnd.cpp | 2 +- Source/UI/{ => Items}/UIIngredientInfoWnd.h | 4 +- Source/UI/{Item => Items}/UIItemBaseWnd.h | 4 +- Source/UI/Items/UIItemCollectionWnd.h | 2 +- .../UI/{Buttons => Items}/UIItemMoveInfo.cpp | 2 +- Source/UI/{Buttons => Items}/UIItemMoveInfo.h | 4 +- Source/UI/{Item => Items}/UIItemPurchaseWnd.h | 6 +- Source/UI/{ => Items}/UIItemReformWnd.cpp | 6 +- Source/UI/{ => Items}/UIItemReformWnd.h | 4 +- Source/UI/Items/UIItemRepairWnd.cpp | 2 +- Source/UI/{Item => Items}/UIItemSellWnd.h | 6 +- Source/UI/{Item => Items}/UIItemSellWnd2.h | 6 +- Source/UI/{Item => Items}/UIItemShopWnd.h | 6 +- Source/UI/{Item => Items}/UIItemShopWnd2.h | 6 +- .../{Lists => Items}/UIItemStoreComboBox.cpp | 2 +- .../UI/{Lists => Items}/UIItemStoreComboBox.h | 4 +- .../UI/{Item => Items}/UIItemStoreFindWnd.h | 6 +- Source/UI/{Item => Items}/UIItemStoreSubWnd.h | 6 +- Source/UI/{Item => Items}/UIItemStoreWnd.cpp | 2 +- Source/UI/{Item => Items}/UIItemStoreWnd.h | 6 +- Source/UI/{Item => Items}/UIItemWnd.h | 6 +- Source/UI/{ => Items}/UILapineBoxWnd.cpp | 6 +- Source/UI/{ => Items}/UILapineScrollBar.cpp | 8 +- Source/UI/{ => Items}/UILapineScrollBar.h | 8 +- .../UI/{ => Items}/UILapineUpgradeBoxWnd.cpp | 10 +- Source/UI/{ => Items}/UILapineUpgradeBoxWnd.h | 4 +- Source/UI/Items/UIMakeTargetListWnd.cpp | 4 +- Source/UI/Items/UIMakeTargetProcessWnd.cpp | 6 +- .../{Item => Items}/UIMerchantItemLogWnd.cpp | 8 +- .../UI/{Item => Items}/UIMerchantItemLogWnd.h | 6 +- .../UI/{Item => Items}/UIParaItemShopWnd.cpp | 14 +- Source/UI/{Item => Items}/UIParaItemShopWnd.h | 10 +- Source/UI/{ => Items}/UIPreviewEquipWnd.cpp | 6 +- Source/UI/{ => Items}/UIPreviewEquipWnd.h | 4 +- Source/UI/{ => Items}/UIRefiningWnd.cpp | 8 +- Source/UI/{ => Items}/UIRefiningWnd.h | 4 +- .../{Window => Items}/UISecondCostumeWnd.cpp | 10 +- .../UI/{Window => Items}/UISecondCostumeWnd.h | 4 +- .../UI/{Dialogs => Items}/UISelectCartWnd.h | 4 +- Source/UI/Items/UISwapEquipmentWnd.cpp | 6 +- Source/UI/Items/UIWeaponRefineWnd.cpp | 2 +- Source/UI/Lists/UIComboBoxDefWnd.cpp | 12 +- Source/UI/Lists/UIComboBoxEx.cpp | 4 +- Source/UI/Lists/UIComboBoxEx.h | 2 +- Source/UI/Lists/UIListBox.cpp | 6 +- Source/UI/Lists/UIListBoxEx.cpp | 2 +- Source/UI/Lists/UIScrollBar.cpp | 10 +- Source/UI/Lists/UIScrollBarVariants.h | 2 +- Source/UI/{ => Lists}/UIScrollWnd.cpp | 2 +- Source/UI/{ => Lists}/UIScrollWnd.h | 4 +- Source/UI/Lists/UITagListBox.h | 2 +- .../UI/{Window => Login}/FuncDrawWNDChar.cpp | 6 +- Source/UI/{Window => Login}/FuncDrawWNDChar.h | 4 +- .../UI/{Window => Login}/UIChangeNameWnd.cpp | 8 +- Source/UI/{Window => Login}/UIChangeNameWnd.h | 4 +- .../UI/{Buttons => Login}/UIDescriptRace.cpp | 2 +- Source/UI/{Buttons => Login}/UIDescriptRace.h | 4 +- .../{Dialogs => Login}/UIEmailAddressWnd.cpp | 2 +- .../UI/{Dialogs => Login}/UIEmailAddressWnd.h | 4 +- Source/UI/{Window => Login}/UILoginOTPWnd.h | 4 +- Source/UI/{Window => Login}/UILoginWnd.cpp | 2 +- Source/UI/{Window => Login}/UILoginWnd.h | 6 +- Source/UI/{Window => Login}/UIMakeCharWnd.h | 6 +- .../UI/{Window => Login}/UINewMakeCharWnd.cpp | 12 +- .../UI/{Window => Login}/UINewMakeCharWnd.h | 6 +- .../{Window => Login}/UINewSelectCharWnd.cpp | 12 +- .../UI/{Window => Login}/UINewSelectCharWnd.h | 4 +- .../UI/{Dialogs => Login}/UIPasswordWnd.cpp | 4 +- Source/UI/{Dialogs => Login}/UIPasswordWnd.h | 4 +- .../UISecondPasswordEditWnd.h | 6 +- .../UISelCharForUServerWnd.cpp | 6 +- .../UISelCharForUServerWnd.h | 6 +- .../UI/{Window => Login}/UISelectServerWnd.h | 4 +- .../UI/{Dialogs => Login}/UIWaitDBSaveWnd.cpp | 4 +- .../UI/{Dialogs => Login}/UIWaitDBSaveWnd.h | 4 +- Source/UI/{ => Macro}/UICaptchaPreviewWnd.cpp | 4 +- Source/UI/{ => Macro}/UICaptchaPreviewWnd.h | 4 +- .../UI/{ => Macro}/UICaptchaRegisterWnd.cpp | 4 +- Source/UI/{ => Macro}/UICaptchaRegisterWnd.h | 4 +- .../{ => Macro}/UIMacroBlackListCheckWnd.cpp | 2 +- .../UI/{ => Macro}/UIMacroBlackListCheckWnd.h | 4 +- Source/UI/{ => Macro}/UIMacroDetectorWnd.cpp | 4 +- Source/UI/{ => Macro}/UIMacroDetectorWnd.h | 4 +- Source/UI/{ => Macro}/UIMacroReport.cpp | 4 +- Source/UI/{ => Macro}/UIMacroReport.h | 6 +- Source/UI/{ => Macro}/UIMacroUserInfoWnd.cpp | 6 +- Source/UI/{ => Macro}/UIMacroUserInfoWnd.h | 4 +- Source/UI/Menu/UIMenuIconWnd.cpp | 6 +- .../{Window => Monster}/UIMonsterDisplayWnd.h | 4 +- .../UI/{Window => Monster}/UIMonsterInfoWnd.h | 4 +- .../{Text => Navigation}/NavigationLink.cpp | 8 +- .../UI/{Text => Navigation}/NavigationLink.h | 4 +- .../{Dialogs => Navigation}/UIChooseWarpWnd.h | 4 +- .../{Lists => Navigation}/UIListBoxNavi.cpp | 2 +- .../UI/{Lists => Navigation}/UIListBoxNavi.h | 4 +- .../UIListBoxNaviSearch.h | 4 +- .../UIMemorialDunWnd.h | 4 +- .../UI/{Dialogs => Navigation}/UIMiniMapWnd.h | 4 +- .../UIMinimapZoomWnd.cpp | 2 +- .../UIMinimapZoomWnd.h | 4 +- .../UINavigationHelpWnd.cpp | 2 +- .../UINavigationHelpWnd.h | 4 +- .../UINavigationWnd.cpp | 10 +- .../{Window => Navigation}/UINavigationWnd.h | 4 +- .../UI/{Window => Navigation}/UIRoMapWnd.cpp | 14 +- Source/UI/{Window => Navigation}/UIRoMapWnd.h | 4 +- .../{Lists => Navigation}/UIScrollBarNavi.cpp | 4 +- .../{Lists => Navigation}/UIScrollBarNavi.h | 4 +- .../{Window => Navigation}/UIShowWarpWnd.cpp | 6 +- .../UI/{Window => Navigation}/UIShowWarpWnd.h | 4 +- Source/UI/{ => Party}/MiniPartyGrid.cpp | 2 +- Source/UI/{ => Party}/MiniPartyGrid.h | 4 +- Source/UI/{ => Party}/MiniPartyManager.cpp | 8 +- Source/UI/{ => Party}/MiniPartyPlacement.cpp | 6 +- Source/UI/{ => Party}/MiniPartyPlacement.h | 4 +- Source/UI/{ => Party}/MiniPartyUsableArea.cpp | 2 +- .../{Window => Party}/MiniPartyWndAreaMgr.h | 4 +- Source/UI/Party/UIAdvenPartyBoardWnd.cpp | 6 +- Source/UI/Party/UIApplyForPartyWnd.cpp | 6 +- .../UI/{Buttons => Party}/UIJobSlotButton.cpp | 2 +- .../UI/{Buttons => Party}/UIJobSlotButton.h | 4 +- Source/UI/Party/UIMiniPartyWnd.cpp | 8 +- .../UIPartyBookingHelpWnd.cpp | 4 +- .../{Window => Party}/UIPartyBookingHelpWnd.h | 4 +- Source/UI/Party/UIPartyInfoWnd.cpp | 4 +- Source/UI/Party/UIRegisterPartyWnd.cpp | 6 +- Source/UI/Party/UIRequestJoinPartyWnd.cpp | 6 +- .../{Window => Party}/UISeekPartyListWnd.cpp | 6 +- .../UI/{Window => Party}/UISeekPartyListWnd.h | 4 +- .../UI/{Window => Party}/UISeekPartyMBWnd.cpp | 6 +- .../UI/{Window => Party}/UISeekPartyMBWnd.h | 4 +- .../UI/{Window => Party}/UISeekPartyWnd.cpp | 6 +- Source/UI/{Window => Party}/UISeekPartyWnd.h | 4 +- Source/UI/PriceCommission.h | 8 - .../UI/ProbabilityTable/UIProbabilityTable.h | 2 +- .../UI/{Dialogs => Quest}/UINotifyQuestWnd.h | 4 +- Source/UI/Quest/UIOngoingQuestInfo.h | 2 +- Source/UI/Quest/UIQuestDisplay.cpp | 2 +- Source/UI/Quest/UIRecommendedQuestInfo.h | 2 +- Source/UI/Quest/UIRenewQuestUI.cpp | 6 +- Source/UI/Quest/UIRenewQuestUI.h | 2 +- Source/UI/Quest/UIRenewQuestWnd.cpp | 8 +- Source/UI/Quest/UIRenewQuestWnd.h | 2 +- .../UI/{Buttons => Replay}/UIReplayButton.h | 4 +- .../{Window => Replay}/UIReplayControlWnd.h | 6 +- Source/UI/{Lists => Replay}/UIReplayListBox.h | 4 +- .../UIReplayRECControlWnd.h | 4 +- .../UISelectReplayDataWnd.h | 4 +- Source/UI/{ => Repute}/UIReputeWnd.cpp | 6 +- Source/UI/{ => Repute}/UIReputeWnd.h | 4 +- .../UI/{Window => Rodex}/UIOpenMailBoxWnd.cpp | 2 +- .../UI/{Window => Rodex}/UIOpenMailBoxWnd.h | 4 +- Source/UI/Rodex/UIRodexComposeWnd.cpp | 8 +- .../{Window => Rodex}/UIRodexContentsWnd.cpp | 10 +- .../UI/{Window => Rodex}/UIRodexContentsWnd.h | 4 +- Source/UI/Rodex/UIRodexInboxWnd.cpp | 4 +- Source/UI/Rodex/UIRodexInboxWnd.h | 2 +- Source/UI/RuneSystem/UIRuneSystemWindows.h | 2 +- Source/UI/RuneSystem/UIRuneSystemWnd.cpp | 2 +- Source/UI/RuneSystem/UIRuneSystemWnd.h | 2 +- .../SelectPackageItemBox.h | 2 +- .../UIPackageBoxNameList.cpp | 2 +- .../UIPackageBoxNameList.h | 4 +- .../UISelectPackageItemBox.cpp | 2 +- Source/UI/Shop/ItemDrawing.cpp | 4 +- Source/UI/Shop/MerchantShopRefresh.cpp | 2 +- Source/UI/{ => Shop}/PriceCommission.cpp | 0 Source/UI/Shop/PriceCommission.h | 8 + Source/UI/{Window => Shop}/UIBank_NewWnd.h | 4 +- Source/UI/{ => Shop}/UIBartermarketWnd.cpp | 8 +- Source/UI/{ => Shop}/UIBartermarketWnd.h | 8 +- Source/UI/Shop/UIMerchantItemMyShopWnd.h | 2 +- Source/UI/Shop/UIMerchantItemPurchaseWnd.h | 2 +- Source/UI/Shop/UIMerchantItemShopWnd.h | 2 +- Source/UI/Shop/UIMerchantItemWnd.h | 2 +- Source/UI/Shop/UIMerchantMirrorItemWnd.h | 2 +- Source/UI/Shop/UIMerchantShopTitle.cpp | 6 +- .../{Window => Shop}/UISerachStoreInfoWnd.cpp | 4 +- .../{Window => Shop}/UISerachStoreInfoWnd.h | 4 +- Source/UI/Shop/UInCash_CallWnd.h | 2 +- Source/UI/Shortcuts/NormalItemSlotLoad.cpp | 2 +- Source/UI/Shortcuts/ShortcutActivation.cpp | 2 +- Source/UI/Shortcuts/ShortcutBindings.cpp | 2 +- Source/UI/Shortcuts/ShortcutControls.cpp | 2 +- Source/UI/Shortcuts/ShortcutCooldowns.cpp | 28 +- Source/UI/Shortcuts/ShortcutDetails.cpp | 2 +- Source/UI/Shortcuts/ShortcutDrop.cpp | 4 +- Source/UI/Shortcuts/ShortcutPainting.cpp | 6 +- Source/UI/Shortcuts/ShortcutPress.cpp | 4 +- Source/UI/Shortcuts/ShortcutTooltip.cpp | 2 +- Source/UI/Shortcuts/ShortcutVisibility.cpp | 2 +- Source/UI/Shortcuts/UIQuickSlotWnd.cpp | 8 +- Source/UI/Shortcuts/UIShortCutWnd.cpp | 18 +- .../{Window => Skill}/UIDebuffRemoveWnd.cpp | 2 +- .../UI/{Window => Skill}/UIDebuffRemoveWnd.h | 4 +- .../{Dialogs => Skill}/UIGraffiStrboxWnd.cpp | 2 +- .../UI/{Dialogs => Skill}/UIGraffiStrboxWnd.h | 4 +- .../{Window => Skill}/UINewSkillListWnd.cpp | 12 +- .../UI/{Window => Skill}/UINewSkillListWnd.h | 4 +- .../UINewSkillListWndHitTest.cpp | 4 +- Source/UI/SkillDelayInfo/SkillDelayInfo.h | 2 +- Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp | 4 +- .../UI/{Window => Status}/UIBasicInfoWnd.cpp | 12 +- Source/UI/{Window => Status}/UIBasicInfoWnd.h | 4 +- Source/UI/{Window => Status}/UIHomunInfoWnd.h | 4 +- Source/UI/{Window => Status}/UIJobListWnd.cpp | 4 +- Source/UI/{Window => Status}/UIJobListWnd.h | 4 +- Source/UI/{Window => Status}/UIMerInfoWnd.h | 4 +- .../{Window => Status}/UIPetEvolutionWnd.cpp | 6 +- .../UI/{Window => Status}/UIPetEvolutionWnd.h | 4 +- Source/UI/{Window => Status}/UIPetInfoWnd.h | 4 +- .../UIPetTamingDeceiveWnd.h | 4 +- Source/UI/{Window => Status}/UIRebirthWnd.cpp | 2 +- Source/UI/{Window => Status}/UIRebirthWnd.h | 4 +- Source/UI/StylingShop/UIStylingShopWnd.cpp | 12 +- Source/UI/StylingShop/UIStylingShopWnd.h | 2 +- Source/UI/Text/TextTagExtraction.cpp | 1 + Source/UI/{ => Text}/TextTagRegistry.cpp | 2 +- Source/UI/{ => Text}/TextTags.h | 4 +- Source/UI/Text/UIBalloonText.cpp | 4 +- Source/UI/{ => Text}/UIBroadcastBalloon.cpp | 4 +- Source/UI/{ => Text}/UIBroadcastBalloon.h | 4 +- Source/UI/{ => Text}/UIRoundBoxTooltipWnd.cpp | 4 +- Source/UI/{ => Text}/UIRoundBoxTooltipWnd.h | 4 +- Source/UI/Text/UIStaticText.cpp | 2 +- Source/UI/Text/UITextViewer.cpp | 4 +- Source/UI/Text/UITextViewerLinks.cpp | 4 +- Source/UI/Text/UITextViewerMessages.cpp | 2 +- Source/UI/TextTagExtraction.cpp | 1 - Source/UI/Window/FrameFocus.cpp | 2 +- Source/UI/{ => Window}/FrameSkin.cpp | 4 +- Source/UI/{ => Window}/FrameSkin.h | 6 +- Source/UI/{ => Window}/UIBasicCtrl.cpp | 2 +- Source/UI/{ => Window}/UIBasicCtrl.h | 4 +- Source/UI/Window/UIBitmapTab.cpp | 2 +- Source/UI/Window/UIControl.cpp | 8 +- Source/UI/Window/UIControl.h | 2 +- Source/UI/Window/UIFrameWnd.cpp | 26 +- Source/UI/Window/UIResizer.cpp | 4 +- Source/UI/Window/UITab.cpp | 2 +- Source/UI/Window/UIWindow.cpp | 22 +- Source/UI/Window/UIWindowFactory.cpp | 6 +- Source/UI/Window/UIWindowMgr.cpp | 202 +++++----- Source/UI/Window/UIWindowMgr.inl | 2 +- Source/UI/Window/WindowAncestry.cpp | 4 +- Source/UI/{ => Window}/WindowBackground.cpp | 6 +- Source/UI/Window/WindowBorder.cpp | 2 +- Source/UI/Window/WindowDialogs.cpp | 6 +- Source/UI/{ => Window}/WindowLowerBorder.cpp | 2 +- Source/UI/Window/WindowMgrState.cpp | 20 +- Source/UI/Window/WindowMouseHit.cpp | 4 +- Source/UI/Window/WindowOrdering.cpp | 2 +- Source/UI/{ => Window}/WindowOverlay.cpp | 6 +- Source/UI/Window/WindowPolicy.cpp | 2 +- Source/UI/{ => Window}/WindowSprite.cpp | 0 Source/UI/{ => Window}/WindowTitlebar.cpp | 2 +- Source/{Interface => Utility}/BoolStubs.cpp | 0 Source/Utility/{ => Cipher}/EncryptedName.h | 4 +- Source/Utility/{ => Hash}/CRC32.cpp | 2 +- Source/Utility/{ => Hash}/CRC32.h | 4 +- Source/Utility/{ => Hash}/GGHash.cpp | 4 +- Source/Utility/{ => Hash}/GGHash.h | 4 +- Source/Utility/{ => Hash}/GGHashMgr.cpp | 2 +- Source/Utility/{ => Hash}/GGHashMgr.h | 6 +- Source/Utility/{ => Hash}/Md5State.cpp | 2 +- Source/Utility/{ => Hash}/Md5State.h | 4 +- Source/Utility/{ => Hash}/SHA3.cpp | 2 +- Source/Utility/{ => Hash}/SHA3.h | 4 +- Source/Utility/{ => Hash}/XxHash3.cpp | 2 +- Source/Utility/{ => Hash}/XxHash3.h | 4 +- Source/{ => Utility/Lexicon}/LexiconTrie.cpp | 0 Source/Utility/{ => Text}/GuidParse.cpp | 2 +- Source/Utility/{ => Text}/GuidParse.h | 4 +- Source/Utility/Text/StringUtil.cpp | 2 +- Source/Utility/{ => Text}/Tokenizer.cpp | 2 +- Source/Utility/{ => Text}/Tokenizer.h | 4 +- Source/Utility/{Compression => }/Zlib.h | 4 +- data/compile.json | 360 +++++++++--------- 727 files changed, 1892 insertions(+), 1892 deletions(-) rename Source/Client/{ => Application}/ClientOptions.cpp (93%) rename Source/Client/{ => Application}/Registry.cpp (63%) create mode 100644 Source/Client/Application/Registry.h rename Source/{Utility => Client/Application}/RegistryKey.cpp (96%) rename Source/{Utility => Client/Application}/RegistryKey.h (83%) rename Source/Client/{ => Application}/Timer.cpp (95%) rename Source/Client/{ => Application}/Timer.h (57%) rename Source/{ => Client/Mode}/EntityInit.cpp (100%) rename Source/Client/{ => Mode}/ModeBaseEvents.cpp (100%) rename Source/Client/{ => Mode}/ModeCursorDrawing.cpp (99%) rename Source/Client/{ => Mode}/ModeFade.cpp (89%) create mode 100644 Source/Client/Mode/ModeFade.h rename Source/Client/{ => Mode}/ModeFadeOut.cpp (87%) rename Source/Client/{ => Mode}/ModeFadeOut.h (73%) rename Source/Client/{ => Mode}/ModeScreenshot.cpp (98%) create mode 100644 Source/Client/Mode/ModeScreenshot.h rename Source/Client/{ => Mode}/ModeTransitions.cpp (100%) delete mode 100644 Source/Client/ModeFade.h delete mode 100644 Source/Client/ModeScreenshot.h delete mode 100644 Source/Client/Registry.h rename Source/Client/{ => Replay}/Replay.cpp (99%) rename Source/Client/{ => Replay}/Replay.h (98%) rename Source/Client/{ => Replay}/ReplayControl.cpp (96%) rename Source/Client/{ => Replay}/ReplayPacketRecorder.cpp (99%) rename Source/Client/{ => Replay}/ReplayRecordOption.h (80%) rename Source/Client/{ => Session}/Session.cpp (99%) rename Source/Client/{ => Session}/Session.h (99%) rename Source/Client/{ => Session}/SessionAchievements.cpp (99%) rename Source/Client/{ => Session}/SessionParty.cpp (95%) rename Source/Client/{ => Session}/SessionPredicates.cpp (98%) rename Source/Client/{ => Session}/SessionState.cpp (99%) rename Source/{ => Contents/Actors}/ActorPickNode.cpp (98%) rename Source/{ => Contents/Actors}/ActorPickNode.h (93%) rename Source/{Utility => File}/NFileLog.cpp (99%) rename Source/{Utility => File}/NFileLog.h (87%) delete mode 100644 Source/Network/ClientKeepalive.h delete mode 100644 Source/Network/ClientOptionPacket.h rename Source/{Utility => Network}/NIPAddr.cpp (97%) rename Source/{Utility => Network}/NIPAddr.h (78%) rename Source/Network/{ => Packets}/ActorNamePacket.cpp (93%) rename Source/Network/{ => Packets}/ActorNamePacket.h (90%) rename Source/Network/{ => Packets}/ClientKeepalive.cpp (96%) create mode 100644 Source/Network/Packets/ClientKeepalive.h rename Source/Network/{ => Packets}/ClientOptionPacket.cpp (94%) create mode 100644 Source/Network/Packets/ClientOptionPacket.h rename Source/Network/{ => Packets}/ExecutableDigestPacket.cpp (95%) rename Source/Network/{ => Packets}/ExecutableDigestPacket.h (63%) rename Source/Network/{ => Packets}/GameTickPacket.cpp (96%) rename Source/Network/{ => Packets}/GameTickPacket.h (75%) delete mode 100644 Source/Render/BlendColor.cpp delete mode 100644 Source/Render/BlendColor.h rename Source/Render/{ => DX7}/AlphaQueuesDX7.cpp (100%) rename Source/Render/{ => DX7}/AuxiliaryQueuesDX7.cpp (100%) rename Source/Render/{ => DX7}/OpaqueQueuesDX7.cpp (100%) rename Source/Render/{ => DX7}/RendererDX7.cpp (98%) rename Source/Render/{ => DX7}/RendererDX7.h (96%) rename Source/Render/{ => DX9}/DeviceCapabilitiesDX9.cpp (100%) rename Source/Render/{ => Device}/DeviceSelection.cpp (83%) rename Source/Render/{ => Device}/DeviceSelection.h (51%) rename Source/Render/{ => Device}/Direct3DErrors.cpp (99%) rename Source/Render/{ => Device}/Direct3DErrors.h (54%) rename Source/Render/{ => Device}/DisplayMode.cpp (94%) rename Source/Render/{ => Device}/DisplayMode.h (88%) rename Source/Render/{ => Device}/RenderAdapter.cpp (96%) rename Source/Render/{ => Device}/RenderAdapter.h (94%) rename Source/Render/{ => Device}/RenderBackends.cpp (85%) rename Source/Render/{ => Device}/RenderBackends.h (73%) rename Source/Render/{ => Drawing}/ActionSpriteDrawing.cpp (97%) rename Source/Render/{ => Drawing}/ActionSpriteDrawing.h (70%) rename Source/Render/{ => Drawing}/BitmapDrawing.cpp (92%) rename Source/Render/{ => Drawing}/BitmapDrawing.h (56%) create mode 100644 Source/Render/Drawing/BlendColor.cpp create mode 100644 Source/Render/Drawing/BlendColor.h rename Source/Render/{ => Drawing}/SpriteGeometry.cpp (98%) rename Source/Render/{ => Drawing}/SpriteGeometry.h (86%) rename Source/Render/{ => Drawing}/TextureStageModes.h (98%) rename Source/Render/{ => Primitives}/AlphaRectangle.cpp (97%) rename Source/Render/{ => Primitives}/AuxiliarySubmission.cpp (93%) rename Source/Render/{ => Primitives}/AuxiliarySubmission.h (61%) rename Source/Render/{ => Primitives}/SpriteQuad.cpp (97%) rename Source/Render/{ => Primitives}/SpriteQuad.h (88%) rename Source/Render/{ => Primitives}/TextureQuad.cpp (98%) rename Source/Render/{ => Primitives}/TextureQuad.h (78%) rename Source/Render/{ => Primitives}/UIRPDataDrawing.cpp (100%) rename Source/Render/{ => Projection}/ScreenGeometry.cpp (97%) rename Source/Render/{ => Projection}/ScreenGeometry.h (83%) rename Source/Render/{ => Projection}/ScreenRectangle.cpp (98%) rename Source/Render/{ => Projection}/ScreenRectangle.h (77%) rename Source/Render/{ => Projection}/ViewportProjection.cpp (100%) rename Source/Resource/{ => Audio}/BinkRuntime.h (93%) rename Source/Resource/{ => Bitmap}/EmblemResource.cpp (97%) rename Source/Resource/{ => Bitmap}/EmblemResource.h (72%) rename Source/Resource/{ => Bitmap}/GifLzw.cpp (98%) rename Source/Resource/{ => Bitmap}/GifLzw.h (56%) rename Source/Resource/{ => Bitmap}/GifResource.cpp (99%) rename Source/Resource/{ => Bitmap}/GifResource.h (89%) rename Source/Resource/{ => Bitmap}/PaletteResource.cpp (96%) rename Source/Resource/{ => Bitmap}/PaletteResource.h (80%) rename Source/Resource/{ => Bitmap}/SkinPalette.cpp (93%) rename Source/Resource/{ => Bitmap}/SkinPalette.h (79%) rename Source/Resource/{ => Bitmap}/TextureNames.cpp (98%) create mode 100644 Source/Resource/Bitmap/TextureNames.h rename Source/Resource/{ => Effects}/EZeffectResource.cpp (98%) rename Source/Resource/{ => Effects}/EZeffectResource.h (94%) rename Source/{Utility => Resource/Json}/JsonCppLoader.cpp (99%) rename Source/{Utility => Resource/Json}/JsonCppLoader.h (98%) rename Source/Resource/{ => Models}/RmaResource.cpp (97%) rename Source/Resource/{ => Models}/RmaResource.h (90%) rename Source/Resource/{ => Sprites}/ImfLayerIndex.cpp (94%) rename Source/Resource/{ => Sprites}/ImfResource.cpp (97%) rename Source/Resource/{ => Sprites}/ImfResource.h (87%) delete mode 100644 Source/Resource/TextureNames.h rename Source/Resource/{ => Xml}/XmlNode.cpp (97%) rename Source/Resource/{ => Xml}/XmlNode.h (91%) rename Source/Resource/{ => Xml}/XmlParsing.cpp (99%) rename Source/{Utility => Security}/FileSignatureVerifier.cpp (99%) rename Source/{Utility => Security}/FileSignatureVerifier.h (95%) rename Source/{Utility => Security}/ProcessSecurity.cpp (98%) rename Source/{Utility => Security}/ProcessSecurity.h (67%) rename Source/{Archive => Security}/UnknownA68.cpp (100%) rename Source/UI/{Text => Achievement}/UIAchWnd.cpp (99%) rename Source/UI/{Text => Achievement}/UIAchWnd.h (98%) rename Source/UI/{Window => Buttons}/UIBalloonOpenBtn.cpp (96%) rename Source/UI/{Window => Buttons}/UIBalloonOpenBtn.h (87%) rename Source/UI/{Window => Buttons}/UIMiniBtnWnd.cpp (95%) rename Source/UI/{Window => Buttons}/UIMiniBtnWnd.h (76%) rename Source/UI/{ => Buttons}/UISlotBitmap.cpp (98%) rename Source/UI/{ => Buttons}/UISlotBitmap.h (81%) rename Source/UI/{ => Buttons}/UIStaticBitmap.cpp (97%) rename Source/UI/{ => Buttons}/UIStaticBitmap.h (89%) rename Source/UI/{ => Buttons}/UIStaticItem.cpp (83%) rename Source/UI/{ => Buttons}/UIStaticItem.h (83%) rename Source/UI/{Window => Buttons}/UIWindowCallBtnWnd.h (69%) rename Source/UI/{Buttons => CashEmotion}/UICashEmotionSprBtn.h (73%) rename Source/UI/{Window => CashShop}/UIMileageWnd.cpp (96%) rename Source/UI/{Window => CashShop}/UIMileageWnd.h (89%) rename Source/UI/{Window => CashShop}/UIPayConfirmWnd.h (74%) rename Source/UI/{Window => Chat}/UIChatRoomWnd.h (92%) rename Source/UI/{Window => Chat}/UIZeroChatWnd.cpp (97%) rename Source/UI/{Window => Dialogs}/UIAccountLimitedToolWnd.cpp (99%) rename Source/UI/{Window => Dialogs}/UIAccountLimitedToolWnd.h (84%) rename Source/UI/{Window => Dialogs}/UICntWnd.h (83%) rename Source/UI/{Window => Dialogs}/UILocaleTextWnd.cpp (100%) rename Source/UI/{Window => Dialogs}/UIMessageBox.cpp (99%) rename Source/UI/{Window => Dialogs}/UIMessageBox.h (92%) rename Source/UI/{Window => Dialogs}/UIMessageBoxAutoreturn.h (85%) rename Source/UI/{Window => Dialogs}/UINormalMB.cpp (97%) rename Source/UI/{Window => Dialogs}/UINormalMB.h (90%) rename Source/UI/{Window => Dialogs}/UINoteWnd.cpp (98%) rename Source/UI/{Window => Dialogs}/UINoteWnd.h (86%) rename Source/UI/{Window => Dialogs}/UINoticeWnd.cpp (98%) rename Source/UI/{Window => Dialogs}/UINoticeWnd.h (89%) rename Source/UI/{Window => Dialogs}/UIRPImageWnd.cpp (83%) rename Source/UI/{Window => Dialogs}/UIRPImageWnd.h (73%) rename Source/UI/{Window => Dialogs}/UIRPImageWnd2.cpp (94%) rename Source/UI/{Window => Dialogs}/UIRPImageWnd2.h (76%) rename Source/UI/{Window => Dialogs}/UITalkboxTrapInputWnd.h (84%) rename Source/UI/{Window => Dialogs}/UITransMenuWnd.cpp (98%) rename Source/UI/{Window => Dialogs}/UITransMenuWnd.h (91%) rename Source/UI/{Window => Dialogs}/UIVideoWnd.cpp (99%) rename Source/UI/{Window => Dialogs}/UIVideoWnd.h (88%) rename Source/UI/{Window => Dialogs}/UIWordDisplayWnd.cpp (93%) rename Source/UI/{Window => Dialogs}/UIWordDisplayWnd.h (83%) rename Source/UI/{ => Events}/UICheckAttendanceWnd.cpp (98%) rename Source/UI/{ => Events}/UICheckAttendanceWnd.h (94%) rename Source/UI/{Window => Events}/UIOpenRoulletteWnd.cpp (97%) rename Source/UI/{Window => Events}/UIOpenRoulletteWnd.h (76%) rename Source/UI/{Window => Events}/UIRoulletteWnd.cpp (99%) rename Source/UI/{Window => Events}/UIRoulletteWnd.h (94%) rename Source/UI/{Window => GameSettings}/UIBattleMsgOptionWnd.cpp (98%) rename Source/UI/{Window => GameSettings}/UIBattleMsgOptionWnd.h (89%) rename Source/UI/{Window => GameSettings}/UIEscOptionWnd.cpp (98%) rename Source/UI/{Window => GameSettings}/UIEscOptionWnd.h (84%) rename Source/UI/{Window => GameSettings}/UIHotKeyWnd.cpp (99%) rename Source/UI/{Window => GameSettings}/UIHotKeyWnd.h (94%) rename Source/UI/{ => GameSettings}/UIHotkeyGuideWnd.cpp (99%) rename Source/UI/{ => GameSettings}/UIHotkeyGuideWnd.h (94%) rename Source/UI/{Window => GameSettings}/UIViewCameraInfoWnd.cpp (96%) rename Source/UI/{Window => GameSettings}/UIViewCameraInfoWnd.h (77%) rename Source/UI/{ => Gauges}/UIBarGraph.cpp (98%) rename Source/UI/{ => Gauges}/UIBarGraph.h (96%) rename Source/UI/{Window => Guild}/UIEmblemWnd.cpp (94%) rename Source/UI/{Window => Guild}/UIEmblemWnd.h (84%) rename Source/UI/{ => Items}/UIChangeMaterialWnd.cpp (99%) rename Source/UI/{ => Items}/UIChangeMaterialWnd.h (97%) rename Source/UI/{Window => Items}/UICollectionSystemWnd.cpp (98%) rename Source/UI/{Window => Items}/UICollectionSystemWnd.h (87%) rename Source/UI/{Item => Items}/UIEquipmentPropertiesWnd.cpp (99%) rename Source/UI/{Item => Items}/UIEquipmentPropertiesWnd.h (95%) rename Source/UI/{ => Items}/UIGradeEnchantWnd.cpp (99%) rename Source/UI/{ => Items}/UIGradeEnchantWnd.h (96%) rename Source/UI/{ => Items}/UIIngredientInfoWnd.h (90%) rename Source/UI/{Item => Items}/UIItemBaseWnd.h (92%) rename Source/UI/{Buttons => Items}/UIItemMoveInfo.cpp (74%) rename Source/UI/{Buttons => Items}/UIItemMoveInfo.h (78%) rename Source/UI/{Item => Items}/UIItemPurchaseWnd.h (87%) rename Source/UI/{ => Items}/UIItemReformWnd.cpp (99%) rename Source/UI/{ => Items}/UIItemReformWnd.h (96%) rename Source/UI/{Item => Items}/UIItemSellWnd.h (87%) rename Source/UI/{Item => Items}/UIItemSellWnd2.h (87%) rename Source/UI/{Item => Items}/UIItemShopWnd.h (89%) rename Source/UI/{Item => Items}/UIItemShopWnd2.h (88%) rename Source/UI/{Lists => Items}/UIItemStoreComboBox.cpp (97%) rename Source/UI/{Lists => Items}/UIItemStoreComboBox.h (86%) rename Source/UI/{Item => Items}/UIItemStoreFindWnd.h (92%) rename Source/UI/{Item => Items}/UIItemStoreSubWnd.h (92%) rename Source/UI/{Item => Items}/UIItemStoreWnd.cpp (84%) rename Source/UI/{Item => Items}/UIItemStoreWnd.h (93%) rename Source/UI/{Item => Items}/UIItemWnd.h (93%) rename Source/UI/{ => Items}/UILapineBoxWnd.cpp (99%) rename Source/UI/{ => Items}/UILapineScrollBar.cpp (98%) rename Source/UI/{ => Items}/UILapineScrollBar.h (95%) rename Source/UI/{ => Items}/UILapineUpgradeBoxWnd.cpp (99%) rename Source/UI/{ => Items}/UILapineUpgradeBoxWnd.h (95%) rename Source/UI/{Item => Items}/UIMerchantItemLogWnd.cpp (98%) rename Source/UI/{Item => Items}/UIMerchantItemLogWnd.h (84%) rename Source/UI/{Item => Items}/UIParaItemShopWnd.cpp (99%) rename Source/UI/{Item => Items}/UIParaItemShopWnd.h (88%) rename Source/UI/{ => Items}/UIPreviewEquipWnd.cpp (99%) rename Source/UI/{ => Items}/UIPreviewEquipWnd.h (88%) rename Source/UI/{ => Items}/UIRefiningWnd.cpp (99%) rename Source/UI/{ => Items}/UIRefiningWnd.h (97%) rename Source/UI/{Window => Items}/UISecondCostumeWnd.cpp (97%) rename Source/UI/{Window => Items}/UISecondCostumeWnd.h (92%) rename Source/UI/{Dialogs => Items}/UISelectCartWnd.h (83%) rename Source/UI/{ => Lists}/UIScrollWnd.cpp (99%) rename Source/UI/{ => Lists}/UIScrollWnd.h (94%) rename Source/UI/{Window => Login}/FuncDrawWNDChar.cpp (99%) rename Source/UI/{Window => Login}/FuncDrawWNDChar.h (95%) rename Source/UI/{Window => Login}/UIChangeNameWnd.cpp (97%) rename Source/UI/{Window => Login}/UIChangeNameWnd.h (87%) rename Source/UI/{Buttons => Login}/UIDescriptRace.cpp (97%) rename Source/UI/{Buttons => Login}/UIDescriptRace.h (92%) rename Source/UI/{Dialogs => Login}/UIEmailAddressWnd.cpp (94%) rename Source/UI/{Dialogs => Login}/UIEmailAddressWnd.h (79%) rename Source/UI/{Window => Login}/UILoginOTPWnd.h (84%) rename Source/UI/{Window => Login}/UILoginWnd.cpp (89%) rename Source/UI/{Window => Login}/UILoginWnd.h (90%) rename Source/UI/{Window => Login}/UIMakeCharWnd.h (86%) rename Source/UI/{Window => Login}/UINewMakeCharWnd.cpp (99%) rename Source/UI/{Window => Login}/UINewMakeCharWnd.h (97%) rename Source/UI/{Window => Login}/UINewSelectCharWnd.cpp (99%) rename Source/UI/{Window => Login}/UINewSelectCharWnd.h (95%) rename Source/UI/{Dialogs => Login}/UIPasswordWnd.cpp (98%) rename Source/UI/{Dialogs => Login}/UIPasswordWnd.h (96%) rename Source/UI/{Dialogs => Login}/UISecondPasswordEditWnd.h (58%) rename Source/UI/{Window => Login}/UISelCharForUServerWnd.cpp (99%) rename Source/UI/{Window => Login}/UISelCharForUServerWnd.h (86%) rename Source/UI/{Window => Login}/UISelectServerWnd.h (83%) rename Source/UI/{Dialogs => Login}/UIWaitDBSaveWnd.cpp (98%) rename Source/UI/{Dialogs => Login}/UIWaitDBSaveWnd.h (86%) rename Source/UI/{ => Macro}/UICaptchaPreviewWnd.cpp (98%) rename Source/UI/{ => Macro}/UICaptchaPreviewWnd.h (85%) rename Source/UI/{ => Macro}/UICaptchaRegisterWnd.cpp (98%) rename Source/UI/{ => Macro}/UICaptchaRegisterWnd.h (88%) rename Source/UI/{ => Macro}/UIMacroBlackListCheckWnd.cpp (99%) rename Source/UI/{ => Macro}/UIMacroBlackListCheckWnd.h (90%) rename Source/UI/{ => Macro}/UIMacroDetectorWnd.cpp (97%) rename Source/UI/{ => Macro}/UIMacroDetectorWnd.h (94%) rename Source/UI/{ => Macro}/UIMacroReport.cpp (99%) rename Source/UI/{ => Macro}/UIMacroReport.h (88%) rename Source/UI/{ => Macro}/UIMacroUserInfoWnd.cpp (99%) rename Source/UI/{ => Macro}/UIMacroUserInfoWnd.h (96%) rename Source/UI/{Window => Monster}/UIMonsterDisplayWnd.h (81%) rename Source/UI/{Window => Monster}/UIMonsterInfoWnd.h (90%) rename Source/UI/{Text => Navigation}/NavigationLink.cpp (99%) rename Source/UI/{Text => Navigation}/NavigationLink.h (91%) rename Source/UI/{Dialogs => Navigation}/UIChooseWarpWnd.h (82%) rename Source/UI/{Lists => Navigation}/UIListBoxNavi.cpp (93%) rename Source/UI/{Lists => Navigation}/UIListBoxNavi.h (84%) rename Source/UI/{Lists => Navigation}/UIListBoxNaviSearch.h (84%) rename Source/UI/{Dialogs => Navigation}/UIMemorialDunWnd.h (83%) rename Source/UI/{Dialogs => Navigation}/UIMiniMapWnd.h (93%) rename Source/UI/{Dialogs => Navigation}/UIMinimapZoomWnd.cpp (82%) rename Source/UI/{Dialogs => Navigation}/UIMinimapZoomWnd.h (85%) rename Source/UI/{Window => Navigation}/UINavigationHelpWnd.cpp (99%) rename Source/UI/{Window => Navigation}/UINavigationHelpWnd.h (77%) rename Source/UI/{Window => Navigation}/UINavigationWnd.cpp (99%) rename Source/UI/{Window => Navigation}/UINavigationWnd.h (94%) rename Source/UI/{Window => Navigation}/UIRoMapWnd.cpp (99%) rename Source/UI/{Window => Navigation}/UIRoMapWnd.h (97%) rename Source/UI/{Lists => Navigation}/UIScrollBarNavi.cpp (96%) rename Source/UI/{Lists => Navigation}/UIScrollBarNavi.h (72%) rename Source/UI/{Window => Navigation}/UIShowWarpWnd.cpp (96%) rename Source/UI/{Window => Navigation}/UIShowWarpWnd.h (78%) rename Source/UI/{ => Party}/MiniPartyGrid.cpp (98%) rename Source/UI/{ => Party}/MiniPartyGrid.h (92%) rename Source/UI/{ => Party}/MiniPartyManager.cpp (96%) rename Source/UI/{ => Party}/MiniPartyPlacement.cpp (94%) rename Source/UI/{ => Party}/MiniPartyPlacement.h (84%) rename Source/UI/{ => Party}/MiniPartyUsableArea.cpp (93%) rename Source/UI/{Window => Party}/MiniPartyWndAreaMgr.h (86%) rename Source/UI/{Buttons => Party}/UIJobSlotButton.cpp (95%) rename Source/UI/{Buttons => Party}/UIJobSlotButton.h (81%) rename Source/UI/{Window => Party}/UIPartyBookingHelpWnd.cpp (95%) rename Source/UI/{Window => Party}/UIPartyBookingHelpWnd.h (78%) rename Source/UI/{Window => Party}/UISeekPartyListWnd.cpp (99%) rename Source/UI/{Window => Party}/UISeekPartyListWnd.h (96%) rename Source/UI/{Window => Party}/UISeekPartyMBWnd.cpp (99%) rename Source/UI/{Window => Party}/UISeekPartyMBWnd.h (94%) rename Source/UI/{Window => Party}/UISeekPartyWnd.cpp (96%) rename Source/UI/{Window => Party}/UISeekPartyWnd.h (91%) delete mode 100644 Source/UI/PriceCommission.h rename Source/UI/{Dialogs => Quest}/UINotifyQuestWnd.h (74%) rename Source/UI/{Buttons => Replay}/UIReplayButton.h (61%) rename Source/UI/{Window => Replay}/UIReplayControlWnd.h (82%) rename Source/UI/{Lists => Replay}/UIReplayListBox.h (64%) rename Source/UI/{Window => Replay}/UIReplayRECControlWnd.h (94%) rename Source/UI/{Window => Replay}/UISelectReplayDataWnd.h (83%) rename Source/UI/{ => Repute}/UIReputeWnd.cpp (99%) rename Source/UI/{ => Repute}/UIReputeWnd.h (90%) rename Source/UI/{Window => Rodex}/UIOpenMailBoxWnd.cpp (98%) rename Source/UI/{Window => Rodex}/UIOpenMailBoxWnd.h (76%) rename Source/UI/{Window => Rodex}/UIRodexContentsWnd.cpp (98%) rename Source/UI/{Window => Rodex}/UIRodexContentsWnd.h (93%) rename Source/UI/{Lists => SelectPackageItemBox}/UIPackageBoxNameList.cpp (65%) rename Source/UI/{Lists => SelectPackageItemBox}/UIPackageBoxNameList.h (54%) rename Source/UI/{ => Shop}/PriceCommission.cpp (100%) create mode 100644 Source/UI/Shop/PriceCommission.h rename Source/UI/{Window => Shop}/UIBank_NewWnd.h (85%) rename Source/UI/{ => Shop}/UIBartermarketWnd.cpp (99%) rename Source/UI/{ => Shop}/UIBartermarketWnd.h (96%) rename Source/UI/{Window => Shop}/UISerachStoreInfoWnd.cpp (99%) rename Source/UI/{Window => Shop}/UISerachStoreInfoWnd.h (90%) rename Source/UI/{Window => Skill}/UIDebuffRemoveWnd.cpp (97%) rename Source/UI/{Window => Skill}/UIDebuffRemoveWnd.h (82%) rename Source/UI/{Dialogs => Skill}/UIGraffiStrboxWnd.cpp (96%) rename Source/UI/{Dialogs => Skill}/UIGraffiStrboxWnd.h (78%) rename Source/UI/{Window => Skill}/UINewSkillListWnd.cpp (99%) rename Source/UI/{Window => Skill}/UINewSkillListWnd.h (96%) rename Source/UI/{Window => Skill}/UINewSkillListWndHitTest.cpp (86%) rename Source/UI/{Window => Status}/UIBasicInfoWnd.cpp (99%) rename Source/UI/{Window => Status}/UIBasicInfoWnd.h (93%) rename Source/UI/{Window => Status}/UIHomunInfoWnd.h (89%) rename Source/UI/{Window => Status}/UIJobListWnd.cpp (98%) rename Source/UI/{Window => Status}/UIJobListWnd.h (88%) rename Source/UI/{Window => Status}/UIMerInfoWnd.h (86%) rename Source/UI/{Window => Status}/UIPetEvolutionWnd.cpp (98%) rename Source/UI/{Window => Status}/UIPetEvolutionWnd.h (85%) rename Source/UI/{Window => Status}/UIPetInfoWnd.h (90%) rename Source/UI/{Dialogs => Status}/UIPetTamingDeceiveWnd.h (84%) rename Source/UI/{Window => Status}/UIRebirthWnd.cpp (98%) rename Source/UI/{Window => Status}/UIRebirthWnd.h (77%) create mode 100644 Source/UI/Text/TextTagExtraction.cpp rename Source/UI/{ => Text}/TextTagRegistry.cpp (96%) rename Source/UI/{ => Text}/TextTags.h (95%) rename Source/UI/{ => Text}/UIBroadcastBalloon.cpp (97%) rename Source/UI/{ => Text}/UIBroadcastBalloon.h (92%) rename Source/UI/{ => Text}/UIRoundBoxTooltipWnd.cpp (98%) rename Source/UI/{ => Text}/UIRoundBoxTooltipWnd.h (88%) delete mode 100644 Source/UI/TextTagExtraction.cpp rename Source/UI/{ => Window}/FrameSkin.cpp (97%) rename Source/UI/{ => Window}/FrameSkin.h (88%) rename Source/UI/{ => Window}/UIBasicCtrl.cpp (89%) rename Source/UI/{ => Window}/UIBasicCtrl.h (92%) rename Source/UI/{ => Window}/WindowBackground.cpp (97%) rename Source/UI/{ => Window}/WindowLowerBorder.cpp (98%) rename Source/UI/{ => Window}/WindowOverlay.cpp (98%) rename Source/UI/{ => Window}/WindowSprite.cpp (100%) rename Source/UI/{ => Window}/WindowTitlebar.cpp (98%) rename Source/{Interface => Utility}/BoolStubs.cpp (100%) rename Source/Utility/{ => Cipher}/EncryptedName.h (93%) rename Source/Utility/{ => Hash}/CRC32.cpp (99%) rename Source/Utility/{ => Hash}/CRC32.h (90%) rename Source/Utility/{ => Hash}/GGHash.cpp (96%) rename Source/Utility/{ => Hash}/GGHash.h (91%) rename Source/Utility/{ => Hash}/GGHashMgr.cpp (97%) rename Source/Utility/{ => Hash}/GGHashMgr.h (81%) rename Source/Utility/{ => Hash}/Md5State.cpp (99%) rename Source/Utility/{ => Hash}/Md5State.h (84%) rename Source/Utility/{ => Hash}/SHA3.cpp (99%) rename Source/Utility/{ => Hash}/SHA3.h (88%) rename Source/Utility/{ => Hash}/XxHash3.cpp (99%) rename Source/Utility/{ => Hash}/XxHash3.h (97%) rename Source/{ => Utility/Lexicon}/LexiconTrie.cpp (100%) rename Source/Utility/{ => Text}/GuidParse.cpp (97%) rename Source/Utility/{ => Text}/GuidParse.h (67%) rename Source/Utility/{ => Text}/Tokenizer.cpp (98%) rename Source/Utility/{ => Text}/Tokenizer.h (77%) rename Source/Utility/{Compression => }/Zlib.h (61%) diff --git a/Source/Archive/GPak.cpp b/Source/Archive/GPak.cpp index 04d7fc6f1..7a05659da 100644 --- a/Source/Archive/GPak.cpp +++ b/Source/Archive/GPak.cpp @@ -5,7 +5,7 @@ #include "Utility/Cipher/XorBytes.h" #include "Utility/Hash/XxHash32.h" #include "Utility/Random/RandomBytes.h" -#include "Utility/XxHash3.h" +#include "Utility/Hash/XxHash3.h" #include #include diff --git a/Source/Archive/PakRegistry.cpp b/Source/Archive/PakRegistry.cpp index e158340e2..6448ac86f 100644 --- a/Source/Archive/PakRegistry.cpp +++ b/Source/Archive/PakRegistry.cpp @@ -1,6 +1,6 @@ #include "Archive/PakRegistry.h" #include "File/ResourcePath.h" -#include "Utility/GGHashMgr.h" +#include "Utility/Hash/GGHashMgr.h" // STATIC: 0x016D5688 // GLOBAL: gl_24380 diff --git a/Source/Client/Application/ApplicationActivation.cpp b/Source/Client/Application/ApplicationActivation.cpp index c21984c7a..6705dc230 100644 --- a/Source/Client/Application/ApplicationActivation.cpp +++ b/Source/Client/Application/ApplicationActivation.cpp @@ -1,7 +1,7 @@ #include "Client/Application/ApplicationActivation.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CLoginMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Skills/AutomaticSkills.h" #include "UI/GameSettings/GameSettingsUI.h" diff --git a/Source/Client/Application/ApplicationWindow.cpp b/Source/Client/Application/ApplicationWindow.cpp index 94060d753..caf153e51 100644 --- a/Source/Client/Application/ApplicationWindow.cpp +++ b/Source/Client/Application/ApplicationWindow.cpp @@ -8,8 +8,8 @@ #include "Client/Input/Mouse.h" #include "Client/Mode/CLoginMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" -#include "Client/Timer.h" +#include "Client/Session/Session.h" +#include "Client/Application/Timer.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Party/AdventurerAgencyMgr.h" diff --git a/Source/Client/Application/ClientInfo.cpp b/Source/Client/Application/ClientInfo.cpp index c8af25fa9..c78363094 100644 --- a/Source/Client/Application/ClientInfo.cpp +++ b/Source/Client/Application/ClientInfo.cpp @@ -1,9 +1,9 @@ #include "Client/Application/ClientInfo.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "File/File.h" -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" #include #include diff --git a/Source/Client/ClientOptions.cpp b/Source/Client/Application/ClientOptions.cpp similarity index 93% rename from Source/Client/ClientOptions.cpp rename to Source/Client/Application/ClientOptions.cpp index 0e2c2175e..9da3c8210 100644 --- a/Source/Client/ClientOptions.cpp +++ b/Source/Client/Application/ClientOptions.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" // OFFSET: 0x0091BE20 // FUNCTION: fn_12610 diff --git a/Source/Client/Application/Launcher.cpp b/Source/Client/Application/Launcher.cpp index 999bb294f..feaeb752d 100644 --- a/Source/Client/Application/Launcher.cpp +++ b/Source/Client/Application/Launcher.cpp @@ -1,5 +1,5 @@ #include "Client/Application/Launcher.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" #include "Contents/Configuration/ServiceConfiguration.h" @@ -47,11 +47,11 @@ #include "Security/ThemidaMgr.h" #include "UI/Cooldowns/CooldownOwner.h" #include "UI/Party/UIRequestJoinPartyMgr.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Window/UIRegisterMgr.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Async/NMessageMgr.h" -#include "Utility/GGHashMgr.h" +#include "Utility/Hash/GGHashMgr.h" #include "Archive/GPakUpdate.h" #include "Archive/PakRegistry.h" #include "Client/Application/ApplicationWindow.h" @@ -61,9 +61,9 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/CLoginMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" -#include "Client/Timer.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" +#include "Client/Application/Timer.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Map/MapInfoMgr.h" #include "Contents/Tables/MessageTable.h" @@ -76,7 +76,7 @@ #include "Render/DeviceContext/DCSurface.h" #include "Render/Renderer.h" #include "Render/Textures/TextureCache.h" -#include "Resource/BinkRuntime.h" +#include "Resource/Audio/BinkRuntime.h" #include "Resource/Models/GrannyModelResource.h" #include "Resource/ResourceMgr.h" #include "UI/GameSettings/GameSettingsUI.h" diff --git a/Source/Client/Registry.cpp b/Source/Client/Application/Registry.cpp similarity index 63% rename from Source/Client/Registry.cpp rename to Source/Client/Application/Registry.cpp index 15911e632..502ea8afd 100644 --- a/Source/Client/Registry.cpp +++ b/Source/Client/Application/Registry.cpp @@ -1,4 +1,4 @@ -#include "Client/Registry.h" +#include "Client/Application/Registry.h" // STATIC: 0x01348F80 // GLOBAL: gl_21922 diff --git a/Source/Client/Application/Registry.h b/Source/Client/Application/Registry.h new file mode 100644 index 000000000..c73614712 --- /dev/null +++ b/Source/Client/Application/Registry.h @@ -0,0 +1,6 @@ +#ifndef RAGNAROK_SOURCE_CLIENT_APPLICATION_REGISTRY_H +#define RAGNAROK_SOURCE_CLIENT_APPLICATION_REGISTRY_H + +extern const char* g_subKey; + +#endif diff --git a/Source/Utility/RegistryKey.cpp b/Source/Client/Application/RegistryKey.cpp similarity index 96% rename from Source/Utility/RegistryKey.cpp rename to Source/Client/Application/RegistryKey.cpp index a709a55e0..e52ba3bd0 100644 --- a/Source/Utility/RegistryKey.cpp +++ b/Source/Client/Application/RegistryKey.cpp @@ -1,4 +1,4 @@ -#include "Utility/RegistryKey.h" +#include "Client/Application/RegistryKey.h" // OFFSET: 0x00AED000 // FUNCTION: fn_18150 diff --git a/Source/Utility/RegistryKey.h b/Source/Client/Application/RegistryKey.h similarity index 83% rename from Source/Utility/RegistryKey.h rename to Source/Client/Application/RegistryKey.h index a7f0dd65d..e5100a569 100644 --- a/Source/Utility/RegistryKey.h +++ b/Source/Client/Application/RegistryKey.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_REGISTRYKEY_H -#define RAGNAROK_SOURCE_UTILITY_REGISTRYKEY_H +#ifndef RAGNAROK_SOURCE_CLIENT_APPLICATION_REGISTRYKEY_H +#define RAGNAROK_SOURCE_CLIENT_APPLICATION_REGISTRYKEY_H #include diff --git a/Source/Client/Timer.cpp b/Source/Client/Application/Timer.cpp similarity index 95% rename from Source/Client/Timer.cpp rename to Source/Client/Application/Timer.cpp index af19418aa..7b36a6058 100644 --- a/Source/Client/Timer.cpp +++ b/Source/Client/Application/Timer.cpp @@ -1,4 +1,4 @@ -#include "Client/Timer.h" +#include "Client/Application/Timer.h" #include #include diff --git a/Source/Client/Timer.h b/Source/Client/Application/Timer.h similarity index 57% rename from Source/Client/Timer.h rename to Source/Client/Application/Timer.h index 166ca823b..b262db543 100644 --- a/Source/Client/Timer.h +++ b/Source/Client/Application/Timer.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_TIMER_H -#define RAGNAROK_SOURCE_CLIENT_TIMER_H +#ifndef RAGNAROK_SOURCE_CLIENT_APPLICATION_TIMER_H +#define RAGNAROK_SOURCE_CLIENT_APPLICATION_TIMER_H extern int g_frameskip; diff --git a/Source/Client/Application/UnhandledExceptionHandler.cpp b/Source/Client/Application/UnhandledExceptionHandler.cpp index a501a64c9..05cbe2290 100644 --- a/Source/Client/Application/UnhandledExceptionHandler.cpp +++ b/Source/Client/Application/UnhandledExceptionHandler.cpp @@ -3,7 +3,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Application/UnhandledExceptionHandler.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/Client/Input/Language.cpp b/Source/Client/Input/Language.cpp index 079bc5789..0c007bb61 100644 --- a/Source/Client/Input/Language.cpp +++ b/Source/Client/Input/Language.cpp @@ -11,10 +11,10 @@ #include "Utility/Text/TextTokens.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Lists/UIMemberListBox.h" -#include "UI/UICaptchaPreviewWnd.h" -#include "UI/UIRoundBoxTooltipWnd.h" -#include "UI/UIMacroDetectorWnd.h" -#include "UI/Window/UINewMakeCharWnd.h" +#include "UI/Macro/UICaptchaPreviewWnd.h" +#include "UI/Text/UIRoundBoxTooltipWnd.h" +#include "UI/Macro/UIMacroDetectorWnd.h" +#include "UI/Login/UINewMakeCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIWindow.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/EntityInit.cpp b/Source/Client/Mode/EntityInit.cpp similarity index 100% rename from Source/EntityInit.cpp rename to Source/Client/Mode/EntityInit.cpp diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index 42b166e23..d0bd6f747 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -11,9 +11,9 @@ #include "UI/GameSettings/TalkType.h" #include "Client/Mode/CLoginMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Npc.h" #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" @@ -42,7 +42,7 @@ #include "Render/Renderer.h" #include "Resource/World/TerrainResource.h" #include "Script/LuaScript.h" -#include "UI/UIBroadcastBalloon.h" +#include "UI/Text/UIBroadcastBalloon.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" @@ -51,7 +51,7 @@ #include "Utility/Text/FormatString.h" #include "Utility/Text/TextTokens.h" #include "Client/Application/Launcher.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "Contents/Quest/RenewQuestMgr.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/Skills/AutomaticSkills.h" @@ -61,10 +61,10 @@ #include "File/File.h" #include "Client/Stove/StoveMgr.h" #include "Contents/Events/ShowRankingScheduler.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "UI/Cooldowns/CooldownOwner.h" #include "Utility/Text/HexString.h" -#include "Client/Timer.h" +#include "Client/Application/Timer.h" #include "Contents/Map/MapSkyMgr.h" #include "Contents/Messenger/WhisperBlockMgr.h" #include "Contents/Tables/ForbiddenWords.h" @@ -72,12 +72,12 @@ #include "Client/Input/Language.h" #include "UI/Chat/UIChatRoomMakeWnd.h" #include "UI/Gauges/UIPcGage.h" -#include "Render/ScreenGeometry.h" +#include "Render/Projection/ScreenGeometry.h" #include "UI/Shop/UIMerchantShopMakeWnd.h" -#include "UI/UIRefiningWnd.h" -#include "UI/UIGradeEnchantWnd.h" +#include "UI/Items/UIRefiningWnd.h" +#include "UI/Items/UIGradeEnchantWnd.h" #include "UI/Items/UISwapEquipmentWnd.h" -#include "UI/Window/UIMonsterInfoWnd.h" +#include "UI/Monster/UIMonsterInfoWnd.h" #include "Contents/Clan/ClanInfo.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Items/SelectPackageItemMgr.h" @@ -87,15 +87,15 @@ #include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Tables/SimpleStringMgr.h" #include "File/ShortcutFilename.h" -#include "UI/Window/UICntWnd.h" -#include "UI/Window/UINormalMB.h" +#include "UI/Dialogs/UICntWnd.h" +#include "UI/Dialogs/UINormalMB.h" #include #include #include #include #include #include "Client/Application/ApplicationWindow.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Network/TextEncoding.h" #include "Resource/MSGSTRINGID.h" @@ -5507,8 +5507,8 @@ void CGameMode::InitializeCamera() { #include "UI/Text/UINameBalloonText.h" #include "UI/Text/UITransBalloonText.h" #include "Contents/Messenger/ClientMessenger.h" -#include "ActorPickNode.h" -#include "Client/Registry.h" +#include "Contents/Actors/ActorPickNode.h" +#include "Client/Application/Registry.h" #include "Contents/Schedule/CheckGDISchedule.h" #include "Contents/Schedule/TimeScheduler.h" #include "Render/Textures/TextureCache.h" @@ -5516,7 +5516,7 @@ void CGameMode::InitializeCamera() { #include "UI/Dialogs/UIWaitWnd.h" #include #include -#include "UI/Window/UIWordDisplayWnd.h" +#include "UI/Dialogs/UIWordDisplayWnd.h" class CPingLiveSchedule : public CSchedule { public: @@ -5551,7 +5551,7 @@ void CPingLiveSchedule::Process(const std::uint64_t& now) { } } -#include "Client/ModeFadeOut.h" +#include "Client/Mode/ModeFadeOut.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/RenderSystemBase.h" #include "Resource/ResourceMgr.h" @@ -6082,7 +6082,7 @@ static_assert(sizeof(GameModeStoredItemEntry) == 0x19); #include "Contents/Items/ItemNaming.h" #include "UI/Navigation/UINavigationV4Wnd.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "Contents/Effects/Core/EffectActor.h" #pragma pack(push, 1) @@ -7197,11 +7197,11 @@ void CGameMode::PlayItemUseEffect(int itemId, std::uint32_t aid) { #include "Contents/Sound/SoundMaker.h" #include "Contents/Movement/TerrainPathSearch.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" -#include "Network/GameTickPacket.h" +#include "Network/Packets/GameTickPacket.h" #include "UI/Buttons/UITextButton.h" -#include "UI/UIMacroUserInfoWnd.h" +#include "UI/Macro/UIMacroUserInfoWnd.h" #include "UI/Layout/SnapMgr.h" -#include "UI/Window/UIMileageWnd.h" +#include "UI/CashShop/UIMileageWnd.h" #include "UI/Window/UIWindowFactory.h" #include #include @@ -8731,13 +8731,13 @@ int CGameMode::ProcessGroundClick(int result) { #include "Client/Application/ApplicationMessages.h" -#include "Client/ModeFade.h" +#include "Client/Mode/ModeFade.h" #include "Contents/Actors/ActorNameCard.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Emblems/EmblemDataMgr.h" #include "Client/Stove/StovePCSDK.h" -#include "Render/ActionSpriteDrawing.h" -#include "Utility/GGHashMgr.h" +#include "Render/Drawing/ActionSpriteDrawing.h" +#include "Utility/Hash/GGHashMgr.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Ground/GroundGeometry.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Client/Mode/GameModeEquipWindow.cpp b/Source/Client/Mode/GameModeEquipWindow.cpp index a8349338c..55a372bfc 100644 --- a/Source/Client/Mode/GameModeEquipWindow.cpp +++ b/Source/Client/Mode/GameModeEquipWindow.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/CGameMode.h" #include "UI/Window/WindowId.h" #include "Client/Mode/EquipWindowLook.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index d7a1de6c1..6992d3685 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -9,8 +9,8 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Application/Launcher.h" #include "Client/Input/InputCharset.h" -#include "Client/Session.h" -#include "Client/Replay.h" +#include "Client/Session/Session.h" +#include "Client/Replay/Replay.h" #include "Contents/Achievement/AchievementMgr.h" #include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Clan/ClanInfo.h" @@ -45,10 +45,10 @@ #include "UI/GameSettings/GameSettingsUI.h" #include "UI/Rodex/UIRodexInboxWnd.h" #include "UI/Text/UITransBalloonText.h" -#include "UI/UIBarGraph.h" -#include "UI/UIGradeEnchantWnd.h" -#include "UI/Window/UIHomunInfoWnd.h" -#include "UI/Window/UISeekPartyWnd.h" +#include "UI/Gauges/UIBarGraph.h" +#include "UI/Items/UIGradeEnchantWnd.h" +#include "UI/Status/UIHomunInfoWnd.h" +#include "UI/Party/UISeekPartyWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Math/Vector3d.h" @@ -2481,7 +2481,7 @@ void CGameMode::ReceiveDdukddakBoxTest(const unsigned char* packet) { output.close(); } -#include "UI/UIBroadcastBalloon.h" +#include "UI/Text/UIBroadcastBalloon.h" #include diff --git a/Source/Client/Mode/GameModeItemLists.cpp b/Source/Client/Mode/GameModeItemLists.cpp index 79f3a76e4..7109b10e2 100644 --- a/Source/Client/Mode/GameModeItemLists.cpp +++ b/Source/Client/Mode/GameModeItemLists.cpp @@ -1,12 +1,12 @@ #include "Client/Mode/CGameMode.h" #include "UI/Window/WindowId.h" #include "Contents/Items/InventoryType.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/ClientState.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Pet/PetEvolutionMgr.h" -#include "UI/Item/UIItemStoreWnd.h" +#include "UI/Items/UIItemStoreWnd.h" #include "UI/Window/UIWindowMgr.h" #include diff --git a/Source/Client/Mode/GameModeMiniMap.cpp b/Source/Client/Mode/GameModeMiniMap.cpp index af0aa0421..1900f7129 100644 --- a/Source/Client/Mode/GameModeMiniMap.cpp +++ b/Source/Client/Mode/GameModeMiniMap.cpp @@ -2,17 +2,17 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Input/Mouse.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Map/TownInfoMgr.h" #include "File/File.h" #include "Contents/Actors/Pc.h" #include "Contents/Ground/TerrainHeight.h" #include "Contents/World/World.h" -#include "Render/ActionSpriteDrawing.h" +#include "Render/Drawing/ActionSpriteDrawing.h" #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/TextureCache.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Client/Mode/GameModeNames.cpp b/Source/Client/Mode/GameModeNames.cpp index 5a679a2b0..5b18fed9f 100644 --- a/Source/Client/Mode/GameModeNames.cpp +++ b/Source/Client/Mode/GameModeNames.cpp @@ -1,6 +1,6 @@ #include "Client/Application/Launcher.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Guild/GuildMgr.h" #include "File/File.h" diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index cdfa67e7d..2d9bbd077 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -9,9 +9,9 @@ #include "Client/Mode/CLoginMode.h" #include "Client/Mode/ModeEvents.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Client/Stove/StoveMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Item.h" @@ -60,25 +60,25 @@ #include "UI/Guild/UIGuild_Storage_Log.h" #include "UI/Rodex/UIRodexComposeWnd.h" #include "UI/Text/UITagTextViewer.h" -#include "UI/UICaptchaPreviewWnd.h" -#include "UI/UICaptchaRegisterWnd.h" -#include "UI/UIGradeEnchantWnd.h" -#include "UI/UILapineScrollBar.h" -#include "UI/UILapineUpgradeBoxWnd.h" -#include "UI/UIMacroBlackListCheckWnd.h" -#include "UI/UIMacroDetectorWnd.h" -#include "UI/UIMacroUserInfoWnd.h" -#include "UI/UIRefiningWnd.h" +#include "UI/Macro/UICaptchaPreviewWnd.h" +#include "UI/Macro/UICaptchaRegisterWnd.h" +#include "UI/Items/UIGradeEnchantWnd.h" +#include "UI/Items/UILapineScrollBar.h" +#include "UI/Items/UILapineUpgradeBoxWnd.h" +#include "UI/Macro/UIMacroBlackListCheckWnd.h" +#include "UI/Macro/UIMacroDetectorWnd.h" +#include "UI/Macro/UIMacroUserInfoWnd.h" +#include "UI/Items/UIRefiningWnd.h" #include "UI/Status/UIStatusWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIRodexContentsWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Rodex/UIRodexContentsWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" #include "Utility/Math/AffineMatrix.h" -#include "UI/UIBroadcastBalloon.h" +#include "UI/Text/UIBroadcastBalloon.h" #include "UI/Chat/UINewChatWnd.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/UITextViewer.h" #include #include @@ -2780,11 +2780,11 @@ void CGameMode::ReceiveExpGainNotice(const unsigned char* data) { g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(text.c_str()), color, 18, 0, 0); } -#include "UI/Item/UIItemStoreWnd.h" +#include "UI/Items/UIItemStoreWnd.h" #include "UI/Shop/UIMerchantShopMakeWnd.h" #include "UI/Text/UIStaticText.h" -#include "UI/UIBarGraph.h" -#include "UI/Window/UIBasicInfoWnd.h" +#include "UI/Gauges/UIBarGraph.h" +#include "UI/Status/UIBasicInfoWnd.h" #include "Contents/Effects/Particles/EmitterEffect.h" #pragma pack(push, 1) diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index aaf7a0acf..0d3a5cd6d 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -17,14 +17,14 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/EquipWindowLook.h" -#include "UI/UIMacroDetectorWnd.h" -#include "UI/UIMacroBlackListCheckWnd.h" -#include "UI/UILapineScrollBar.h" -#include "UI/UICaptchaPreviewWnd.h" +#include "UI/Macro/UIMacroDetectorWnd.h" +#include "UI/Macro/UIMacroBlackListCheckWnd.h" +#include "UI/Items/UILapineScrollBar.h" +#include "UI/Macro/UICaptchaPreviewWnd.h" #include "Client/Mode/ModeMgr.h" -#include "Client/ModeFadeOut.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Mode/ModeFadeOut.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/MousePointer.h" @@ -61,21 +61,21 @@ #include "Network/TextEncoding.h" #include "Contents/Events/SpecialPopupMgr.h" #include "UI/Text/TextMarkup.h" -#include "UI/Item/UIItemStoreWnd.h" +#include "UI/Items/UIItemStoreWnd.h" #include "UI/Text/UIStaticText.h" #include "UI/Cooldowns/CooldownOwner.h" -#include "UI/UIBarGraph.h" -#include "UI/UIBroadcastBalloon.h" -#include "UI/Window/UIHomunInfoWnd.h" +#include "UI/Gauges/UIBarGraph.h" +#include "UI/Text/UIBroadcastBalloon.h" +#include "UI/Status/UIHomunInfoWnd.h" #include "Contents/Sound/SoundMgr.h" #include "UI/Status/UIStatusWnd.h" -#include "UI/Window/UIBasicInfoWnd.h" +#include "UI/Status/UIBasicInfoWnd.h" #include "UI/Shop/UIMerchantItemMyShopWnd.h" #include "UI/Shop/UIMerchantShopMakeWnd.h" #include "UI/Shop/UIMerchantItemShopWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/UIRefiningWnd.h" +#include "UI/Items/UIRefiningWnd.h" #include "UI/Dialogs/UIWaitWnd.h" #include "Utility/Math/Vector3d.h" #include "Utility/Text/FormatString.h" @@ -91,7 +91,7 @@ #include "Contents/Schedule/EmotionSchedule.h" #include "Contents/Schedule/TimeScheduler.h" #include "Contents/Messenger/WhisperBlockMgr.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextWrapping.h" #include "UI/Text/UITextViewer.h" #include "Utility/Cipher/XorBytes.h" @@ -118,13 +118,13 @@ #include "Contents/Party/PartyJoinResult.h" #include "Security/NProtectGameGuardMgr.h" #include "Contents/EntryQueue/EntryQueueMgr.h" -#include "UI/Window/UIBalloonOpenBtn.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Buttons/UIBalloonOpenBtn.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Client/Application/ErrorDialog.h" #include "UI/Items/UIItemCollectionWnd.h" #include "Contents/Map/MapPropertyMgr.h" #include -#include "UI/Window/UIChatRoomWnd.h" +#include "UI/Chat/UIChatRoomWnd.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "Contents/Clan/ClanInfo.h" #include "Contents/Navigation/NavigationManager.h" @@ -132,17 +132,17 @@ #include "UI/Edit/UIEditCtrl.h" #include "Client/Mode/CLoginMode.h" #include "Contents/Jobs/JobInheritance.h" -#include "UI/Item/UIParaItemShopWnd.h" +#include "UI/Items/UIParaItemShopWnd.h" #include "Script/LuaScript.h" #include "Contents/Actors/Item.h" #include "Contents/ClientState.h" #include "Contents/Items/ClientItemLists.h" #include "Contents/Sound/SoundMaker.h" #include "Contents/Pet/PetEvolutionMgr.h" -#include "UI/Window/UIPetInfoWnd.h" +#include "UI/Status/UIPetInfoWnd.h" #include "UI/Items/UIItemIdentifyWnd.h" #include "UI/Chat/UIChatRoomTitle.h" -#include "Network/ActorNamePacket.h" +#include "Network/Packets/ActorNamePacket.h" #include "UI/Guild/UIGuild_Storage_Log.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Ground/TerrainHeight.h" diff --git a/Source/Client/Mode/GameModeReplay.cpp b/Source/Client/Mode/GameModeReplay.cpp index 9de85a36e..a5b12457a 100644 --- a/Source/Client/Mode/GameModeReplay.cpp +++ b/Source/Client/Mode/GameModeReplay.cpp @@ -1,5 +1,5 @@ #include "Client/Mode/CGameMode.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include #include diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp index 31a3d8431..1d7634143 100644 --- a/Source/Client/Mode/LoginMode.cpp +++ b/Source/Client/Mode/LoginMode.cpp @@ -6,7 +6,7 @@ #include "Contents/Configuration/ServiceEnums.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/ModeResultEnums.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Client/Mode/CGameMode.h" #include "Client/Application/ApplicationMessages.h" #include "Client/Application/ApplicationWindow.h" @@ -15,12 +15,12 @@ #include "Archive/PakRegistry.h" #include "Client/Input/Mouse.h" #include "Client/Stove/StoveMgr.h" -#include "Client/ModeFadeOut.h" +#include "Client/Mode/ModeFadeOut.h" #include "Client/Application/ErrorDialog.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" -#include "Client/Replay.h" -#include "Client/Timer.h" +#include "Client/Session/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Application/Timer.h" #include "Client/Input/InputCharset.h" #include "Client/Stove/StovePCSDK.h" #include "Contents/Async/AsyncWorkMgr.h" @@ -43,25 +43,25 @@ #include "Render/RenderSystemBase.h" #include "Render/Renderer.h" #include "Resource/ResourceMgr.h" -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" #include "Resource/ResourcePreload.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Security/NProtectGameGuardMgr.h" #include "UI/Buttons/UITextButton.h" -#include "UI/UIBartermarketWnd.h" +#include "UI/Shop/UIBartermarketWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Dialogs/UIPasswordWnd.h" +#include "UI/Login/UIPasswordWnd.h" #include "UI/Dialogs/UIWaitWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UISelCharForUServerWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Login/UISelCharForUServerWnd.h" #include "Utility/Async/NAsyncWorkMgr.h" #include "Utility/Cipher/XorBytes.h" -#include "Utility/GGHashMgr.h" +#include "Utility/Hash/GGHashMgr.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/TextTokens.h" #include "Client/Mode/CMode.h" -#include "Client/Registry.h" +#include "Client/Application/Registry.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/RenderObject.h" #include "Contents/CashEmotion/CashEmotionMgr.h" @@ -72,13 +72,13 @@ #include "Contents/Rodex/RodexMailStore.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" -#include "Network/ExecutableDigestPacket.h" +#include "Network/Packets/ExecutableDigestPacket.h" #include "Security/ReassemblyPacketMgr.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Lists/UIListBox.h" -#include "UI/Lists/UIReplayListBox.h" -#include "UI/Window/UISelectReplayDataWnd.h" -#include "UI/Window/UISelectServerWnd.h" +#include "UI/Replay/UIReplayListBox.h" +#include "UI/Replay/UISelectReplayDataWnd.h" +#include "UI/Login/UISelectServerWnd.h" #include "Utility/Cipher/AES.h" #include "Utility/Cipher/Rijndael.h" diff --git a/Source/Client/Mode/LoginModeNotices.cpp b/Source/Client/Mode/LoginModeNotices.cpp index 3fec84ff1..6e6bb2581 100644 --- a/Source/Client/Mode/LoginModeNotices.cpp +++ b/Source/Client/Mode/LoginModeNotices.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/ModeMessage.h" #include "Network/Packets/NoticeEnums.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" diff --git a/Source/Client/ModeBaseEvents.cpp b/Source/Client/Mode/ModeBaseEvents.cpp similarity index 100% rename from Source/Client/ModeBaseEvents.cpp rename to Source/Client/Mode/ModeBaseEvents.cpp diff --git a/Source/Client/ModeCursorDrawing.cpp b/Source/Client/Mode/ModeCursorDrawing.cpp similarity index 99% rename from Source/Client/ModeCursorDrawing.cpp rename to Source/Client/Mode/ModeCursorDrawing.cpp index 9a2c76863..f4db3b548 100644 --- a/Source/Client/ModeCursorDrawing.cpp +++ b/Source/Client/Mode/ModeCursorDrawing.cpp @@ -6,7 +6,7 @@ #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/SpritePixels.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Client/Mode/ModeDragState.cpp b/Source/Client/Mode/ModeDragState.cpp index 3a86659db..515e474dc 100644 --- a/Source/Client/Mode/ModeDragState.cpp +++ b/Source/Client/Mode/ModeDragState.cpp @@ -1,6 +1,6 @@ #include "Client/Mode/ModeDragState.h" #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/BarterMarketItemMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" diff --git a/Source/Client/ModeFade.cpp b/Source/Client/Mode/ModeFade.cpp similarity index 89% rename from Source/Client/ModeFade.cpp rename to Source/Client/Mode/ModeFade.cpp index dc2c0f1c3..be5b4bf9d 100644 --- a/Source/Client/ModeFade.cpp +++ b/Source/Client/Mode/ModeFade.cpp @@ -1,9 +1,9 @@ -#include "Client/ModeFade.h" +#include "Client/Mode/ModeFade.h" #include "Client/Mode/CMode.h" #include "Contents/Sound/SoundMgr.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include diff --git a/Source/Client/Mode/ModeFade.h b/Source/Client/Mode/ModeFade.h new file mode 100644 index 000000000..9f6cf6d2b --- /dev/null +++ b/Source/Client/Mode/ModeFade.h @@ -0,0 +1,8 @@ +#ifndef RAGNAROK_SOURCE_CLIENT_MODE_MODEFADE_H +#define RAGNAROK_SOURCE_CLIENT_MODE_MODEFADE_H + +#include + +extern std::uint32_t g_modeFadeTick; + +#endif diff --git a/Source/Client/ModeFadeOut.cpp b/Source/Client/Mode/ModeFadeOut.cpp similarity index 87% rename from Source/Client/ModeFadeOut.cpp rename to Source/Client/Mode/ModeFadeOut.cpp index f0b548453..ec6406ccb 100644 --- a/Source/Client/ModeFadeOut.cpp +++ b/Source/Client/Mode/ModeFadeOut.cpp @@ -1,12 +1,12 @@ -#include "Client/ModeFadeOut.h" -#include "Client/ModeFade.h" +#include "Client/Mode/ModeFadeOut.h" +#include "Client/Mode/ModeFade.h" #include "Contents/Sound/SoundMgr.h" -#include "Render/BitmapDrawing.h" +#include "Render/Drawing/BitmapDrawing.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include diff --git a/Source/Client/ModeFadeOut.h b/Source/Client/Mode/ModeFadeOut.h similarity index 73% rename from Source/Client/ModeFadeOut.h rename to Source/Client/Mode/ModeFadeOut.h index 8be082e39..13167fc6e 100644 --- a/Source/Client/ModeFadeOut.h +++ b/Source/Client/Mode/ModeFadeOut.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_MODEFADEOUT_H -#define RAGNAROK_SOURCE_CLIENT_MODEFADEOUT_H +#ifndef RAGNAROK_SOURCE_CLIENT_MODE_MODEFADEOUT_H +#define RAGNAROK_SOURCE_CLIENT_MODE_MODEFADEOUT_H #include diff --git a/Source/Client/Mode/ModeLifetime.cpp b/Source/Client/Mode/ModeLifetime.cpp index 02fe7b289..f6ed852e6 100644 --- a/Source/Client/Mode/ModeLifetime.cpp +++ b/Source/Client/Mode/ModeLifetime.cpp @@ -1,5 +1,5 @@ #include "Client/Mode/CMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" // OFFSET: 0x00AD5290 diff --git a/Source/Client/ModeScreenshot.cpp b/Source/Client/Mode/ModeScreenshot.cpp similarity index 98% rename from Source/Client/ModeScreenshot.cpp rename to Source/Client/Mode/ModeScreenshot.cpp index a0bd89801..185f5a982 100644 --- a/Source/Client/ModeScreenshot.cpp +++ b/Source/Client/Mode/ModeScreenshot.cpp @@ -1,9 +1,9 @@ -#include "Client/ModeScreenshot.h" +#include "Client/Mode/ModeScreenshot.h" #include "UI/Window/UIEnums.h" #include "Client/Application/Launcher.h" #include "Client/Mode/CMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Renderer.h" diff --git a/Source/Client/Mode/ModeScreenshot.h b/Source/Client/Mode/ModeScreenshot.h new file mode 100644 index 000000000..20c4af310 --- /dev/null +++ b/Source/Client/Mode/ModeScreenshot.h @@ -0,0 +1,8 @@ +#ifndef RAGNAROK_SOURCE_CLIENT_MODE_MODESCREENSHOT_H +#define RAGNAROK_SOURCE_CLIENT_MODE_MODESCREENSHOT_H + +#include + +void SanitizeScreenshotName(std::string& name); + +#endif diff --git a/Source/Client/Mode/ModeTooltip.cpp b/Source/Client/Mode/ModeTooltip.cpp index 668e8edb0..616ccb20b 100644 --- a/Source/Client/Mode/ModeTooltip.cpp +++ b/Source/Client/Mode/ModeTooltip.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/CMode.h" #include "Render/Renderer.h" #include "UI/Text/UITransBalloonText.h" diff --git a/Source/Client/ModeTransitions.cpp b/Source/Client/Mode/ModeTransitions.cpp similarity index 100% rename from Source/Client/ModeTransitions.cpp rename to Source/Client/Mode/ModeTransitions.cpp diff --git a/Source/Client/ModeFade.h b/Source/Client/ModeFade.h deleted file mode 100644 index 9e8cac5b8..000000000 --- a/Source/Client/ModeFade.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_MODEFADE_H -#define RAGNAROK_SOURCE_CLIENT_MODEFADE_H - -#include - -extern std::uint32_t g_modeFadeTick; - -#endif diff --git a/Source/Client/ModeScreenshot.h b/Source/Client/ModeScreenshot.h deleted file mode 100644 index 71a12506e..000000000 --- a/Source/Client/ModeScreenshot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_MODESCREENSHOT_H -#define RAGNAROK_SOURCE_CLIENT_MODESCREENSHOT_H - -#include - -void SanitizeScreenshotName(std::string& name); - -#endif diff --git a/Source/Client/Registry.h b/Source/Client/Registry.h deleted file mode 100644 index a07e4c6db..000000000 --- a/Source/Client/Registry.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_REGISTRY_H -#define RAGNAROK_SOURCE_CLIENT_REGISTRY_H - -extern const char* g_subKey; - -#endif diff --git a/Source/Client/Replay.cpp b/Source/Client/Replay/Replay.cpp similarity index 99% rename from Source/Client/Replay.cpp rename to Source/Client/Replay/Replay.cpp index 22e1d4221..27adc76f8 100644 --- a/Source/Client/Replay.cpp +++ b/Source/Client/Replay/Replay.cpp @@ -1,9 +1,9 @@ -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "UI/Window/WindowId.h" #include "Network/Packets/PacketId.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Skills/SkillInfo.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include #include #include diff --git a/Source/Client/Replay.h b/Source/Client/Replay/Replay.h similarity index 98% rename from Source/Client/Replay.h rename to Source/Client/Replay/Replay.h index 46deab2f5..c69f15452 100644 --- a/Source/Client/Replay.h +++ b/Source/Client/Replay/Replay.h @@ -1,6 +1,6 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_REPLAY_H -#define RAGNAROK_SOURCE_CLIENT_REPLAY_H -#include "Client/ReplayRecordOption.h" +#ifndef RAGNAROK_SOURCE_CLIENT_REPLAY_REPLAY_H +#define RAGNAROK_SOURCE_CLIENT_REPLAY_REPLAY_H +#include "Client/Replay/ReplayRecordOption.h" #include #include diff --git a/Source/Client/ReplayControl.cpp b/Source/Client/Replay/ReplayControl.cpp similarity index 96% rename from Source/Client/ReplayControl.cpp rename to Source/Client/Replay/ReplayControl.cpp index 905ddb623..841695780 100644 --- a/Source/Client/ReplayControl.cpp +++ b/Source/Client/Replay/ReplayControl.cpp @@ -1,4 +1,4 @@ -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" // OFFSET: 0x00B844C0 // FUNCTION: fn_19316 diff --git a/Source/Client/ReplayPacketRecorder.cpp b/Source/Client/Replay/ReplayPacketRecorder.cpp similarity index 99% rename from Source/Client/ReplayPacketRecorder.cpp rename to Source/Client/Replay/ReplayPacketRecorder.cpp index f26ceacf2..58c288c07 100644 --- a/Source/Client/ReplayPacketRecorder.cpp +++ b/Source/Client/Replay/ReplayPacketRecorder.cpp @@ -1,6 +1,6 @@ #include "Client/Mode/ModeDragState.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Network/Packets/PacketLengths.h" #include "Network/Packets/PacketId.h" #include "UI/Window/UIWindow.h" diff --git a/Source/Client/ReplayRecordOption.h b/Source/Client/Replay/ReplayRecordOption.h similarity index 80% rename from Source/Client/ReplayRecordOption.h rename to Source/Client/Replay/ReplayRecordOption.h index eb38356b4..48f7a73dd 100644 --- a/Source/Client/ReplayRecordOption.h +++ b/Source/Client/Replay/ReplayRecordOption.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_REPLAYRECORDOPTION_H -#define RAGNAROK_SOURCE_CLIENT_REPLAYRECORDOPTION_H +#ifndef RAGNAROK_SOURCE_CLIENT_REPLAY_REPLAYRECORDOPTION_H +#define RAGNAROK_SOURCE_CLIENT_REPLAY_REPLAYRECORDOPTION_H #include diff --git a/Source/Client/Session.cpp b/Source/Client/Session/Session.cpp similarity index 99% rename from Source/Client/Session.cpp rename to Source/Client/Session/Session.cpp index 60942e21d..3ab5d01cf 100644 --- a/Source/Client/Session.cpp +++ b/Source/Client/Session/Session.cpp @@ -1,10 +1,10 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Contents/CombatTypes.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Client/Mode/CGameMode.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Effects/Core/EffectActor.h" @@ -19,7 +19,7 @@ #include "Contents/Actors/Pc.h" #include "Contents/Effects/Core/RagEffect.h" #include "Contents/Skills/ClientSkills.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Contents/Messenger/ClientMessenger.h" #include "File/File.h" #include "Network/Connection/Connection.h" @@ -27,7 +27,7 @@ #include "Network/TextEncoding.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/Jobs/JobInheritance.h" -#include "UI/Window/UIBasicInfoWnd.h" +#include "UI/Status/UIBasicInfoWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIWindow.h" #include "Contents/Configuration/ServiceOptions.h" @@ -49,7 +49,7 @@ #include "Contents/Tables/SimpleStringMgr.h" #include "File/CommonObject.h" #include "Contents/World/WorldViewData.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include "Contents/Achievement/AchievementMgr.h" #include "Contents/Events/CheckAttendanceMgr.h" #include "Contents/Items/BarterMarketItemMgr.h" diff --git a/Source/Client/Session.h b/Source/Client/Session/Session.h similarity index 99% rename from Source/Client/Session.h rename to Source/Client/Session/Session.h index 5e23ef88d..95f62d864 100644 --- a/Source/Client/Session.h +++ b/Source/Client/Session/Session.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CLIENT_SESSION_H -#define RAGNAROK_SOURCE_CLIENT_SESSION_H +#ifndef RAGNAROK_SOURCE_CLIENT_SESSION_SESSION_H +#define RAGNAROK_SOURCE_CLIENT_SESSION_SESSION_H #include "Render/Renderer.h" #include "Contents/InstantVar.h" @@ -11,7 +11,7 @@ #include "Contents/Skills/PlayerSkillBundle.h" #include "Contents/Store/MCStoreInfoBackup.h" #include "Contents/UserData/NormalItemSlots.h" -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" #include "UI/Cooldowns/CooldownState.h" #include "UI/Shortcuts/ShortcutCooldowns.h" diff --git a/Source/Client/SessionAchievements.cpp b/Source/Client/Session/SessionAchievements.cpp similarity index 99% rename from Source/Client/SessionAchievements.cpp rename to Source/Client/Session/SessionAchievements.cpp index cd888e9b2..46fbf6880 100644 --- a/Source/Client/SessionAchievements.cpp +++ b/Source/Client/Session/SessionAchievements.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Achievement/AchievementMgr.h" #include "Contents/Jobs/JobInheritance.h" #include "UI/Window/UIWindow.h" diff --git a/Source/Client/SessionParty.cpp b/Source/Client/Session/SessionParty.cpp similarity index 95% rename from Source/Client/SessionParty.cpp rename to Source/Client/Session/SessionParty.cpp index 91954eae9..75547c10a 100644 --- a/Source/Client/SessionParty.cpp +++ b/Source/Client/Session/SessionParty.cpp @@ -1,6 +1,6 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/World/World.h" // OFFSET: 0x00E1DEC0 diff --git a/Source/Client/SessionPredicates.cpp b/Source/Client/Session/SessionPredicates.cpp similarity index 98% rename from Source/Client/SessionPredicates.cpp rename to Source/Client/Session/SessionPredicates.cpp index 423a3951b..5b36854a6 100644 --- a/Source/Client/SessionPredicates.cpp +++ b/Source/Client/Session/SessionPredicates.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/CGameMode.h" #include "Contents/Skills/SkillId.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" diff --git a/Source/Client/SessionState.cpp b/Source/Client/Session/SessionState.cpp similarity index 99% rename from Source/Client/SessionState.cpp rename to Source/Client/Session/SessionState.cpp index 973328b82..1b30f7115 100644 --- a/Source/Client/SessionState.cpp +++ b/Source/Client/Session/SessionState.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" @@ -19,7 +19,7 @@ #include "Contents/World/World.h" #include "Script/LuaScript.h" #include "UI/Items/UIEquipWnd.h" -#include "UI/Window/UIBasicInfoWnd.h" +#include "UI/Status/UIBasicInfoWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Client/Stove/StoveMgr.cpp b/Source/Client/Stove/StoveMgr.cpp index 12bc0497d..5ae23fd0f 100644 --- a/Source/Client/Stove/StoveMgr.cpp +++ b/Source/Client/Stove/StoveMgr.cpp @@ -2,16 +2,16 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Client/Application/Launcher.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Stove/StoveMgr.h" #include "Client/Stove/StovePCSDK.h" #include "Network/TextEncoding.h" -#include "UI/UIBroadcastBalloon.h" +#include "UI/Text/UIBroadcastBalloon.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/Achievement/AchievementMgr.cpp b/Source/Contents/Achievement/AchievementMgr.cpp index fac267eec..93a657dde 100644 --- a/Source/Contents/Achievement/AchievementMgr.cpp +++ b/Source/Contents/Achievement/AchievementMgr.cpp @@ -1,5 +1,5 @@ #include "Contents/Achievement/AchievementMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/NLuaState.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Actors/ActorGeometry.cpp b/Source/Contents/Actors/ActorGeometry.cpp index 21c620071..c70dc6955 100644 --- a/Source/Contents/Actors/ActorGeometry.cpp +++ b/Source/Contents/Actors/ActorGeometry.cpp @@ -1,13 +1,13 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/World/World.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/ActorPickNode.cpp b/Source/Contents/Actors/ActorPickNode.cpp similarity index 98% rename from Source/ActorPickNode.cpp rename to Source/Contents/Actors/ActorPickNode.cpp index 674bf8cb1..b8696465d 100644 --- a/Source/ActorPickNode.cpp +++ b/Source/Contents/Actors/ActorPickNode.cpp @@ -1,4 +1,4 @@ -#include "ActorPickNode.h" +#include "Contents/Actors/ActorPickNode.h" #include "Contents/Camera/Camera.h" #include "Contents/Movement/TerrainPathSearch.h" #include "Client/Mode/CGameMode.h" @@ -9,7 +9,7 @@ #include "Contents/World/World.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Resource/World/TerrainResource.h" #include diff --git a/Source/ActorPickNode.h b/Source/Contents/Actors/ActorPickNode.h similarity index 93% rename from Source/ActorPickNode.h rename to Source/Contents/Actors/ActorPickNode.h index 8e5708a4f..d816bb335 100644 --- a/Source/ActorPickNode.h +++ b/Source/Contents/Actors/ActorPickNode.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_ACTORPICKNODE_H -#define RAGNAROK_SOURCE_ACTORPICKNODE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_ACTORPICKNODE_H +#define RAGNAROK_SOURCE_CONTENTS_ACTORS_ACTORPICKNODE_H #include #include diff --git a/Source/Contents/Actors/CharacterRender.cpp b/Source/Contents/Actors/CharacterRender.cpp index 59fb0ea83..07aa3a977 100644 --- a/Source/Contents/Actors/CharacterRender.cpp +++ b/Source/Contents/Actors/CharacterRender.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" @@ -14,11 +14,11 @@ #include "Render/DeviceContext/DCSurface.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" -#include "Resource/ImfResource.h" -#include "Resource/PaletteResource.h" +#include "Resource/Sprites/ImfResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Actors/GameActor.cpp b/Source/Contents/Actors/GameActor.cpp index ee6a4bc6a..f017eb3a4 100644 --- a/Source/Contents/Actors/GameActor.cpp +++ b/Source/Contents/Actors/GameActor.cpp @@ -7,7 +7,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorNameCard.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GroundScope.h" diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index f962efc83..c3e7b8948 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -10,8 +10,8 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Contents/Camera/Camera.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/World/World.h" #include "Contents/Actors/RenderObject.h" @@ -21,12 +21,12 @@ #include "Render/DeviceContext/DCSurface.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" -#include "Render/TextureQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" @@ -57,11 +57,11 @@ #include "UI/Buttons/UIButton.h" #include "UI/Gauges/UIPcGage.h" #include "UI/Shop/UIMerchantShopTitle.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/UITextViewer.h" #include "UI/Text/UITransBalloonText.h" -#include "UI/Window/UIBalloonOpenBtn.h" -#include "UI/Window/UIMessageBox.h" +#include "UI/Buttons/UIBalloonOpenBtn.h" +#include "UI/Dialogs/UIMessageBox.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include diff --git a/Source/Contents/Actors/GroundScope.cpp b/Source/Contents/Actors/GroundScope.cpp index 3341f48af..b2e5b028f 100644 --- a/Source/Contents/Actors/GroundScope.cpp +++ b/Source/Contents/Actors/GroundScope.cpp @@ -10,7 +10,7 @@ #include "Contents/World/World.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/TextureCache.h" #include diff --git a/Source/Contents/Actors/Item.cpp b/Source/Contents/Actors/Item.cpp index fac37f0df..056094c8a 100644 --- a/Source/Contents/Actors/Item.cpp +++ b/Source/Contents/Actors/Item.cpp @@ -1,10 +1,10 @@ #include "Contents/Actors/Item.h" -#include "ActorPickNode.h" +#include "Contents/Actors/ActorPickNode.h" #include "Client/Mode/CGameMode.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Effects/Core/EffectLists.h" #include "Contents/Effects/Core/RagEffect.h" diff --git a/Source/Contents/Actors/MercenaryAI.cpp b/Source/Contents/Actors/MercenaryAI.cpp index 708a91d02..9e5852075 100644 --- a/Source/Contents/Actors/MercenaryAI.cpp +++ b/Source/Contents/Actors/MercenaryAI.cpp @@ -5,7 +5,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" diff --git a/Source/Contents/Actors/Player.cpp b/Source/Contents/Actors/Player.cpp index 5fb1e002f..2a863decb 100644 --- a/Source/Contents/Actors/Player.cpp +++ b/Source/Contents/Actors/Player.cpp @@ -9,7 +9,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/AttackMotion.h" #include "Contents/Actors/Item.h" @@ -49,13 +49,13 @@ #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" -#include "Render/TextureQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/SpritePixels.h" #include "Render/Textures/Texture.h" #include "Resource/Models/GrannyModelResource.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Actors/RenderObject.cpp b/Source/Contents/Actors/RenderObject.cpp index c69427cac..11609ad9d 100644 --- a/Source/Contents/Actors/RenderObject.cpp +++ b/Source/Contents/Actors/RenderObject.cpp @@ -6,12 +6,12 @@ #include "Contents/Skills/SkillId.h" #include "Contents/Actors/GrannyGameActor.h" #include "Contents/Actors/RenderObject.h" -#include "ActorPickNode.h" +#include "Contents/Actors/ActorPickNode.h" #include "Contents/Effects/Core/MsgEffect.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" -#include "Client/Replay.h" +#include "Client/Session/Session.h" +#include "Client/Replay/Replay.h" #include "Contents/Camera/Camera.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/CharacterRender.h" @@ -45,12 +45,12 @@ #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Renderer.h" -#include "Render/SpriteQuad.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/SpriteQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Resource/Models/GrannyModelResource.h" -#include "Resource/EmblemResource.h" +#include "Resource/Bitmap/EmblemResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Actors/RenderObjectState.cpp b/Source/Contents/Actors/RenderObjectState.cpp index f47f99c3a..076471a07 100644 --- a/Source/Contents/Actors/RenderObjectState.cpp +++ b/Source/Contents/Actors/RenderObjectState.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/RenderObjectState.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Actors/Resources/BodyResources.cpp b/Source/Contents/Actors/Resources/BodyResources.cpp index 52c0b2964..75e06ec36 100644 --- a/Source/Contents/Actors/Resources/BodyResources.cpp +++ b/Source/Contents/Actors/Resources/BodyResources.cpp @@ -1,5 +1,5 @@ -#include "Client/Session.h" -#include "Utility/EncryptedName.h" +#include "Client/Session/Session.h" +#include "Utility/Cipher/EncryptedName.h" #include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Contents/Jobs/JobId.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/Actors/Resources/EquipmentResources.cpp b/Source/Contents/Actors/Resources/EquipmentResources.cpp index 14dd24750..cd5f1ff01 100644 --- a/Source/Contents/Actors/Resources/EquipmentResources.cpp +++ b/Source/Contents/Actors/Resources/EquipmentResources.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Resource/ResourceMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Actors/Resources/HeadResources.cpp b/Source/Contents/Actors/Resources/HeadResources.cpp index ec8b4d1b9..27c976502 100644 --- a/Source/Contents/Actors/Resources/HeadResources.cpp +++ b/Source/Contents/Actors/Resources/HeadResources.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobId.h" #include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Actors/Resources/MonsterResources.cpp b/Source/Contents/Actors/Resources/MonsterResources.cpp index 667414364..851d80aea 100644 --- a/Source/Contents/Actors/Resources/MonsterResources.cpp +++ b/Source/Contents/Actors/Resources/MonsterResources.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Resource/ResourceMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Actors/Resources/RobeResources.cpp b/Source/Contents/Actors/Resources/RobeResources.cpp index baba2e013..3be2ade60 100644 --- a/Source/Contents/Actors/Resources/RobeResources.cpp +++ b/Source/Contents/Actors/Resources/RobeResources.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Resource/ResourceMgr.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Actors/Resources/StatusIconImages.cpp b/Source/Contents/Actors/Resources/StatusIconImages.cpp index b6cb259de..5df2adaa8 100644 --- a/Source/Contents/Actors/Resources/StatusIconImages.cpp +++ b/Source/Contents/Actors/Resources/StatusIconImages.cpp @@ -1,5 +1,5 @@ #include "Contents/Effects/Core/EffectTypes.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/LuaScript.h" #include diff --git a/Source/Contents/Actors/Skill.cpp b/Source/Contents/Actors/Skill.cpp index a476ece53..f7b13721f 100644 --- a/Source/Contents/Actors/Skill.cpp +++ b/Source/Contents/Actors/Skill.cpp @@ -3,12 +3,12 @@ #include "Contents/Skills/SkillId.h" #include "Contents/Skills/SkillUnitId.h" -#include "ActorPickNode.h" +#include "Contents/Actors/ActorPickNode.h" #include "Contents/Skills/GraffiSkill.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Effects/Skills/CaneOfEvilEyeEffect.h" #include "Contents/Effects/Particles/EZ2STREffect.h" @@ -24,7 +24,7 @@ #include "Resource/Models/ModelResource.h" #include "Resource/ResourceMgr.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Resource/World/TerrainResource.h" #include "UI/Text/UITransBalloonText.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Actors/SpriteDrawingPolicy.cpp b/Source/Contents/Actors/SpriteDrawingPolicy.cpp index 1df26284d..18735fc77 100644 --- a/Source/Contents/Actors/SpriteDrawingPolicy.cpp +++ b/Source/Contents/Actors/SpriteDrawingPolicy.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/CharacterRender.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/AdventureGuide/AdventureGuideMgr.cpp b/Source/Contents/AdventureGuide/AdventureGuideMgr.cpp index beba1c789..83b99a82f 100644 --- a/Source/Contents/AdventureGuide/AdventureGuideMgr.cpp +++ b/Source/Contents/AdventureGuide/AdventureGuideMgr.cpp @@ -1,6 +1,6 @@ #include "Contents/AdventureGuide/AdventureGuideMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/JobCodeForItem.h" #include "Script/LuaScript.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Camera/CameraSmoothing.cpp b/Source/Contents/Camera/CameraSmoothing.cpp index f111407ed..58e432933 100644 --- a/Source/Contents/Camera/CameraSmoothing.cpp +++ b/Source/Contents/Camera/CameraSmoothing.cpp @@ -3,7 +3,7 @@ #include "Contents/Configuration/ServiceOptions.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/ScalarConversion.h" diff --git a/Source/Contents/CashEmotion/CashEmotionMgr.cpp b/Source/Contents/CashEmotion/CashEmotionMgr.cpp index 335f8ee69..0db18508b 100644 --- a/Source/Contents/CashEmotion/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotion/CashEmotionMgr.cpp @@ -2,19 +2,19 @@ #include "Client/Mode/ModeMessage.h" #include "Render/DeviceContext/DCSurface.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "UI/Buttons/UISpriteButton.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" @@ -22,12 +22,12 @@ #include "Network/TextEncoding.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpRadioBtn.h" -#include "UI/Buttons/UICashEmotionSprBtn.h" +#include "UI/CashEmotion/UICashEmotionSprBtn.h" #include "UI/CashEmotion/UICashEmotionPack.h" #include "UI/CashEmotion/UICashEmotionPiece.h" #include "UI/Chat/UINewChatWnd.h" @@ -36,11 +36,11 @@ #include "UI/Buttons/UIButton.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Text/UIStaticText.h" -#include "UI/UILapineScrollBar.h" +#include "UI/Items/UILapineScrollBar.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UINormalMB.h" +#include "UI/Dialogs/UINormalMB.h" #include "UI/Window/WindowBorder.h" #include "Utility/Text/FormatString.h" #include "Contents/Schedule/CheckGDISchedule.h" diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp index 57a29f390..0f45e18d1 100644 --- a/Source/Contents/ClientState.cpp +++ b/Source/Contents/ClientState.cpp @@ -5,7 +5,7 @@ #include "Client/Mode/CGameMode.h" #include "Contents/Configuration/ServiceOptions.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/EntryQueue/EntryQueueMgr.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/Contents/Configuration/OptionWriter.cpp b/Source/Contents/Configuration/OptionWriter.cpp index 16e010f3b..bdbe3c7f5 100644 --- a/Source/Contents/Configuration/OptionWriter.cpp +++ b/Source/Contents/Configuration/OptionWriter.cpp @@ -1,6 +1,6 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "File/File.h" -#include "Utility/GuidParse.h" +#include "Utility/Text/GuidParse.h" #include "Utility/Text/StringUtil.h" #include diff --git a/Source/Contents/Configuration/ScriptOptions.cpp b/Source/Contents/Configuration/ScriptOptions.cpp index f1f380996..55c359a05 100644 --- a/Source/Contents/Configuration/ScriptOptions.cpp +++ b/Source/Contents/Configuration/ScriptOptions.cpp @@ -1,6 +1,6 @@ #include "Script/LuaScript.h" -#include "Utility/GuidParse.h" -#include "Client/Session.h" +#include "Utility/Text/GuidParse.h" +#include "Client/Session/Session.h" #include // OFFSET: 0x00E0A890 diff --git a/Source/Contents/Configuration/ServiceConfiguration.cpp b/Source/Contents/Configuration/ServiceConfiguration.cpp index ee77b18f9..a736f72aa 100644 --- a/Source/Contents/Configuration/ServiceConfiguration.cpp +++ b/Source/Contents/Configuration/ServiceConfiguration.cpp @@ -4,8 +4,8 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Archive/PakRegistry.h" #include "Client/Application/ErrorDialog.h" -#include "Client/Registry.h" -#include "Client/Session.h" +#include "Client/Application/Registry.h" +#include "Client/Session/Session.h" #include "Contents/Map/MapSkyMgr.h" #include "File/CommonObject.h" #include "File/File.h" @@ -14,12 +14,12 @@ #include "Render/DeviceContext/DCSurface.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" #include "UI/Text/UIBalloonText.h" #include "Utility/Text/TextTokens.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" -#include "UI/Window/UILoginWnd.h" +#include "UI/Login/UILoginWnd.h" #include #include diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp index bf09596d6..9816a8008 100644 --- a/Source/Contents/Configuration/ServiceOptions.cpp +++ b/Source/Contents/Configuration/ServiceOptions.cpp @@ -3,7 +3,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceConfiguration.h" @@ -17,16 +17,16 @@ #include "Render/Textures/TextureCache.h" #include "Resource/ResourcePreload.h" #include "UI/GameSettings/GameSettingsUI.h" -#include "UI/Item/UIItemWnd.h" -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Items/UIItemWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Messenger/WhisperBlockMgr.h" #include "Contents/World/World.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Application/ApplicationWindow.h" -#include "Client/Session.h" -#include "Network/ClientOptionPacket.h" +#include "Client/Session/Session.h" +#include "Network/Packets/ClientOptionPacket.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Window/UIWindow.h" diff --git a/Source/Contents/Effects/Core/Effect.cpp b/Source/Contents/Effects/Core/Effect.cpp index 8f4ffbad9..981ffa0a0 100644 --- a/Source/Contents/Effects/Core/Effect.cpp +++ b/Source/Contents/Effects/Core/Effect.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/ModeMessage.h" #include "Contents/Effects/Core/Effect.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Effects/Core/EffectActor.h" diff --git a/Source/Contents/Effects/Core/EffectForceRender.cpp b/Source/Contents/Effects/Core/EffectForceRender.cpp index ddfe8ca62..f5074b594 100644 --- a/Source/Contents/Effects/Core/EffectForceRender.cpp +++ b/Source/Contents/Effects/Core/EffectForceRender.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Effects/Core/Effect.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Effects/Core/EffectLists.cpp b/Source/Contents/Effects/Core/EffectLists.cpp index 6e0a1da2c..aecd87505 100644 --- a/Source/Contents/Effects/Core/EffectLists.cpp +++ b/Source/Contents/Effects/Core/EffectLists.cpp @@ -68,7 +68,7 @@ #include "Contents/Effects/Skills/WindEffect.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/RenderObject.h" diff --git a/Source/Contents/Effects/Core/EffectVisibility.cpp b/Source/Contents/Effects/Core/EffectVisibility.cpp index 2eaff52b1..ba94cc17c 100644 --- a/Source/Contents/Effects/Core/EffectVisibility.cpp +++ b/Source/Contents/Effects/Core/EffectVisibility.cpp @@ -4,7 +4,7 @@ #include "Contents/Configuration/ServiceOptions.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/World/World.h" // OFFSET: 0x00C734B0 diff --git a/Source/Contents/Effects/Core/MsgEffect.cpp b/Source/Contents/Effects/Core/MsgEffect.cpp index f54b07ec9..8125b8efe 100644 --- a/Source/Contents/Effects/Core/MsgEffect.cpp +++ b/Source/Contents/Effects/Core/MsgEffect.cpp @@ -6,7 +6,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Actors/Skill.h" diff --git a/Source/Contents/Effects/Core/RagEffect.cpp b/Source/Contents/Effects/Core/RagEffect.cpp index 7264c4c77..8d5dfa724 100644 --- a/Source/Contents/Effects/Core/RagEffect.cpp +++ b/Source/Contents/Effects/Core/RagEffect.cpp @@ -9,7 +9,7 @@ #include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Resource/Resource.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" @@ -24,12 +24,12 @@ #include "Resource/Sprites/ActionResource.h" #include "Utility/Math/AffineMatrix.h" #include "Contents/Effects/Primitives/EffectPrimitiveMotion.h" -#include "Resource/EZeffectResource.h" +#include "Resource/Effects/EZeffectResource.h" #include "Resource/World/TerrainResource.h" #include "Render/Textures/Texture.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Actors/Npc.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Contents/Effects/Core/EffectLists.h" #include "Contents/Effects/Core/EffectTypes.h" #include "Contents/Effects/Core/EffectTypes.h" diff --git a/Source/Contents/Effects/Core/RagEffectInitialization.cpp b/Source/Contents/Effects/Core/RagEffectInitialization.cpp index 454ea78ac..81dc29184 100644 --- a/Source/Contents/Effects/Core/RagEffectInitialization.cpp +++ b/Source/Contents/Effects/Core/RagEffectInitialization.cpp @@ -3,7 +3,7 @@ #include "Contents/Effects/Core/RagEffect.h" #include "Contents/Effects/Core/RagEffectState.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Resource/EZeffectResource.h" +#include "Resource/Effects/EZeffectResource.h" #include "Resource/ResourceMgr.h" #include diff --git a/Source/Contents/Effects/Core/RagEffectState.h b/Source/Contents/Effects/Core/RagEffectState.h index e03c1ec97..27b57b6eb 100644 --- a/Source/Contents/Effects/Core/RagEffectState.h +++ b/Source/Contents/Effects/Core/RagEffectState.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_RAGEFFECTSTATE_H #define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_RAGEFFECTSTATE_H -#include "Resource/EZeffectResource.h" +#include "Resource/Effects/EZeffectResource.h" #include #include diff --git a/Source/Contents/Effects/Core/ShowEffect.cpp b/Source/Contents/Effects/Core/ShowEffect.cpp index 40b09bd86..dcf03f9a0 100644 --- a/Source/Contents/Effects/Core/ShowEffect.cpp +++ b/Source/Contents/Effects/Core/ShowEffect.cpp @@ -2,7 +2,7 @@ #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Effects/Core/EffectActor.h" #include "Contents/Effects/Core/EffectLists.h" diff --git a/Source/Contents/Effects/EffectResourceSwitcher.cpp b/Source/Contents/Effects/EffectResourceSwitcher.cpp index 94ae07112..5e1fe2b87 100644 --- a/Source/Contents/Effects/EffectResourceSwitcher.cpp +++ b/Source/Contents/Effects/EffectResourceSwitcher.cpp @@ -12,7 +12,7 @@ #include "File/File.h" #include "Network/TextEncoding.h" #include "Resource/World/TerrainResource.h" -#include "Utility/JsonCppLoader.h" +#include "Resource/Json/JsonCppLoader.h" #include #include diff --git a/Source/Contents/Effects/Particles/EZ2STREffect.cpp b/Source/Contents/Effects/Particles/EZ2STREffect.cpp index f223be812..9bdaea07c 100644 --- a/Source/Contents/Effects/Particles/EZ2STREffect.cpp +++ b/Source/Contents/Effects/Particles/EZ2STREffect.cpp @@ -1,7 +1,7 @@ #include "Contents/Effects/Particles/EZ2STREffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" @@ -13,8 +13,8 @@ #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Render/Renderer.h" -#include "Render/ScreenRectangle.h" -#include "Render/TextureQuad.h" +#include "Render/Projection/ScreenRectangle.h" +#include "Render/Primitives/TextureQuad.h" #include "Script/LuaScript.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Effects/Particles/Particle.cpp b/Source/Contents/Effects/Particles/Particle.cpp index 24270e5cf..cee75e6b0 100644 --- a/Source/Contents/Effects/Particles/Particle.cpp +++ b/Source/Contents/Effects/Particles/Particle.cpp @@ -12,7 +12,7 @@ #include "Render/Primitives/RenderPrimitive.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Effects/Particles/Particle.h b/Source/Contents/Effects/Particles/Particle.h index 412d1850d..84736c155 100644 --- a/Source/Contents/Effects/Particles/Particle.h +++ b/Source/Contents/Effects/Particles/Particle.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_PARTICLE_H #include "Render/Primitives/RenderPrimitive.h" -#include "Resource/EZeffectResource.h" +#include "Resource/Effects/EZeffectResource.h" #include "UI/Window/UIControl.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/Particles/SpriteEffect.cpp b/Source/Contents/Effects/Particles/SpriteEffect.cpp index 918122f75..e0b2510c9 100644 --- a/Source/Contents/Effects/Particles/SpriteEffect.cpp +++ b/Source/Contents/Effects/Particles/SpriteEffect.cpp @@ -3,7 +3,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Contents/Effects/Particles/SpriteParticle.h" diff --git a/Source/Contents/Effects/Particles/SpriteParticle.cpp b/Source/Contents/Effects/Particles/SpriteParticle.cpp index 860868773..019c0b506 100644 --- a/Source/Contents/Effects/Particles/SpriteParticle.cpp +++ b/Source/Contents/Effects/Particles/SpriteParticle.cpp @@ -10,7 +10,7 @@ #include "Contents/World/World.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp index 6731ed995..62cbe6ffa 100644 --- a/Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp @@ -3,8 +3,8 @@ #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Map/MapSkyMgr.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp index c76d22414..3ea0fb3e1 100644 --- a/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp @@ -6,8 +6,8 @@ #include "Render/DeviceContext/DCSurface.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Camera/Camera.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/GroundScope.h" diff --git a/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp index 314238dc4..4b1a45387 100644 --- a/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp @@ -9,22 +9,22 @@ #include "Contents/Effects/Primitives/EffectPrimitiveMotion.h" #include "Contents/Effects/Core/RagEffectState.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Utility/Math/AffineMatrix.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" #include "Contents/World/World.h" #include "Contents/Ground/GroundGeometry.h" #include "Render/Textures/TextureCache.h" #include "Contents/Map/MapSkyMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Skills/ClientSkills.h" #include "UI/Cooldowns/CooldownOwner.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp index c3a7e0afd..c55ea3938 100644 --- a/Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp @@ -6,12 +6,12 @@ #include "Contents/Actors/Pc.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/World/World.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Effects/Skills/Bash.cpp b/Source/Contents/Effects/Skills/Bash.cpp index 9d233910e..f40148415 100644 --- a/Source/Contents/Effects/Skills/Bash.cpp +++ b/Source/Contents/Effects/Skills/Bash.cpp @@ -8,7 +8,7 @@ #include "Contents/Effects/Particles/Particle.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp b/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp index c9fd4f778..1958db7c3 100644 --- a/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp +++ b/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp @@ -3,7 +3,7 @@ #include "Contents/Effects/Skills/MonsterSkillEffects.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" @@ -18,7 +18,7 @@ #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Resource/Sprites/ActionResource.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/Skills/NyanggrassEffect.cpp b/Source/Contents/Effects/Skills/NyanggrassEffect.cpp index e729ae91b..0aaf30107 100644 --- a/Source/Contents/Effects/Skills/NyanggrassEffect.cpp +++ b/Source/Contents/Effects/Skills/NyanggrassEffect.cpp @@ -6,7 +6,7 @@ #include "Contents/Effects/Core/EffectPoint.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/World/World.h" -#include "Render/AuxiliarySubmission.h" +#include "Render/Primitives/AuxiliarySubmission.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" diff --git a/Source/Contents/Effects/Skills/PartyMemberEffects.cpp b/Source/Contents/Effects/Skills/PartyMemberEffects.cpp index 8ec60824e..b99351152 100644 --- a/Source/Contents/Effects/Skills/PartyMemberEffects.cpp +++ b/Source/Contents/Effects/Skills/PartyMemberEffects.cpp @@ -5,7 +5,7 @@ #include "Client/Application/LaunchInfo.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Actors/Pc.h" diff --git a/Source/Contents/Emblems/EmblemCache.cpp b/Source/Contents/Emblems/EmblemCache.cpp index 213b3f1fa..4dabeb1d5 100644 --- a/Source/Contents/Emblems/EmblemCache.cpp +++ b/Source/Contents/Emblems/EmblemCache.cpp @@ -2,7 +2,7 @@ #include "Client/Application/Launcher.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Emblems/GuildEmblemReqBundle.h" #include "Contents/Guild/GuildMgr.h" #include "File/FileEnumeration.h" diff --git a/Source/Contents/Emblems/EmblemCacheRaw.cpp b/Source/Contents/Emblems/EmblemCacheRaw.cpp index c2f1358e8..2c0d356fb 100644 --- a/Source/Contents/Emblems/EmblemCacheRaw.cpp +++ b/Source/Contents/Emblems/EmblemCacheRaw.cpp @@ -1,5 +1,5 @@ #include "Client/Application/Launcher.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Guild/GuildMgr.h" #include "File/FileEnumeration.h" diff --git a/Source/Contents/Emblems/EmblemDataMgr.cpp b/Source/Contents/Emblems/EmblemDataMgr.cpp index 1460b0091..571680bf2 100644 --- a/Source/Contents/Emblems/EmblemDataMgr.cpp +++ b/Source/Contents/Emblems/EmblemDataMgr.cpp @@ -1,10 +1,10 @@ #include "Contents/UserData/AccountService.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Emblems/EmblemDataMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include #include diff --git a/Source/Contents/Emblems/GuildEmblemLookup.cpp b/Source/Contents/Emblems/GuildEmblemLookup.cpp index 0fa585f73..1dba6a3b7 100644 --- a/Source/Contents/Emblems/GuildEmblemLookup.cpp +++ b/Source/Contents/Emblems/GuildEmblemLookup.cpp @@ -1,4 +1,4 @@ -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Emblems/GuildEmblemReqBundle.h" #include "Contents/Guild/GuildMgr.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/EntryQueue/EntryQueueMgr.cpp b/Source/Contents/EntryQueue/EntryQueueMgr.cpp index 1bdc68090..c278591f3 100644 --- a/Source/Contents/EntryQueue/EntryQueueMgr.cpp +++ b/Source/Contents/EntryQueue/EntryQueueMgr.cpp @@ -2,7 +2,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Network/Packets/NoticeEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Sound/SoundMgr.h" diff --git a/Source/Contents/Events/RouletteMgr.cpp b/Source/Contents/Events/RouletteMgr.cpp index 072433bb7..efa395340 100644 --- a/Source/Contents/Events/RouletteMgr.cpp +++ b/Source/Contents/Events/RouletteMgr.cpp @@ -1,9 +1,9 @@ #include "UI/Window/UIEnums.h" #include "Contents/Events/RouletteMgr.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/TextureCache.h" -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "UI/Window/UIWindowMgr.h" #include diff --git a/Source/Contents/Events/ShowRankingScheduler.cpp b/Source/Contents/Events/ShowRankingScheduler.cpp index 52c60ae14..5e8c59106 100644 --- a/Source/Contents/Events/ShowRankingScheduler.cpp +++ b/Source/Contents/Events/ShowRankingScheduler.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UIEnums.h" #include "Contents/Events/ShowRankingScheduler.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Schedule/CheckGDISchedule.h" #include "Contents/Schedule/TimeScheduler.h" diff --git a/Source/Contents/Ground/GroundDecals.cpp b/Source/Contents/Ground/GroundDecals.cpp index 5fee0cf5d..579ad8180 100644 --- a/Source/Contents/Ground/GroundDecals.cpp +++ b/Source/Contents/Ground/GroundDecals.cpp @@ -3,7 +3,7 @@ #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Resource/World/TerrainResource.h" diff --git a/Source/Contents/Ground/GroundLighting.cpp b/Source/Contents/Ground/GroundLighting.cpp index 163bb3482..02e605ced 100644 --- a/Source/Contents/Ground/GroundLighting.cpp +++ b/Source/Contents/Ground/GroundLighting.cpp @@ -8,8 +8,8 @@ #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/TextureQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/TextureQuad.h" #include "Resource/World/WorldResource.h" #include "Utility/Math/ScalarConversion.h" diff --git a/Source/Contents/Ground/GroundRendering.cpp b/Source/Contents/Ground/GroundRendering.cpp index e078bc04b..b5b3ac4bc 100644 --- a/Source/Contents/Ground/GroundRendering.cpp +++ b/Source/Contents/Ground/GroundRendering.cpp @@ -3,8 +3,8 @@ #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Render/TextureQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/TextureQuad.h" #include #include diff --git a/Source/Contents/Ground/GroundWaterRendering.cpp b/Source/Contents/Ground/GroundWaterRendering.cpp index 5e97dc2c9..a460bc8d5 100644 --- a/Source/Contents/Ground/GroundWaterRendering.cpp +++ b/Source/Contents/Ground/GroundWaterRendering.cpp @@ -4,7 +4,7 @@ #include "Render/Primitives/RenderQueues.h" #include "Contents/Effects/Primitives/EffectPrim.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/ScalarConversion.h" diff --git a/Source/Contents/Guild/GuildInfo.cpp b/Source/Contents/Guild/GuildInfo.cpp index 18e92d201..d23cd65de 100644 --- a/Source/Contents/Guild/GuildInfo.cpp +++ b/Source/Contents/Guild/GuildInfo.cpp @@ -1,6 +1,6 @@ #include "Contents/Guild/GuildInfo.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" diff --git a/Source/Contents/Hotkeys/EmotionHotkeys.cpp b/Source/Contents/Hotkeys/EmotionHotkeys.cpp index d7879034d..c25383834 100644 --- a/Source/Contents/Hotkeys/EmotionHotkeys.cpp +++ b/Source/Contents/Hotkeys/EmotionHotkeys.cpp @@ -1,5 +1,5 @@ #include "Contents/Hotkeys/EmotionHotkeys.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "File/ShortcutFilename.h" diff --git a/Source/Contents/Hotkeys/UserHotkeyScript.cpp b/Source/Contents/Hotkeys/UserHotkeyScript.cpp index 5daed6a58..76fcfc8f1 100644 --- a/Source/Contents/Hotkeys/UserHotkeyScript.cpp +++ b/Source/Contents/Hotkeys/UserHotkeyScript.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Hotkeys/UserHotkeyScript.h" #include "Network/TextEncoding.h" diff --git a/Source/Contents/Items/BarterMarketItemMgr.cpp b/Source/Contents/Items/BarterMarketItemMgr.cpp index 0ab2ed4f6..e3ebdc326 100644 --- a/Source/Contents/Items/BarterMarketItemMgr.cpp +++ b/Source/Contents/Items/BarterMarketItemMgr.cpp @@ -1,6 +1,6 @@ #include "Contents/Items/BarterMarketItemMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Items/ClientItemLists.cpp b/Source/Contents/Items/ClientItemLists.cpp index 5ece39a9e..5ea3cd655 100644 --- a/Source/Contents/Items/ClientItemLists.cpp +++ b/Source/Contents/Items/ClientItemLists.cpp @@ -7,8 +7,8 @@ #include "Contents/CombatTypes.h" #include "Contents/Items/InventoryType.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/ClientState.h" #include "Contents/Effects/Core/EffectActor.h" diff --git a/Source/Contents/Items/EnchantMgr.cpp b/Source/Contents/Items/EnchantMgr.cpp index 98450ee71..2db773459 100644 --- a/Source/Contents/Items/EnchantMgr.cpp +++ b/Source/Contents/Items/EnchantMgr.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Network/Packets/PacketId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Effects/Core/EffectLists.h" #include "Contents/Items/ItemDBToIDMgr.h" #include "Contents/Items/ItemInfo.h" diff --git a/Source/Contents/Items/ItemDescription.cpp b/Source/Contents/Items/ItemDescription.cpp index 60531a8de..8680e73bf 100644 --- a/Source/Contents/Items/ItemDescription.cpp +++ b/Source/Contents/Items/ItemDescription.cpp @@ -1,7 +1,7 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include #include diff --git a/Source/Contents/Items/ItemInfo.cpp b/Source/Contents/Items/ItemInfo.cpp index a7ba56053..6d2d0fb50 100644 --- a/Source/Contents/Items/ItemInfo.cpp +++ b/Source/Contents/Items/ItemInfo.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIEnums.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Input/InputCharset.h" #include "File/File.h" #include "Contents/Items/ItemDescription.h" diff --git a/Source/Contents/Items/ItemLink.cpp b/Source/Contents/Items/ItemLink.cpp index 31768db01..fa4dbc6b9 100644 --- a/Source/Contents/Items/ItemLink.cpp +++ b/Source/Contents/Items/ItemLink.cpp @@ -2,7 +2,7 @@ #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemLink.h" #include "Network/TextEncoding.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/UITextViewer.h" #include diff --git a/Source/Contents/Items/ItemNaming.cpp b/Source/Contents/Items/ItemNaming.cpp index 3c7a228b9..9ee762dda 100644 --- a/Source/Contents/Items/ItemNaming.cpp +++ b/Source/Contents/Items/ItemNaming.cpp @@ -1,4 +1,4 @@ -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Items/ItemType.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" @@ -380,7 +380,7 @@ std::string ITEM_INFO::DisplayName(unsigned char detailed) const { } #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Application/ErrorDialog.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "File/CommonObject.h" diff --git a/Source/Contents/Items/ItemResources.cpp b/Source/Contents/Items/ItemResources.cpp index 3d2a7b269..1e8a752a7 100644 --- a/Source/Contents/Items/ItemResources.cpp +++ b/Source/Contents/Items/ItemResources.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemResources.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Items/SelectPackageItemMgr.cpp b/Source/Contents/Items/SelectPackageItemMgr.cpp index c8dd8bd7e..d7dfb84bc 100644 --- a/Source/Contents/Items/SelectPackageItemMgr.cpp +++ b/Source/Contents/Items/SelectPackageItemMgr.cpp @@ -1,6 +1,6 @@ #include "Contents/Items/SelectPackageItemMgr.h" #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/TextEncoding.h" #include "Script/LuaInstance.h" #include "UI/SelectPackageItemBox/SelectPackageItemBox.h" diff --git a/Source/Contents/Jobs/JobInheritance.cpp b/Source/Contents/Jobs/JobInheritance.cpp index dc9d027a6..2e76e3227 100644 --- a/Source/Contents/Jobs/JobInheritance.cpp +++ b/Source/Contents/Jobs/JobInheritance.cpp @@ -12,7 +12,7 @@ #include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Skills/SkillInfo.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Effects/Core/EffectLists.h" #include "Contents/Effects/Core/EffectTypes.h" diff --git a/Source/Contents/Jobs/JobNameInitialization.cpp b/Source/Contents/Jobs/JobNameInitialization.cpp index 8958b6891..6350141fc 100644 --- a/Source/Contents/Jobs/JobNameInitialization.cpp +++ b/Source/Contents/Jobs/JobNameInitialization.cpp @@ -1,5 +1,5 @@ #include "Contents/Jobs/JobNames.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobId.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Jobs/JobNames.cpp b/Source/Contents/Jobs/JobNames.cpp index 001bc6133..8bcadf115 100644 --- a/Source/Contents/Jobs/JobNames.cpp +++ b/Source/Contents/Jobs/JobNames.cpp @@ -1,5 +1,5 @@ #include "Contents/Jobs/JobNames.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobId.h" // OFFSET: 0x00E2FE80 diff --git a/Source/Contents/Map/FlyingShipRouteInfo.cpp b/Source/Contents/Map/FlyingShipRouteInfo.cpp index 09f61a220..5d66d0b7b 100644 --- a/Source/Contents/Map/FlyingShipRouteInfo.cpp +++ b/Source/Contents/Map/FlyingShipRouteInfo.cpp @@ -1,10 +1,10 @@ #include "Contents/Map/FlyingShipRouteInfo.h" #include "Render/Renderer.h" -#include "Render/ScreenGeometry.h" -#include "Render/TextureQuad.h" +#include "Render/Projection/ScreenGeometry.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include #include diff --git a/Source/Contents/Map/MapInfoMgr.cpp b/Source/Contents/Map/MapInfoMgr.cpp index 0b3f1b7f0..6522754ee 100644 --- a/Source/Contents/Map/MapInfoMgr.cpp +++ b/Source/Contents/Map/MapInfoMgr.cpp @@ -5,7 +5,7 @@ #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" #include "Render/Text/TextContext.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Script/NLuaState.h" diff --git a/Source/Contents/Map/MapNameTable.cpp b/Source/Contents/Map/MapNameTable.cpp index 692db7973..bdf8048af 100644 --- a/Source/Contents/Map/MapNameTable.cpp +++ b/Source/Contents/Map/MapNameTable.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Map/MapInfoMgr.h" #include "File/CommonObject.h" #include "File/File.h" diff --git a/Source/Contents/Map/MapSkyMgr.cpp b/Source/Contents/Map/MapSkyMgr.cpp index ddb2d3350..a20364915 100644 --- a/Source/Contents/Map/MapSkyMgr.cpp +++ b/Source/Contents/Map/MapSkyMgr.cpp @@ -1,7 +1,7 @@ #include "Contents/Map/MapSkyMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Effects/Core/EffectActor.h" #include "Contents/Effects/Core/EffectLists.h" diff --git a/Source/Contents/Messenger/ClientMessenger.cpp b/Source/Contents/Messenger/ClientMessenger.cpp index 1ee68ff0d..f920f98e4 100644 --- a/Source/Contents/Messenger/ClientMessenger.cpp +++ b/Source/Contents/Messenger/ClientMessenger.cpp @@ -4,11 +4,11 @@ #include "Contents/Items/ItemType.h" #include "Contents/CombatTypes.h" #include "Contents/Messenger/ClientMessenger.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Contents/Effects/Core/EffectActor.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GameActor.h" #include "Contents/ClientState.h" @@ -21,7 +21,7 @@ #include "Resource/World/TerrainResource.h" #include "Contents/Actors/Pc.h" #include "Client/Application/ErrorDialog.h" -#include "UI/Window/UIMileageWnd.h" +#include "UI/CashShop/UIMileageWnd.h" #include "Network/TextEncoding.h" #include "Utility/Text/StringUtil.h" #include "Contents/World/World.h" diff --git a/Source/Contents/Messenger/MessengerMember.cpp b/Source/Contents/Messenger/MessengerMember.cpp index fa64ac5fa..c715c142c 100644 --- a/Source/Contents/Messenger/MessengerMember.cpp +++ b/Source/Contents/Messenger/MessengerMember.cpp @@ -9,7 +9,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Render/Renderer.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Contents/UserData/NormalItemSlots.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" @@ -23,13 +23,13 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/Text/TextContext.h" #include "UI/Party/UIMiniPartyWnd.h" #include "UI/Window/WindowBorder.h" #include "Contents/Actors/PlayerNameDictionary.h" #include "Utility/Text/FormatString.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Text/UIStaticText.h" #include "File/ShortcutFilename.h" #include "UI/Buttons/UITextButton.h" @@ -38,7 +38,7 @@ #include "UI/Window/WindowBorder.h" #include "Contents/Actors/PlayerNameDictionary.h" #include "Utility/Text/FormatString.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Client/Mode/CMode.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Contents/Models/ModelRendering.cpp b/Source/Contents/Models/ModelRendering.cpp index ee6eb206c..4ad2b0065 100644 --- a/Source/Contents/Models/ModelRendering.cpp +++ b/Source/Contents/Models/ModelRendering.cpp @@ -7,10 +7,10 @@ #include "Contents/Effects/Primitives/EffectPrim.h" #include "Contents/Map/MapSkyMgr.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Resource/World/WorldResource.h" #include "Render/Textures/Texture.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Client/Mode/ModeMgr.h" #include diff --git a/Source/Contents/Monster/EnemyMonsterTalk.cpp b/Source/Contents/Monster/EnemyMonsterTalk.cpp index ecb607f0f..6826f9ba7 100644 --- a/Source/Contents/Monster/EnemyMonsterTalk.cpp +++ b/Source/Contents/Monster/EnemyMonsterTalk.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include diff --git a/Source/Contents/Monster/MonsterSpeech.cpp b/Source/Contents/Monster/MonsterSpeech.cpp index 84891bbff..14909f22c 100644 --- a/Source/Contents/Monster/MonsterSpeech.cpp +++ b/Source/Contents/Monster/MonsterSpeech.cpp @@ -1,6 +1,6 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include #include diff --git a/Source/Contents/Monster/MonsterXmlActions.cpp b/Source/Contents/Monster/MonsterXmlActions.cpp index cc1b909d5..c4beb1a2d 100644 --- a/Source/Contents/Monster/MonsterXmlActions.cpp +++ b/Source/Contents/Monster/MonsterXmlActions.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include diff --git a/Source/Contents/Movement/ActorMovementRoute.cpp b/Source/Contents/Movement/ActorMovementRoute.cpp index 969778835..91fb46849 100644 --- a/Source/Contents/Movement/ActorMovementRoute.cpp +++ b/Source/Contents/Movement/ActorMovementRoute.cpp @@ -1,5 +1,5 @@ -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Movement/TerrainPathSearch.h" diff --git a/Source/Contents/Movies/BinkMovie.h b/Source/Contents/Movies/BinkMovie.h index 1eb9a7498..3c50a5c88 100644 --- a/Source/Contents/Movies/BinkMovie.h +++ b/Source/Contents/Movies/BinkMovie.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_MOVIES_BINKMOVIE_H #define RAGNAROK_SOURCE_CONTENTS_MOVIES_BINKMOVIE_H -#include "Resource/BinkRuntime.h" +#include "Resource/Audio/BinkRuntime.h" class CFile; class CTexture; diff --git a/Source/Contents/Navigation/NavigationCandidates.cpp b/Source/Contents/Navigation/NavigationCandidates.cpp index 83d5f39a5..6076dbfc3 100644 --- a/Source/Contents/Navigation/NavigationCandidates.cpp +++ b/Source/Contents/Navigation/NavigationCandidates.cpp @@ -1,7 +1,7 @@ #include "Contents/Navigation/NavigationManager.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Resource/ResourceMgr.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Navigation/NavigationRequest.cpp b/Source/Contents/Navigation/NavigationRequest.cpp index 0a301fe0f..c9712cefb 100644 --- a/Source/Contents/Navigation/NavigationRequest.cpp +++ b/Source/Contents/Navigation/NavigationRequest.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Contents/World/World.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Resource/ResourceMgr.h" #include diff --git a/Source/Contents/Navigation/NavigationRoute.cpp b/Source/Contents/Navigation/NavigationRoute.cpp index ca1b91503..4074b119b 100644 --- a/Source/Contents/Navigation/NavigationRoute.cpp +++ b/Source/Contents/Navigation/NavigationRoute.cpp @@ -4,9 +4,9 @@ #include "Contents/Tables/MessageTable.h" #include "Utility/Text/FormatString.h" -#include "Client/Registry.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Application/Registry.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Resource/ResourceMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" @@ -16,10 +16,10 @@ #include "Resource/Sprites/SpriteResource.h" #include "UI/Window/UIWindow.h" #include "UI/Navigation/UINavigationV4Wnd.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UIPayConfirmWnd.h" -#include "Utility/RegistryKey.h" +#include "UI/CashShop/UIPayConfirmWnd.h" +#include "Client/Application/RegistryKey.h" #include #include @@ -34,7 +34,7 @@ #include "Contents/World/World.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Resource/MSGSTRINGID.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Contents/Navigation/NavigationSource.cpp b/Source/Contents/Navigation/NavigationSource.cpp index 35b163f40..df458e571 100644 --- a/Source/Contents/Navigation/NavigationSource.cpp +++ b/Source/Contents/Navigation/NavigationSource.cpp @@ -1,11 +1,11 @@ #include "Contents/Navigation/NavigationManager.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/World/World.h" #include "Resource/ResourceMgr.h" #include "Utility/Text/FormatString.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include #include #include diff --git a/Source/Contents/Navigation/NpcLocationRadius.cpp b/Source/Contents/Navigation/NpcLocationRadius.cpp index 4bd6b1b87..376a17447 100644 --- a/Source/Contents/Navigation/NpcLocationRadius.cpp +++ b/Source/Contents/Navigation/NpcLocationRadius.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobId.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Party/AdventurerAgencyMgr.cpp b/Source/Contents/Party/AdventurerAgencyMgr.cpp index 7495483e5..2832e7c4c 100644 --- a/Source/Contents/Party/AdventurerAgencyMgr.cpp +++ b/Source/Contents/Party/AdventurerAgencyMgr.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/UserData/AccountService.h" #include "Contents/Party/AdventurerAgencyMgr.h" diff --git a/Source/Contents/Party/AgencyRequests.cpp b/Source/Contents/Party/AgencyRequests.cpp index 536175105..fe7db5a75 100644 --- a/Source/Contents/Party/AgencyRequests.cpp +++ b/Source/Contents/Party/AgencyRequests.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/Async/AsyncWorkMgr.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Party/PartyBookingMgr.cpp b/Source/Contents/Party/PartyBookingMgr.cpp index 4e27cb705..bdee06cca 100644 --- a/Source/Contents/Party/PartyBookingMgr.cpp +++ b/Source/Contents/Party/PartyBookingMgr.cpp @@ -2,10 +2,10 @@ #include "UI/Window/UIEnums.h" #include "Contents/Party/PartyBookingMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Sound/SoundMgr.h" -#include "UI/Window/UISeekPartyListWnd.h" +#include "UI/Party/UISeekPartyListWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Contents/Party/PartyInfoCompletion.cpp b/Source/Contents/Party/PartyInfoCompletion.cpp index ceb98e598..5031e4fff 100644 --- a/Source/Contents/Party/PartyInfoCompletion.cpp +++ b/Source/Contents/Party/PartyInfoCompletion.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" @@ -9,7 +9,7 @@ #include "Contents/Tables/MessageTable.h" #include "UI/Party/UIAdvenPartyBoardWnd.h" #include "UI/Party/UIApplyForPartyWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Contents/Party/PartyJoinResult.cpp b/Source/Contents/Party/PartyJoinResult.cpp index 3b9ff3e0a..44d0d6734 100644 --- a/Source/Contents/Party/PartyJoinResult.cpp +++ b/Source/Contents/Party/PartyJoinResult.cpp @@ -1,5 +1,5 @@ #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Party/PartyJoinResult.h" diff --git a/Source/Contents/Party/RegisterPartyAsyncWork.cpp b/Source/Contents/Party/RegisterPartyAsyncWork.cpp index eef2e2ced..8db221b32 100644 --- a/Source/Contents/Party/RegisterPartyAsyncWork.cpp +++ b/Source/Contents/Party/RegisterPartyAsyncWork.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/Party/RegisterPartyAsyncWork.h" #include "Network/Http/CURLMgr.h" diff --git a/Source/Contents/Party/StopRecruitingCompletion.cpp b/Source/Contents/Party/StopRecruitingCompletion.cpp index 35a3af311..c82e0df19 100644 --- a/Source/Contents/Party/StopRecruitingCompletion.cpp +++ b/Source/Contents/Party/StopRecruitingCompletion.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Utility/Async/AsyncDiagnostic.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/Contents/Pet/PetEvolutionMgr.cpp b/Source/Contents/Pet/PetEvolutionMgr.cpp index b8d49d695..47583d343 100644 --- a/Source/Contents/Pet/PetEvolutionMgr.cpp +++ b/Source/Contents/Pet/PetEvolutionMgr.cpp @@ -1,5 +1,5 @@ #include "Contents/Pet/PetEvolutionMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/NLuaState.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Pet/PetStatus.cpp b/Source/Contents/Pet/PetStatus.cpp index ff59795d4..a12d11f09 100644 --- a/Source/Contents/Pet/PetStatus.cpp +++ b/Source/Contents/Pet/PetStatus.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/LuaScript.h" #include "Contents/CashEmotion/CashEmotionMgr.h" #include diff --git a/Source/Contents/Pet/PetStrings.cpp b/Source/Contents/Pet/PetStrings.cpp index 04590ffc5..ed2cad1fc 100644 --- a/Source/Contents/Pet/PetStrings.cpp +++ b/Source/Contents/Pet/PetStrings.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Resource/ResourceMgr.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Pet/PetTalk.cpp b/Source/Contents/Pet/PetTalk.cpp index a643d6db9..c0872d817 100644 --- a/Source/Contents/Pet/PetTalk.cpp +++ b/Source/Contents/Pet/PetTalk.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Pet/PetEnums.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/Contents/Pet/PetTalkNames.cpp b/Source/Contents/Pet/PetTalkNames.cpp index 94d67fbaa..748bf9d40 100644 --- a/Source/Contents/Pet/PetTalkNames.cpp +++ b/Source/Contents/Pet/PetTalkNames.cpp @@ -1,5 +1,5 @@ #include "Contents/Jobs/JobId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Utility/Cipher/XorBytes.h" #include diff --git a/Source/Contents/Quest/RenewQuestMgr.cpp b/Source/Contents/Quest/RenewQuestMgr.cpp index 17dd44301..0dfb57681 100644 --- a/Source/Contents/Quest/RenewQuestMgr.cpp +++ b/Source/Contents/Quest/RenewQuestMgr.cpp @@ -13,7 +13,7 @@ #include "UI/Quest/UIOngoingQuestInfo.h" #include "UI/Quest/UIRenewQuestUI.h" #include "UI/Window/UIWindowMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Resource/MSGSTRINGID.h" extern "C" { diff --git a/Source/Contents/Repute/ReputeMgr.cpp b/Source/Contents/Repute/ReputeMgr.cpp index a84fa1ce0..2461c27a2 100644 --- a/Source/Contents/Repute/ReputeMgr.cpp +++ b/Source/Contents/Repute/ReputeMgr.cpp @@ -8,7 +8,7 @@ #include "Network/TextEncoding.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "Utility/JsonCppLoader.h" +#include "Resource/Json/JsonCppLoader.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/Contents/RuneSystem/RuneSystem.cpp b/Source/Contents/RuneSystem/RuneSystem.cpp index 89bea29e6..54692a435 100644 --- a/Source/Contents/RuneSystem/RuneSystem.cpp +++ b/Source/Contents/RuneSystem/RuneSystem.cpp @@ -1,6 +1,6 @@ #include "Contents/RuneSystem/RuneSystem.h" #include "Client/Application/ApplicationWindow.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemInfo.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/Contents/SignBoard/SignBoard.cpp b/Source/Contents/SignBoard/SignBoard.cpp index c0b9cb66f..42ccf0b6a 100644 --- a/Source/Contents/SignBoard/SignBoard.cpp +++ b/Source/Contents/SignBoard/SignBoard.cpp @@ -1,16 +1,16 @@ #include "Contents/SignBoard/SignBoard.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Resource/World/TerrainResource.h" #include "Contents/World/World.h" #include "Network/TextEncoding.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIButton.h" #include "UI/Text/UIStaticText.h" diff --git a/Source/Contents/Skills/AutomaticSkills.cpp b/Source/Contents/Skills/AutomaticSkills.cpp index 45dcab483..2833af4a2 100644 --- a/Source/Contents/Skills/AutomaticSkills.cpp +++ b/Source/Contents/Skills/AutomaticSkills.cpp @@ -1,6 +1,6 @@ #include "Contents/Skills/AutomaticSkills.h" #include "Contents/Skills/SkillId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" #include diff --git a/Source/Contents/Skills/ClientSkills.cpp b/Source/Contents/Skills/ClientSkills.cpp index 242a250fe..ef0017e45 100644 --- a/Source/Contents/Skills/ClientSkills.cpp +++ b/Source/Contents/Skills/ClientSkills.cpp @@ -4,7 +4,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Application/ErrorDialog.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/RenderObject.h" #include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/ClientState.h" @@ -19,7 +19,7 @@ #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" -#include "Utility/Tokenizer.h" +#include "Utility/Text/Tokenizer.h" #include "Contents/Messenger/ClientMessenger.h" #include #include diff --git a/Source/Contents/Skills/GraffiSkill.cpp b/Source/Contents/Skills/GraffiSkill.cpp index 3721d02c3..1d6239d6b 100644 --- a/Source/Contents/Skills/GraffiSkill.cpp +++ b/Source/Contents/Skills/GraffiSkill.cpp @@ -7,7 +7,7 @@ #include "Contents/World/World.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" diff --git a/Source/Contents/Skills/PlayerSkillBundle.cpp b/Source/Contents/Skills/PlayerSkillBundle.cpp index d9c26e87c..898047e1a 100644 --- a/Source/Contents/Skills/PlayerSkillBundle.cpp +++ b/Source/Contents/Skills/PlayerSkillBundle.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Contents/Skills/SkillId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIWindow.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/Contents/Skills/SkillActionAlitea.cpp b/Source/Contents/Skills/SkillActionAlitea.cpp index b8ab82b60..698921098 100644 --- a/Source/Contents/Skills/SkillActionAlitea.cpp +++ b/Source/Contents/Skills/SkillActionAlitea.cpp @@ -1,6 +1,6 @@ #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" diff --git a/Source/Contents/Skills/SkillActionInfo.cpp b/Source/Contents/Skills/SkillActionInfo.cpp index 214f43f40..2d4d072c8 100644 --- a/Source/Contents/Skills/SkillActionInfo.cpp +++ b/Source/Contents/Skills/SkillActionInfo.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/CombatTypes.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Actors/Resources/EquipmentResourceMgr.h" diff --git a/Source/Contents/Skills/SkillInfo.cpp b/Source/Contents/Skills/SkillInfo.cpp index 0782b901b..662997552 100644 --- a/Source/Contents/Skills/SkillInfo.cpp +++ b/Source/Contents/Skills/SkillInfo.cpp @@ -1,5 +1,5 @@ #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" #include "Contents/Actors/GameActor.h" diff --git a/Source/Contents/Skills/SkillLevelConfig.cpp b/Source/Contents/Skills/SkillLevelConfig.cpp index d91b8e07d..a4fac2821 100644 --- a/Source/Contents/Skills/SkillLevelConfig.cpp +++ b/Source/Contents/Skills/SkillLevelConfig.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include diff --git a/Source/Contents/Skills/SkillLevelRegistry.cpp b/Source/Contents/Skills/SkillLevelRegistry.cpp index 967f1bfb6..9ef6f9403 100644 --- a/Source/Contents/Skills/SkillLevelRegistry.cpp +++ b/Source/Contents/Skills/SkillLevelRegistry.cpp @@ -1,6 +1,6 @@ #include "Contents/Skills/SkillInfo.h" -#include "Client/Registry.h" -#include "Client/Session.h" +#include "Client/Application/Registry.h" +#include "Client/Session/Session.h" #include "Contents/Skills/SkillLevelRegistry.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Skills/SkillTreeScript.cpp b/Source/Contents/Skills/SkillTreeScript.cpp index a9536a7db..8ddf5cb49 100644 --- a/Source/Contents/Skills/SkillTreeScript.cpp +++ b/Source/Contents/Skills/SkillTreeScript.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Skills/PlayerSkillBundle.h" #include "Contents/Skills/SkillTreeScript.h" diff --git a/Source/Contents/Sound/HitSounds.cpp b/Source/Contents/Sound/HitSounds.cpp index 9c8fbdc9f..1c0429bab 100644 --- a/Source/Contents/Sound/HitSounds.cpp +++ b/Source/Contents/Sound/HitSounds.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobInheritance.h" #include diff --git a/Source/Contents/Sound/SoundConfiguration.cpp b/Source/Contents/Sound/SoundConfiguration.cpp index 197761300..1486ab6da 100644 --- a/Source/Contents/Sound/SoundConfiguration.cpp +++ b/Source/Contents/Sound/SoundConfiguration.cpp @@ -1,6 +1,6 @@ #include "Contents/Sound/SoundConfiguration.h" -#include "Client/Registry.h" -#include "Render/DeviceSelection.h" +#include "Client/Application/Registry.h" +#include "Render/Device/DeviceSelection.h" #include "UI/Dialogs/UITipOfTheDayWnd.h" #include "UI/GameSettings/GameSettingsUI.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index f2a7d21cf..d801eda16 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -16,7 +16,7 @@ #include "Contents/Sound/SoundMgr.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Jobs/JobInheritance.h" @@ -29,7 +29,7 @@ #include "Resource/Sprites/ActionResource.h" #include "Resource/World/WorldResource.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/ScalarConversion.h" #include diff --git a/Source/Contents/Sprites/RobeOpacity.cpp b/Source/Contents/Sprites/RobeOpacity.cpp index 81c21805e..72988f354 100644 --- a/Source/Contents/Sprites/RobeOpacity.cpp +++ b/Source/Contents/Sprites/RobeOpacity.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include #include diff --git a/Source/Contents/Sprites/RobeTopLayer.cpp b/Source/Contents/Sprites/RobeTopLayer.cpp index 607e9120e..a09f388ba 100644 --- a/Source/Contents/Sprites/RobeTopLayer.cpp +++ b/Source/Contents/Sprites/RobeTopLayer.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/LuaScript.h" // OFFSET: 0x00E31D30 diff --git a/Source/Contents/Sprites/SpriteFrameSynchronization.cpp b/Source/Contents/Sprites/SpriteFrameSynchronization.cpp index f9b9f4ba7..8cb006795 100644 --- a/Source/Contents/Sprites/SpriteFrameSynchronization.cpp +++ b/Source/Contents/Sprites/SpriteFrameSynchronization.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Resource/Sprites/ActionResource.h" #include diff --git a/Source/Contents/Sprites/SpriteJob.cpp b/Source/Contents/Sprites/SpriteJob.cpp index 86ab52d26..da9cdf45e 100644 --- a/Source/Contents/Sprites/SpriteJob.cpp +++ b/Source/Contents/Sprites/SpriteJob.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobId.h" #include "Contents/Jobs/JobNames.h" diff --git a/Source/Contents/Sprites/SpriteLayerDepth.cpp b/Source/Contents/Sprites/SpriteLayerDepth.cpp index d12becf2e..6003f427d 100644 --- a/Source/Contents/Sprites/SpriteLayerDepth.cpp +++ b/Source/Contents/Sprites/SpriteLayerDepth.cpp @@ -1,7 +1,7 @@ #include "Contents/Actors/CharacterRender.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Camera/Camera.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Script/LuaScript.h" constexpr float robeTopLayerThreshold = 320.0f; diff --git a/Source/Contents/Sprites/SpriteLayerDrawing.cpp b/Source/Contents/Sprites/SpriteLayerDrawing.cpp index 489343be0..8be7ee8ae 100644 --- a/Source/Contents/Sprites/SpriteLayerDrawing.cpp +++ b/Source/Contents/Sprites/SpriteLayerDrawing.cpp @@ -1,7 +1,7 @@ #include "Contents/Sprites/SpriteLayerDrawing.h" #include "Contents/Actors/ActorEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceOptions.h" @@ -12,9 +12,9 @@ #include "Contents/Sprites/SpriteRidingOffset.h" #include "Contents/Sprites/SpriteRidingPolicy.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" -#include "Resource/ImfResource.h" -#include "Resource/PaletteResource.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Resource/Sprites/ImfResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/Contents/Sprites/SpriteLayerDrawing.h b/Source/Contents/Sprites/SpriteLayerDrawing.h index 34f7785d9..13a67c070 100644 --- a/Source/Contents/Sprites/SpriteLayerDrawing.h +++ b/Source/Contents/Sprites/SpriteLayerDrawing.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITELAYERDRAWING_H #include "Contents/Actors/RenderObject.h" -#include "Render/SpriteQuad.h" +#include "Render/Primitives/SpriteQuad.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Sprites/SpriteLayerOrder.cpp b/Source/Contents/Sprites/SpriteLayerOrder.cpp index 6e29763b7..e2c5d4d3b 100644 --- a/Source/Contents/Sprites/SpriteLayerOrder.cpp +++ b/Source/Contents/Sprites/SpriteLayerOrder.cpp @@ -1,5 +1,5 @@ #include "Contents/Sprites/SpriteLayerOrder.h" -#include "Resource/ImfResource.h" +#include "Resource/Sprites/ImfResource.h" // OFFSET: 0x00DAAB00 // FUNCTION: fn_22575 diff --git a/Source/Contents/Sprites/SpriteRidingPolicy.cpp b/Source/Contents/Sprites/SpriteRidingPolicy.cpp index b6ec9ece3..dcb5d1d92 100644 --- a/Source/Contents/Sprites/SpriteRidingPolicy.cpp +++ b/Source/Contents/Sprites/SpriteRidingPolicy.cpp @@ -1,5 +1,5 @@ #include "Contents/Sprites/SpriteRidingPolicy.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobNames.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Sprites/SpriteRobe.cpp b/Source/Contents/Sprites/SpriteRobe.cpp index 855e1aafb..52df29068 100644 --- a/Source/Contents/Sprites/SpriteRobe.cpp +++ b/Source/Contents/Sprites/SpriteRobe.cpp @@ -1,11 +1,11 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/CharacterRender.h" #include "Contents/Camera/Camera.h" #include "Render/DeviceContext/DCSurface.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Contents/Sprites/SpriteRobeCommands.cpp b/Source/Contents/Sprites/SpriteRobeCommands.cpp index 60bea5840..1c5ac7f8c 100644 --- a/Source/Contents/Sprites/SpriteRobeCommands.cpp +++ b/Source/Contents/Sprites/SpriteRobeCommands.cpp @@ -1,12 +1,12 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/CharacterRender.h" #include "Contents/Camera/Camera.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Primitives/RenderPrimitive.h" -#include "Render/SpriteGeometry.h" -#include "Render/SpriteQuad.h" +#include "Render/Drawing/SpriteGeometry.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Contents/Sprites/SpriteShadow.cpp b/Source/Contents/Sprites/SpriteShadow.cpp index cb1b0d348..127b2553f 100644 --- a/Source/Contents/Sprites/SpriteShadow.cpp +++ b/Source/Contents/Sprites/SpriteShadow.cpp @@ -1,12 +1,12 @@ #include "Contents/Actors/CharacterRender.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/World/World.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" -#include "Render/SpriteQuad.h" +#include "Render/Primitives/SpriteQuad.h" #include "Render/Textures/SpritePixels.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Contents/Store/MCStoreInfoBackup.cpp b/Source/Contents/Store/MCStoreInfoBackup.cpp index 6be48ea32..ee92eb4a2 100644 --- a/Source/Contents/Store/MCStoreInfoBackup.cpp +++ b/Source/Contents/Store/MCStoreInfoBackup.cpp @@ -3,7 +3,7 @@ #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Store/MCStoreInfoBackup.h" #include "Contents/Tables/MessageTable.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Async/AsyncDiagnostic.h" diff --git a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp index a63cec98d..acd3f166f 100644 --- a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp +++ b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp @@ -1,6 +1,6 @@ #include "Contents/Store/MCStoreInfoBackup.h" #include "Contents/Store/MCStoreInfoBackupAsyncWork.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Http/CURLMgr.h" #include "Network/Http/CURLPostHander.h" #include "Network/TextEncoding.h" diff --git a/Source/Contents/Store/StoreBackupData.cpp b/Source/Contents/Store/StoreBackupData.cpp index e587cac46..5d5f67075 100644 --- a/Source/Contents/Store/StoreBackupData.cpp +++ b/Source/Contents/Store/StoreBackupData.cpp @@ -1,5 +1,5 @@ #include "Contents/Store/MCStoreInfoBackup.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/TextEncoding.h" #include "UI/Shop/UIMerchantShopMakeWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Tables/ClientXmlTables.cpp b/Source/Contents/Tables/ClientXmlTables.cpp index 4279a336b..6c387119a 100644 --- a/Source/Contents/Tables/ClientXmlTables.cpp +++ b/Source/Contents/Tables/ClientXmlTables.cpp @@ -1,7 +1,7 @@ #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "File/File.h" -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" // OFFSET: 0x00E1A2B0 // FUNCTION: fn_23848 diff --git a/Source/Contents/Tables/TipBoxTitles.cpp b/Source/Contents/Tables/TipBoxTitles.cpp index 2dd21b419..0e45ac695 100644 --- a/Source/Contents/Tables/TipBoxTitles.cpp +++ b/Source/Contents/Tables/TipBoxTitles.cpp @@ -3,7 +3,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/SpriteResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/NLuaState.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/Time/ClientTiming.cpp b/Source/Contents/Time/ClientTiming.cpp index 3176fd321..5f48384fa 100644 --- a/Source/Contents/Time/ClientTiming.cpp +++ b/Source/Contents/Time/ClientTiming.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Application/ApplicationWindow.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Achievement/AchievementMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Map/MapInfoMgr.h" diff --git a/Source/Contents/UserData/AccountLinkedUserDataMgr.cpp b/Source/Contents/UserData/AccountLinkedUserDataMgr.cpp index 7681a324d..20f000c19 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataMgr.cpp +++ b/Source/Contents/UserData/AccountLinkedUserDataMgr.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/DeviceContext/DCSurface.h" #include "Script/LuaScript.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" diff --git a/Source/Contents/UserData/CharacterConfigLoad.cpp b/Source/Contents/UserData/CharacterConfigLoad.cpp index 27e6bf1fc..930e35c67 100644 --- a/Source/Contents/UserData/CharacterConfigLoad.cpp +++ b/Source/Contents/UserData/CharacterConfigLoad.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "Contents/Configuration/ServiceOptions.h" diff --git a/Source/Contents/UserData/CharacterConfigSave.cpp b/Source/Contents/UserData/CharacterConfigSave.cpp index b6982de90..f580adff6 100644 --- a/Source/Contents/UserData/CharacterConfigSave.cpp +++ b/Source/Contents/UserData/CharacterConfigSave.cpp @@ -1,5 +1,5 @@ -#include "Client/Session.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" +#include "Client/Session/Session.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/Contents/UserData/CharacterLinkedUserDataMgr.cpp b/Source/Contents/UserData/CharacterLinkedUserDataMgr.cpp index c78f3aeb7..0e0957e76 100644 --- a/Source/Contents/UserData/CharacterLinkedUserDataMgr.cpp +++ b/Source/Contents/UserData/CharacterLinkedUserDataMgr.cpp @@ -1,9 +1,9 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/UserData/AccountService.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "Script/LuaScript.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include diff --git a/Source/Contents/UserData/NormalItemSlots.cpp b/Source/Contents/UserData/NormalItemSlots.cpp index 2c17077fd..1f1eb1f69 100644 --- a/Source/Contents/UserData/NormalItemSlots.cpp +++ b/Source/Contents/UserData/NormalItemSlots.cpp @@ -1,5 +1,5 @@ #include "Contents/UserData/NormalItemSlots.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "Contents/Map/MapSkyMgr.h" #include "Render/Renderer.h" diff --git a/Source/Contents/World/SkyBox.cpp b/Source/Contents/World/SkyBox.cpp index 17756e35e..115be2d71 100644 --- a/Source/Contents/World/SkyBox.cpp +++ b/Source/Contents/World/SkyBox.cpp @@ -3,7 +3,7 @@ #include "Contents/Map/MapSkyMgr.h" #include "Contents/Models/ModelActor.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/TextureCache.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/World/WorldModelLoading.cpp b/Source/Contents/World/WorldModelLoading.cpp index fbdabd90f..b4024e905 100644 --- a/Source/Contents/World/WorldModelLoading.cpp +++ b/Source/Contents/World/WorldModelLoading.cpp @@ -11,7 +11,7 @@ #include "Client/Application/ErrorDialog.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Ground/GroundWaterState.h" diff --git a/Source/Contents/World/WorldModelView.cpp b/Source/Contents/World/WorldModelView.cpp index 85eeda946..40aaaf2d4 100644 --- a/Source/Contents/World/WorldModelView.cpp +++ b/Source/Contents/World/WorldModelView.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Camera/Camera.h" #include "Contents/Effects/Core/EffectLists.h" diff --git a/Source/Contents/World/WorldObjects.cpp b/Source/Contents/World/WorldObjects.cpp index 41d6d57ab..f0e056e7e 100644 --- a/Source/Contents/World/WorldObjects.cpp +++ b/Source/Contents/World/WorldObjects.cpp @@ -3,7 +3,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Mode/GameModeEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/EffectActors.h" #include "Resource/ResourceMgr.h" #include "Contents/Actors/RenderObject.h" @@ -20,8 +20,8 @@ #include "Contents/Effects/Skills/MandraAttackEffect.h" #include "Contents/Effects/Core/MsgEffect.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" -#include "UI/Window/UIEmblemWnd.h" +#include "Render/Primitives/TextureQuad.h" +#include "UI/Guild/UIEmblemWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/HexString.h" @@ -33,9 +33,9 @@ #include "Contents/Sound/SoundMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/Actors/Pc.h" -#include "ActorPickNode.h" +#include "Contents/Actors/ActorPickNode.h" #include "Client/Input/Mouse.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Guild/GuildMgr.h" #include "Contents/Jobs/JobInheritance.h" diff --git a/Source/Contents/World/WorldProximity.cpp b/Source/Contents/World/WorldProximity.cpp index 71acb635f..11fbd7795 100644 --- a/Source/Contents/World/WorldProximity.cpp +++ b/Source/Contents/World/WorldProximity.cpp @@ -2,7 +2,7 @@ #include "Contents/World/World.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/RenderObject.h" diff --git a/Source/Contents/World/WorldSpatialTree.cpp b/Source/Contents/World/WorldSpatialTree.cpp index 932650827..905335643 100644 --- a/Source/Contents/World/WorldSpatialTree.cpp +++ b/Source/Contents/World/WorldSpatialTree.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Map/MapSkyMgr.h" diff --git a/Source/Contents/World/WorldViewData.cpp b/Source/Contents/World/WorldViewData.cpp index 6b8cd6b64..2e6ffd6cc 100644 --- a/Source/Contents/World/WorldViewData.cpp +++ b/Source/Contents/World/WorldViewData.cpp @@ -3,13 +3,13 @@ #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Script/LuaScript.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/File/FileCreation.cpp b/Source/File/FileCreation.cpp index e4f7e42f0..c827dee36 100644 --- a/Source/File/FileCreation.cpp +++ b/Source/File/FileCreation.cpp @@ -1,6 +1,6 @@ #include "File/FileCreation.h" #include "Contents/Effects/EffectResourceSwitcher.h" -#include "Utility/JsonCppLoader.h" +#include "Resource/Json/JsonCppLoader.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/Utility/NFileLog.cpp b/Source/File/NFileLog.cpp similarity index 99% rename from Source/Utility/NFileLog.cpp rename to Source/File/NFileLog.cpp index 06e7006bd..2edb17f52 100644 --- a/Source/Utility/NFileLog.cpp +++ b/Source/File/NFileLog.cpp @@ -1,4 +1,4 @@ -#include "Utility/NFileLog.h" +#include "File/NFileLog.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/Utility/NFileLog.h b/Source/File/NFileLog.h similarity index 87% rename from Source/Utility/NFileLog.h rename to Source/File/NFileLog.h index 0e95b3c14..622589d38 100644 --- a/Source/Utility/NFileLog.h +++ b/Source/File/NFileLog.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_NFILELOG_H -#define RAGNAROK_SOURCE_UTILITY_NFILELOG_H +#ifndef RAGNAROK_SOURCE_FILE_NFILELOG_H +#define RAGNAROK_SOURCE_FILE_NFILELOG_H #include #include diff --git a/Source/File/ResourcePath.cpp b/Source/File/ResourcePath.cpp index 0f43fbec1..70dee709a 100644 --- a/Source/File/ResourcePath.cpp +++ b/Source/File/ResourcePath.cpp @@ -1,6 +1,6 @@ #include "Archive/PakRegistry.h" #include "File/ResourcePath.h" -#include "Utility/GGHashMgr.h" +#include "Utility/Hash/GGHashMgr.h" #include #include diff --git a/Source/Network/ClientKeepalive.h b/Source/Network/ClientKeepalive.h deleted file mode 100644 index 4bed01928..000000000 --- a/Source/Network/ClientKeepalive.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef RAGNAROK_SOURCE_NETWORK_CLIENTKEEPALIVE_H -#define RAGNAROK_SOURCE_NETWORK_CLIENTKEEPALIVE_H - -#endif diff --git a/Source/Network/ClientOptionPacket.h b/Source/Network/ClientOptionPacket.h deleted file mode 100644 index 77a2e07a3..000000000 --- a/Source/Network/ClientOptionPacket.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef RAGNAROK_SOURCE_NETWORK_CLIENTOPTIONPACKET_H -#define RAGNAROK_SOURCE_NETWORK_CLIENTOPTIONPACKET_H - -#endif diff --git a/Source/Network/Connection/Connection.cpp b/Source/Network/Connection/Connection.cpp index 708dc75ad..c1c6f93cf 100644 --- a/Source/Network/Connection/Connection.cpp +++ b/Source/Network/Connection/Connection.cpp @@ -1,5 +1,5 @@ #include "Client/Application/ErrorDialog.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" #include "Network/Connection/ConnectionRuntime.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/Utility/NIPAddr.cpp b/Source/Network/NIPAddr.cpp similarity index 97% rename from Source/Utility/NIPAddr.cpp rename to Source/Network/NIPAddr.cpp index 491d94fd9..766e788be 100644 --- a/Source/Utility/NIPAddr.cpp +++ b/Source/Network/NIPAddr.cpp @@ -1,6 +1,6 @@ #include -#include "Utility/NIPAddr.h" +#include "Network/NIPAddr.h" // OFFSET: 0x007349C0 // FUNCTION: fn_07599 diff --git a/Source/Utility/NIPAddr.h b/Source/Network/NIPAddr.h similarity index 78% rename from Source/Utility/NIPAddr.h rename to Source/Network/NIPAddr.h index 9cb2f802c..137fad8cc 100644 --- a/Source/Utility/NIPAddr.h +++ b/Source/Network/NIPAddr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_NIPADDR_H -#define RAGNAROK_SOURCE_UTILITY_NIPADDR_H +#ifndef RAGNAROK_SOURCE_NETWORK_NIPADDR_H +#define RAGNAROK_SOURCE_NETWORK_NIPADDR_H #include #include diff --git a/Source/Network/ActorNamePacket.cpp b/Source/Network/Packets/ActorNamePacket.cpp similarity index 93% rename from Source/Network/ActorNamePacket.cpp rename to Source/Network/Packets/ActorNamePacket.cpp index fb112e879..558e2864a 100644 --- a/Source/Network/ActorNamePacket.cpp +++ b/Source/Network/Packets/ActorNamePacket.cpp @@ -1,9 +1,9 @@ #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" -#include "Network/ActorNamePacket.h" +#include "Network/Packets/ActorNamePacket.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/Window/UIPetInfoWnd.h" +#include "UI/Status/UIPetInfoWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Network/ActorNamePacket.h b/Source/Network/Packets/ActorNamePacket.h similarity index 90% rename from Source/Network/ActorNamePacket.h rename to Source/Network/Packets/ActorNamePacket.h index 222985440..5c8fa431f 100644 --- a/Source/Network/ActorNamePacket.h +++ b/Source/Network/Packets/ActorNamePacket.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_NETWORK_ACTORNAMEPACKET_H -#define RAGNAROK_SOURCE_NETWORK_ACTORNAMEPACKET_H +#ifndef RAGNAROK_SOURCE_NETWORK_PACKETS_ACTORNAMEPACKET_H +#define RAGNAROK_SOURCE_NETWORK_PACKETS_ACTORNAMEPACKET_H #include #include diff --git a/Source/Network/ClientKeepalive.cpp b/Source/Network/Packets/ClientKeepalive.cpp similarity index 96% rename from Source/Network/ClientKeepalive.cpp rename to Source/Network/Packets/ClientKeepalive.cpp index 8ba6f776f..6896aecdc 100644 --- a/Source/Network/ClientKeepalive.cpp +++ b/Source/Network/Packets/ClientKeepalive.cpp @@ -1,5 +1,5 @@ #include "Client/Mode/CLoginMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Network/Packets/ClientKeepalive.h b/Source/Network/Packets/ClientKeepalive.h new file mode 100644 index 000000000..498422f49 --- /dev/null +++ b/Source/Network/Packets/ClientKeepalive.h @@ -0,0 +1,4 @@ +#ifndef RAGNAROK_SOURCE_NETWORK_PACKETS_CLIENTKEEPALIVE_H +#define RAGNAROK_SOURCE_NETWORK_PACKETS_CLIENTKEEPALIVE_H + +#endif diff --git a/Source/Network/ClientOptionPacket.cpp b/Source/Network/Packets/ClientOptionPacket.cpp similarity index 94% rename from Source/Network/ClientOptionPacket.cpp rename to Source/Network/Packets/ClientOptionPacket.cpp index a7724da77..42ebfda9c 100644 --- a/Source/Network/ClientOptionPacket.cpp +++ b/Source/Network/Packets/ClientOptionPacket.cpp @@ -1,5 +1,5 @@ -#include "Network/ClientOptionPacket.h" -#include "Client/Session.h" +#include "Network/Packets/ClientOptionPacket.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Network/Packets/ClientOptionPacket.h b/Source/Network/Packets/ClientOptionPacket.h new file mode 100644 index 000000000..a93c800e8 --- /dev/null +++ b/Source/Network/Packets/ClientOptionPacket.h @@ -0,0 +1,4 @@ +#ifndef RAGNAROK_SOURCE_NETWORK_PACKETS_CLIENTOPTIONPACKET_H +#define RAGNAROK_SOURCE_NETWORK_PACKETS_CLIENTOPTIONPACKET_H + +#endif diff --git a/Source/Network/ExecutableDigestPacket.cpp b/Source/Network/Packets/ExecutableDigestPacket.cpp similarity index 95% rename from Source/Network/ExecutableDigestPacket.cpp rename to Source/Network/Packets/ExecutableDigestPacket.cpp index 93a9043ba..a3d563830 100644 --- a/Source/Network/ExecutableDigestPacket.cpp +++ b/Source/Network/Packets/ExecutableDigestPacket.cpp @@ -1,7 +1,7 @@ -#include "Network/ExecutableDigestPacket.h" +#include "Network/Packets/ExecutableDigestPacket.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" -#include "Utility/Md5State.h" +#include "Utility/Hash/Md5State.h" #include "Network/Packets/PacketId.h" #include diff --git a/Source/Network/ExecutableDigestPacket.h b/Source/Network/Packets/ExecutableDigestPacket.h similarity index 63% rename from Source/Network/ExecutableDigestPacket.h rename to Source/Network/Packets/ExecutableDigestPacket.h index 6cbf26ac8..c3faeb915 100644 --- a/Source/Network/ExecutableDigestPacket.h +++ b/Source/Network/Packets/ExecutableDigestPacket.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_NETWORK_EXECUTABLEDIGESTPACKET_H -#define RAGNAROK_SOURCE_NETWORK_EXECUTABLEDIGESTPACKET_H +#ifndef RAGNAROK_SOURCE_NETWORK_PACKETS_EXECUTABLEDIGESTPACKET_H +#define RAGNAROK_SOURCE_NETWORK_PACKETS_EXECUTABLEDIGESTPACKET_H #include diff --git a/Source/Network/GameTickPacket.cpp b/Source/Network/Packets/GameTickPacket.cpp similarity index 96% rename from Source/Network/GameTickPacket.cpp rename to Source/Network/Packets/GameTickPacket.cpp index 37b643970..4add02426 100644 --- a/Source/Network/GameTickPacket.cpp +++ b/Source/Network/Packets/GameTickPacket.cpp @@ -1,4 +1,4 @@ -#include "Network/GameTickPacket.h" +#include "Network/Packets/GameTickPacket.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Security/NProtectGameGuardMgr.h" diff --git a/Source/Network/GameTickPacket.h b/Source/Network/Packets/GameTickPacket.h similarity index 75% rename from Source/Network/GameTickPacket.h rename to Source/Network/Packets/GameTickPacket.h index b5728b3cd..bed46e4da 100644 --- a/Source/Network/GameTickPacket.h +++ b/Source/Network/Packets/GameTickPacket.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_NETWORK_GAMETICKPACKET_H -#define RAGNAROK_SOURCE_NETWORK_GAMETICKPACKET_H +#ifndef RAGNAROK_SOURCE_NETWORK_PACKETS_GAMETICKPACKET_H +#define RAGNAROK_SOURCE_NETWORK_PACKETS_GAMETICKPACKET_H #include #include diff --git a/Source/Network/Packets/SkillUpdatePacket.cpp b/Source/Network/Packets/SkillUpdatePacket.cpp index 5af552cdf..4bffbabfb 100644 --- a/Source/Network/Packets/SkillUpdatePacket.cpp +++ b/Source/Network/Packets/SkillUpdatePacket.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/CGameMode.h" #include "UI/Window/UIEnums.h" #include "Network/Packets/PacketId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Render/BlendColor.cpp b/Source/Render/BlendColor.cpp deleted file mode 100644 index 52d081bd7..000000000 --- a/Source/Render/BlendColor.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "Render/BlendColor.h" diff --git a/Source/Render/BlendColor.h b/Source/Render/BlendColor.h deleted file mode 100644 index c02459be1..000000000 --- a/Source/Render/BlendColor.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RAGNAROK_SOURCE_RENDER_BLENDCOLOR_H -#define RAGNAROK_SOURCE_RENDER_BLENDCOLOR_H - -#include "Render/Renderer.h" - -#endif diff --git a/Source/Render/AlphaQueuesDX7.cpp b/Source/Render/DX7/AlphaQueuesDX7.cpp similarity index 100% rename from Source/Render/AlphaQueuesDX7.cpp rename to Source/Render/DX7/AlphaQueuesDX7.cpp diff --git a/Source/Render/AuxiliaryQueuesDX7.cpp b/Source/Render/DX7/AuxiliaryQueuesDX7.cpp similarity index 100% rename from Source/Render/AuxiliaryQueuesDX7.cpp rename to Source/Render/DX7/AuxiliaryQueuesDX7.cpp diff --git a/Source/Render/DX7/BackBufferDX7.cpp b/Source/Render/DX7/BackBufferDX7.cpp index f0da098b0..453633bd6 100644 --- a/Source/Render/DX7/BackBufferDX7.cpp +++ b/Source/Render/DX7/BackBufferDX7.cpp @@ -1,5 +1,5 @@ #include "Render/DX7/DeviceOwnerDX7.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" // OFFSET: 0x00549570 // FUNCTION: fn_45504 diff --git a/Source/Render/DX7/DeviceCapabilitiesDX7.cpp b/Source/Render/DX7/DeviceCapabilitiesDX7.cpp index 78d81a96b..e28361675 100644 --- a/Source/Render/DX7/DeviceCapabilitiesDX7.cpp +++ b/Source/Render/DX7/DeviceCapabilitiesDX7.cpp @@ -2,7 +2,7 @@ #include "Render/DX7/DeviceOwnerDX7.h" #include "Render/DX7/TextureAllocationDX7.h" #include "Render/DeviceContext/DCSurface.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include "Render/Textures/Texture.h" #include "UI/GameSettings/GameSettingsUI.h" diff --git a/Source/Render/DX7/DirectDrawEnumeration.cpp b/Source/Render/DX7/DirectDrawEnumeration.cpp index c8c421ef9..79ca1ba4e 100644 --- a/Source/Render/DX7/DirectDrawEnumeration.cpp +++ b/Source/Render/DX7/DirectDrawEnumeration.cpp @@ -1,5 +1,5 @@ #include "Render/DX7/DirectDrawEnumeration.h" -#include "Render/DeviceSelection.h" +#include "Render/Device/DeviceSelection.h" #include #include diff --git a/Source/Render/DX7/DisplayModeDX7.cpp b/Source/Render/DX7/DisplayModeDX7.cpp index a6da04ff2..33fa4694c 100644 --- a/Source/Render/DX7/DisplayModeDX7.cpp +++ b/Source/Render/DX7/DisplayModeDX7.cpp @@ -1,5 +1,5 @@ #include "Render/DX7/DirectDrawEnumeration.h" -#include "Render/DisplayMode.h" +#include "Render/Device/DisplayMode.h" #include #include diff --git a/Source/Render/OpaqueQueuesDX7.cpp b/Source/Render/DX7/OpaqueQueuesDX7.cpp similarity index 100% rename from Source/Render/OpaqueQueuesDX7.cpp rename to Source/Render/DX7/OpaqueQueuesDX7.cpp diff --git a/Source/Render/DX7/QueuedDrawingDX7.h b/Source/Render/DX7/QueuedDrawingDX7.h index 3130b74aa..4e8c7d44a 100644 --- a/Source/Render/DX7/QueuedDrawingDX7.h +++ b/Source/Render/DX7/QueuedDrawingDX7.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_RENDER_DX7_QUEUEDDRAWINGDX7_H #include "Render/DX7/TextureDX7.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include "Render/Primitives/RenderQueues.h" #include diff --git a/Source/Render/DX7/RenderAdapterDX7.cpp b/Source/Render/DX7/RenderAdapterDX7.cpp index e15686406..14d917e36 100644 --- a/Source/Render/DX7/RenderAdapterDX7.cpp +++ b/Source/Render/DX7/RenderAdapterDX7.cpp @@ -1,5 +1,5 @@ #include "Render/DX7/DirectDrawEnumeration.h" -#include "Render/RenderAdapter.h" +#include "Render/Device/RenderAdapter.h" #include "Render/DX7/RenderSystemDX7.h" // OFFSET: 0x0056B8C0 diff --git a/Source/Render/DX7/RenderSystemDX7.cpp b/Source/Render/DX7/RenderSystemDX7.cpp index a0e522cf1..8f39b0eba 100644 --- a/Source/Render/DX7/RenderSystemDX7.cpp +++ b/Source/Render/DX7/RenderSystemDX7.cpp @@ -4,8 +4,8 @@ #include "Render/DX7/SurfaceDX7.h" #include "Render/DX7/TextureAllocationDX7.h" #include "Render/DX7/TextureDX7.h" -#include "Render/DeviceSelection.h" -#include "Render/RenderAdapter.h" +#include "Render/Device/DeviceSelection.h" +#include "Render/Device/RenderAdapter.h" #include diff --git a/Source/Render/DX7/RenderToTextureDX7.cpp b/Source/Render/DX7/RenderToTextureDX7.cpp index 687503d0d..6b38405db 100644 --- a/Source/Render/DX7/RenderToTextureDX7.cpp +++ b/Source/Render/DX7/RenderToTextureDX7.cpp @@ -1,7 +1,7 @@ #include "Render/DX7/RenderSystemDX7.h" #include "Render/DX7/DeviceOwnerDX7.h" #include "Render/Primitives/RenderPrimitive.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include "Render/Textures/TextureCache.h" #include "Render/DX7/TextureDX7.h" diff --git a/Source/Render/RendererDX7.cpp b/Source/Render/DX7/RendererDX7.cpp similarity index 98% rename from Source/Render/RendererDX7.cpp rename to Source/Render/DX7/RendererDX7.cpp index 8415a5cc9..4129bbea1 100644 --- a/Source/Render/RendererDX7.cpp +++ b/Source/Render/DX7/RendererDX7.cpp @@ -1,4 +1,4 @@ -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include diff --git a/Source/Render/RendererDX7.h b/Source/Render/DX7/RendererDX7.h similarity index 96% rename from Source/Render/RendererDX7.h rename to Source/Render/DX7/RendererDX7.h index 73c2e6974..52c3f7051 100644 --- a/Source/Render/RendererDX7.h +++ b/Source/Render/DX7/RendererDX7.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_RENDERERDX7_H -#define RAGNAROK_SOURCE_RENDER_RENDERERDX7_H +#ifndef RAGNAROK_SOURCE_RENDER_DX7_RENDERERDX7_H +#define RAGNAROK_SOURCE_RENDER_DX7_RENDERERDX7_H #include "Render/Renderer.h" diff --git a/Source/Render/DX7/RendererDX7Operations.cpp b/Source/Render/DX7/RendererDX7Operations.cpp index 530aa2ea7..77088f86d 100644 --- a/Source/Render/DX7/RendererDX7Operations.cpp +++ b/Source/Render/DX7/RendererDX7Operations.cpp @@ -3,13 +3,13 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/World/World.h" -#include "Render/BlendColor.h" +#include "Render/Drawing/BlendColor.h" #include "Render/DX7/DeviceOwnerDX7.h" #include "Render/DX7/QueuedDrawingDX7.h" #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitive.h" -#include "Render/RendererDX7.h" -#include "Render/TextureQuad.h" +#include "Render/DX7/RendererDX7.h" +#include "Render/Primitives/TextureQuad.h" #include #include diff --git a/Source/Render/DX7/RendererFogDX7.cpp b/Source/Render/DX7/RendererFogDX7.cpp index 5aa329ba8..516a40a9a 100644 --- a/Source/Render/DX7/RendererFogDX7.cpp +++ b/Source/Render/DX7/RendererFogDX7.cpp @@ -1,9 +1,9 @@ #include "Client/Application/ErrorDialog.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/DX7/RendererFogDX7.h" #include "Render/DX7/DeviceOwnerDX7.h" #include "Render/DeviceContext/DCSurface.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include #include diff --git a/Source/Render/DX7/RendererPresentationDX7.cpp b/Source/Render/DX7/RendererPresentationDX7.cpp index a4edbee5e..54f0533e3 100644 --- a/Source/Render/DX7/RendererPresentationDX7.cpp +++ b/Source/Render/DX7/RendererPresentationDX7.cpp @@ -1,7 +1,7 @@ #include "Render/DeviceContext/DCSurface.h" #include "Render/DX7/DeviceOwnerDX7.h" #include "Render/RendererBackBuffer.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include "Render/Text/TextContext.h" #include #include diff --git a/Source/Render/DX7/ScreenshotDX7.cpp b/Source/Render/DX7/ScreenshotDX7.cpp index 719b5145d..c620fc307 100644 --- a/Source/Render/DX7/ScreenshotDX7.cpp +++ b/Source/Render/DX7/ScreenshotDX7.cpp @@ -1,12 +1,12 @@ #include "Render/DX7/RenderSystemDX7.h" #include "Render/DX7/DeviceOwnerDX7.h" #include "Render/RendererBackBuffer.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include "Resource/Bitmap/BitmapImage.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/Bitmap/IJL15Runtime.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include #include diff --git a/Source/Render/DX7/TextureBindingDX7.cpp b/Source/Render/DX7/TextureBindingDX7.cpp index 10561874c..ee2af2ec0 100644 --- a/Source/Render/DX7/TextureBindingDX7.cpp +++ b/Source/Render/DX7/TextureBindingDX7.cpp @@ -1,5 +1,5 @@ #include "Render/DX7/RenderSystemDX7.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" #include "Render/DX7/TextureDX7.h" // OFFSET: 0x0055F7D0 diff --git a/Source/Render/DX7/TextureDX7.cpp b/Source/Render/DX7/TextureDX7.cpp index 1fb920efb..bfdbd2a30 100644 --- a/Source/Render/DX7/TextureDX7.cpp +++ b/Source/Render/DX7/TextureDX7.cpp @@ -5,7 +5,7 @@ #include "Render/DX7/TextureAllocationDX7.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include #include diff --git a/Source/Render/DX7/TextureModesDX7.cpp b/Source/Render/DX7/TextureModesDX7.cpp index 2e23164c1..80dc069ef 100644 --- a/Source/Render/DX7/TextureModesDX7.cpp +++ b/Source/Render/DX7/TextureModesDX7.cpp @@ -1,5 +1,5 @@ #include "Render/DX7/DeviceOwnerDX7.h" -#include "Render/RendererDX7.h" +#include "Render/DX7/RendererDX7.h" // OFFSET: 0x0055ED50 // FUNCTION: fn_02116 diff --git a/Source/Render/DeviceCapabilitiesDX9.cpp b/Source/Render/DX9/DeviceCapabilitiesDX9.cpp similarity index 100% rename from Source/Render/DeviceCapabilitiesDX9.cpp rename to Source/Render/DX9/DeviceCapabilitiesDX9.cpp diff --git a/Source/Render/DX9/DeviceRecoveryDX9.cpp b/Source/Render/DX9/DeviceRecoveryDX9.cpp index 5379b981f..37a36ab06 100644 --- a/Source/Render/DX9/DeviceRecoveryDX9.cpp +++ b/Source/Render/DX9/DeviceRecoveryDX9.cpp @@ -1,6 +1,6 @@ #include "Client/Application/ErrorDialog.h" #include "Render/DX9/DeviceOwnerDX9.h" -#include "Render/Direct3DErrors.h" +#include "Render/Device/Direct3DErrors.h" #include diff --git a/Source/Render/DX9/GroundQueuesDX9.cpp b/Source/Render/DX9/GroundQueuesDX9.cpp index a3f82b1a0..c7f12fe33 100644 --- a/Source/Render/DX9/GroundQueuesDX9.cpp +++ b/Source/Render/DX9/GroundQueuesDX9.cpp @@ -4,7 +4,7 @@ #include "Render/Primitives/RenderQueues.h" #include "Render/DX9/RendererDX9.h" #include "Render/DX9/TextureDX9.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include #include diff --git a/Source/Render/DX9/RenderSystemDX9.cpp b/Source/Render/DX9/RenderSystemDX9.cpp index 3a4f75e2d..89ccf2a6c 100644 --- a/Source/Render/DX9/RenderSystemDX9.cpp +++ b/Source/Render/DX9/RenderSystemDX9.cpp @@ -1,6 +1,6 @@ #include "Render/DX9/RenderSystemDX9.h" #include "UI/GameSettings/GameSettingsUI.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include #include diff --git a/Source/Render/DX9/RenderSystemDX9.h b/Source/Render/DX9/RenderSystemDX9.h index aec82f43d..dfea04264 100644 --- a/Source/Render/DX9/RenderSystemDX9.h +++ b/Source/Render/DX9/RenderSystemDX9.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_RENDER_DX9_RENDERSYSTEMDX9_H #include "Render/DX9/DeviceOwnerDX9.h" -#include "Render/RenderAdapter.h" +#include "Render/Device/RenderAdapter.h" #include "Render/RenderSystemBase.h" #include "Render/DX9/RendererDX9.h" diff --git a/Source/Render/DX9/RendererDX9.cpp b/Source/Render/DX9/RendererDX9.cpp index 61dd3324c..9358878eb 100644 --- a/Source/Render/DX9/RendererDX9.cpp +++ b/Source/Render/DX9/RendererDX9.cpp @@ -1,5 +1,5 @@ #include "Render/DX9/DeviceOwnerDX9.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/DX9/RendererDX9.h" #include "Render/Primitives/LightmappedPrimitive.h" #include "Client/Mode/CGameMode.h" @@ -8,7 +8,7 @@ #include "Render/DeviceContext/DCSurface.h" #include "Render/Textures/TextureCache.h" #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include diff --git a/Source/Render/DX9/RendererDX9Operations.cpp b/Source/Render/DX9/RendererDX9Operations.cpp index 8fd1c042f..9c94e83b1 100644 --- a/Source/Render/DX9/RendererDX9Operations.cpp +++ b/Source/Render/DX9/RendererDX9Operations.cpp @@ -1,9 +1,9 @@ #include "Render/DX9/DeviceOwnerDX9.h" -#include "Render/BlendColor.h" +#include "Render/Drawing/BlendColor.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/World/World.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/DX9/DeviceStateDX9.h" #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitive.h" diff --git a/Source/Render/DX9/RendererFogDX9.cpp b/Source/Render/DX9/RendererFogDX9.cpp index f032080b3..7dcef4761 100644 --- a/Source/Render/DX9/RendererFogDX9.cpp +++ b/Source/Render/DX9/RendererFogDX9.cpp @@ -5,7 +5,7 @@ #include "Render/DX9/RendererDX9.h" #include "Render/DX9/DeviceOwnerDX9.h" #include "Render/DX9/TextureDX9.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include diff --git a/Source/Render/DX9/TextureDX9.cpp b/Source/Render/DX9/TextureDX9.cpp index 5f11124ad..0da0d18c0 100644 --- a/Source/Render/DX9/TextureDX9.cpp +++ b/Source/Render/DX9/TextureDX9.cpp @@ -1,5 +1,5 @@ #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/DX9/DeviceOwnerDX9.h" #include "Render/DX9/D3DX9Runtime.h" #include "Render/DX9/SurfaceDX9.h" diff --git a/Source/Render/DeviceSelection.cpp b/Source/Render/Device/DeviceSelection.cpp similarity index 83% rename from Source/Render/DeviceSelection.cpp rename to Source/Render/Device/DeviceSelection.cpp index 39d71d40b..ce26767fc 100644 --- a/Source/Render/DeviceSelection.cpp +++ b/Source/Render/Device/DeviceSelection.cpp @@ -1,4 +1,4 @@ -#include "Render/DeviceSelection.h" +#include "Render/Device/DeviceSelection.h" // STATIC: 0x0173A878 // GLOBAL: gl_24397 diff --git a/Source/Render/DeviceSelection.h b/Source/Render/Device/DeviceSelection.h similarity index 51% rename from Source/Render/DeviceSelection.h rename to Source/Render/Device/DeviceSelection.h index 3031f51a2..3eac44258 100644 --- a/Source/Render/DeviceSelection.h +++ b/Source/Render/Device/DeviceSelection.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_DEVICESELECTION_H -#define RAGNAROK_SOURCE_RENDER_DEVICESELECTION_H +#ifndef RAGNAROK_SOURCE_RENDER_DEVICE_DEVICESELECTION_H +#define RAGNAROK_SOURCE_RENDER_DEVICE_DEVICESELECTION_H extern unsigned char g_guidDevice[16]; extern unsigned char g_guidDriver[16]; diff --git a/Source/Render/Direct3DErrors.cpp b/Source/Render/Device/Direct3DErrors.cpp similarity index 99% rename from Source/Render/Direct3DErrors.cpp rename to Source/Render/Device/Direct3DErrors.cpp index 84513d1c3..a4af713fb 100644 --- a/Source/Render/Direct3DErrors.cpp +++ b/Source/Render/Device/Direct3DErrors.cpp @@ -1,4 +1,4 @@ -#include "Render/Direct3DErrors.h" +#include "Render/Device/Direct3DErrors.h" #include diff --git a/Source/Render/Direct3DErrors.h b/Source/Render/Device/Direct3DErrors.h similarity index 54% rename from Source/Render/Direct3DErrors.h rename to Source/Render/Device/Direct3DErrors.h index f95788238..02e115f17 100644 --- a/Source/Render/Direct3DErrors.h +++ b/Source/Render/Device/Direct3DErrors.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_DIRECT3DERRORS_H -#define RAGNAROK_SOURCE_RENDER_DIRECT3DERRORS_H +#ifndef RAGNAROK_SOURCE_RENDER_DEVICE_DIRECT3DERRORS_H +#define RAGNAROK_SOURCE_RENDER_DEVICE_DIRECT3DERRORS_H #include diff --git a/Source/Render/DisplayMode.cpp b/Source/Render/Device/DisplayMode.cpp similarity index 94% rename from Source/Render/DisplayMode.cpp rename to Source/Render/Device/DisplayMode.cpp index ad0845f69..7473e03b5 100644 --- a/Source/Render/DisplayMode.cpp +++ b/Source/Render/Device/DisplayMode.cpp @@ -1,6 +1,6 @@ -#include "Client/Registry.h" -#include "Render/DeviceSelection.h" -#include "Render/DisplayMode.h" +#include "Client/Application/Registry.h" +#include "Render/Device/DeviceSelection.h" +#include "Render/Device/DisplayMode.h" #include #include diff --git a/Source/Render/DisplayMode.h b/Source/Render/Device/DisplayMode.h similarity index 88% rename from Source/Render/DisplayMode.h rename to Source/Render/Device/DisplayMode.h index 5990c8cf0..0631accb2 100644 --- a/Source/Render/DisplayMode.h +++ b/Source/Render/Device/DisplayMode.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_DISPLAYMODE_H -#define RAGNAROK_SOURCE_RENDER_DISPLAYMODE_H +#ifndef RAGNAROK_SOURCE_RENDER_DEVICE_DISPLAYMODE_H +#define RAGNAROK_SOURCE_RENDER_DEVICE_DISPLAYMODE_H #include #include diff --git a/Source/Render/RenderAdapter.cpp b/Source/Render/Device/RenderAdapter.cpp similarity index 96% rename from Source/Render/RenderAdapter.cpp rename to Source/Render/Device/RenderAdapter.cpp index d67a73af0..cfae59f47 100644 --- a/Source/Render/RenderAdapter.cpp +++ b/Source/Render/Device/RenderAdapter.cpp @@ -1,8 +1,8 @@ #include "Render/DX9/DeviceOwnerDX9.h" #include "Render/DX9/RenderSystemDX9.h" -#include "Render/RenderAdapter.h" -#include "Client/Session.h" -#include "Render/DeviceSelection.h" +#include "Render/Device/RenderAdapter.h" +#include "Client/Session/Session.h" +#include "Render/Device/DeviceSelection.h" #include "Render/DX7/RenderSystemDX7.h" #include "UI/GameSettings/GameSettingsUI.h" diff --git a/Source/Render/RenderAdapter.h b/Source/Render/Device/RenderAdapter.h similarity index 94% rename from Source/Render/RenderAdapter.h rename to Source/Render/Device/RenderAdapter.h index 057056789..ae13ea501 100644 --- a/Source/Render/RenderAdapter.h +++ b/Source/Render/Device/RenderAdapter.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_RENDERADAPTER_H -#define RAGNAROK_SOURCE_RENDER_RENDERADAPTER_H +#ifndef RAGNAROK_SOURCE_RENDER_DEVICE_RENDERADAPTER_H +#define RAGNAROK_SOURCE_RENDER_DEVICE_RENDERADAPTER_H #include #include diff --git a/Source/Render/RenderBackends.cpp b/Source/Render/Device/RenderBackends.cpp similarity index 85% rename from Source/Render/RenderBackends.cpp rename to Source/Render/Device/RenderBackends.cpp index 6d5b7e647..c9ae7713b 100644 --- a/Source/Render/RenderBackends.cpp +++ b/Source/Render/Device/RenderBackends.cpp @@ -1,4 +1,4 @@ -#include "Render/RenderBackends.h" +#include "Render/Device/RenderBackends.h" // OFFSET: 0x0056A2A0 // FUNCTION: fn_02289 diff --git a/Source/Render/RenderBackends.h b/Source/Render/Device/RenderBackends.h similarity index 73% rename from Source/Render/RenderBackends.h rename to Source/Render/Device/RenderBackends.h index c03a9b95d..5781ce0b3 100644 --- a/Source/Render/RenderBackends.h +++ b/Source/Render/Device/RenderBackends.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_RENDERBACKENDS_H -#define RAGNAROK_SOURCE_RENDER_RENDERBACKENDS_H +#ifndef RAGNAROK_SOURCE_RENDER_DEVICE_RENDERBACKENDS_H +#define RAGNAROK_SOURCE_RENDER_DEVICE_RENDERBACKENDS_H #include #include diff --git a/Source/Render/DeviceContext/DCSurface.cpp b/Source/Render/DeviceContext/DCSurface.cpp index c12283fcc..b276ceaaf 100644 --- a/Source/Render/DeviceContext/DCSurface.cpp +++ b/Source/Render/DeviceContext/DCSurface.cpp @@ -4,7 +4,7 @@ #include "Render/DX7/RenderSystemDX7.h" #include "Render/DX9/RenderSystemDX9.h" #include "Render/Text/TextContext.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/LuaScript.h" #include diff --git a/Source/Render/ActionSpriteDrawing.cpp b/Source/Render/Drawing/ActionSpriteDrawing.cpp similarity index 97% rename from Source/Render/ActionSpriteDrawing.cpp rename to Source/Render/Drawing/ActionSpriteDrawing.cpp index eb87db498..d50cb7193 100644 --- a/Source/Render/ActionSpriteDrawing.cpp +++ b/Source/Render/Drawing/ActionSpriteDrawing.cpp @@ -1,7 +1,7 @@ #include "Contents/Configuration/ServiceConfiguration.h" -#include "Render/ActionSpriteDrawing.h" +#include "Render/Drawing/ActionSpriteDrawing.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/SpriteAtlas.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Render/ActionSpriteDrawing.h b/Source/Render/Drawing/ActionSpriteDrawing.h similarity index 70% rename from Source/Render/ActionSpriteDrawing.h rename to Source/Render/Drawing/ActionSpriteDrawing.h index 68bd072cb..eba19d595 100644 --- a/Source/Render/ActionSpriteDrawing.h +++ b/Source/Render/Drawing/ActionSpriteDrawing.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_ACTIONSPRITEDRAWING_H -#define RAGNAROK_SOURCE_RENDER_ACTIONSPRITEDRAWING_H +#ifndef RAGNAROK_SOURCE_RENDER_DRAWING_ACTIONSPRITEDRAWING_H +#define RAGNAROK_SOURCE_RENDER_DRAWING_ACTIONSPRITEDRAWING_H #include diff --git a/Source/Render/BitmapDrawing.cpp b/Source/Render/Drawing/BitmapDrawing.cpp similarity index 92% rename from Source/Render/BitmapDrawing.cpp rename to Source/Render/Drawing/BitmapDrawing.cpp index 759b53e43..1b95d1a34 100644 --- a/Source/Render/BitmapDrawing.cpp +++ b/Source/Render/Drawing/BitmapDrawing.cpp @@ -1,4 +1,4 @@ -#include "Render/BitmapDrawing.h" +#include "Render/Drawing/BitmapDrawing.h" #include "Render/DeviceContext/DCBitmap.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/Render/BitmapDrawing.h b/Source/Render/Drawing/BitmapDrawing.h similarity index 56% rename from Source/Render/BitmapDrawing.h rename to Source/Render/Drawing/BitmapDrawing.h index 0f209e799..7fd072c17 100644 --- a/Source/Render/BitmapDrawing.h +++ b/Source/Render/Drawing/BitmapDrawing.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_BITMAPDRAWING_H -#define RAGNAROK_SOURCE_RENDER_BITMAPDRAWING_H +#ifndef RAGNAROK_SOURCE_RENDER_DRAWING_BITMAPDRAWING_H +#define RAGNAROK_SOURCE_RENDER_DRAWING_BITMAPDRAWING_H class CRenderSystemBase; class CBitmapRes; diff --git a/Source/Render/Drawing/BlendColor.cpp b/Source/Render/Drawing/BlendColor.cpp new file mode 100644 index 000000000..dfc0140d4 --- /dev/null +++ b/Source/Render/Drawing/BlendColor.cpp @@ -0,0 +1 @@ +#include "Render/Drawing/BlendColor.h" diff --git a/Source/Render/Drawing/BlendColor.h b/Source/Render/Drawing/BlendColor.h new file mode 100644 index 000000000..2455be758 --- /dev/null +++ b/Source/Render/Drawing/BlendColor.h @@ -0,0 +1,6 @@ +#ifndef RAGNAROK_SOURCE_RENDER_DRAWING_BLENDCOLOR_H +#define RAGNAROK_SOURCE_RENDER_DRAWING_BLENDCOLOR_H + +#include "Render/Renderer.h" + +#endif diff --git a/Source/Render/SpriteGeometry.cpp b/Source/Render/Drawing/SpriteGeometry.cpp similarity index 98% rename from Source/Render/SpriteGeometry.cpp rename to Source/Render/Drawing/SpriteGeometry.cpp index 6edcb168d..69793ee6d 100644 --- a/Source/Render/SpriteGeometry.cpp +++ b/Source/Render/Drawing/SpriteGeometry.cpp @@ -1,6 +1,6 @@ #include "Contents/Actors/CharacterRender.h" #include "Render/Renderer.h" -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Render/Textures/SpritePixels.h" #include diff --git a/Source/Render/SpriteGeometry.h b/Source/Render/Drawing/SpriteGeometry.h similarity index 86% rename from Source/Render/SpriteGeometry.h rename to Source/Render/Drawing/SpriteGeometry.h index e1df53137..a3112f194 100644 --- a/Source/Render/SpriteGeometry.h +++ b/Source/Render/Drawing/SpriteGeometry.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_SPRITEGEOMETRY_H -#define RAGNAROK_SOURCE_RENDER_SPRITEGEOMETRY_H +#ifndef RAGNAROK_SOURCE_RENDER_DRAWING_SPRITEGEOMETRY_H +#define RAGNAROK_SOURCE_RENDER_DRAWING_SPRITEGEOMETRY_H #include #include diff --git a/Source/Render/TextureStageModes.h b/Source/Render/Drawing/TextureStageModes.h similarity index 98% rename from Source/Render/TextureStageModes.h rename to Source/Render/Drawing/TextureStageModes.h index 83d48e952..d00ab0c0e 100644 --- a/Source/Render/TextureStageModes.h +++ b/Source/Render/Drawing/TextureStageModes.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_TEXTURESTAGEMODES_H -#define RAGNAROK_SOURCE_RENDER_TEXTURESTAGEMODES_H +#ifndef RAGNAROK_SOURCE_RENDER_DRAWING_TEXTURESTAGEMODES_H +#define RAGNAROK_SOURCE_RENDER_DRAWING_TEXTURESTAGEMODES_H #include #include diff --git a/Source/Render/AlphaRectangle.cpp b/Source/Render/Primitives/AlphaRectangle.cpp similarity index 97% rename from Source/Render/AlphaRectangle.cpp rename to Source/Render/Primitives/AlphaRectangle.cpp index d3f0f436a..b743db478 100644 --- a/Source/Render/AlphaRectangle.cpp +++ b/Source/Render/Primitives/AlphaRectangle.cpp @@ -2,7 +2,7 @@ #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/TextureCache.h" // OFFSET: 0x0054E460 diff --git a/Source/Render/AuxiliarySubmission.cpp b/Source/Render/Primitives/AuxiliarySubmission.cpp similarity index 93% rename from Source/Render/AuxiliarySubmission.cpp rename to Source/Render/Primitives/AuxiliarySubmission.cpp index 241991860..fba4fc779 100644 --- a/Source/Render/AuxiliarySubmission.cpp +++ b/Source/Render/Primitives/AuxiliarySubmission.cpp @@ -1,4 +1,4 @@ -#include "Render/AuxiliarySubmission.h" +#include "Render/Primitives/AuxiliarySubmission.h" #include "Render/Renderer.h" #include "Render/Primitives/DepthAlpha.h" diff --git a/Source/Render/AuxiliarySubmission.h b/Source/Render/Primitives/AuxiliarySubmission.h similarity index 61% rename from Source/Render/AuxiliarySubmission.h rename to Source/Render/Primitives/AuxiliarySubmission.h index 494cb6270..5a1a1c932 100644 --- a/Source/Render/AuxiliarySubmission.h +++ b/Source/Render/Primitives/AuxiliarySubmission.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_AUXILIARYSUBMISSION_H -#define RAGNAROK_SOURCE_RENDER_AUXILIARYSUBMISSION_H +#ifndef RAGNAROK_SOURCE_RENDER_PRIMITIVES_AUXILIARYSUBMISSION_H +#define RAGNAROK_SOURCE_RENDER_PRIMITIVES_AUXILIARYSUBMISSION_H class CRenderer; struct LightmappedPrimitive; diff --git a/Source/Render/Primitives/DepthAlpha.cpp b/Source/Render/Primitives/DepthAlpha.cpp index cc304f3b4..82b21486a 100644 --- a/Source/Render/Primitives/DepthAlpha.cpp +++ b/Source/Render/Primitives/DepthAlpha.cpp @@ -1,7 +1,7 @@ #include "Render/Primitives/DepthAlpha.h" #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitive.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" __declspec(noinline) std::uint32_t DepthAlpha(float reciprocalDepth); diff --git a/Source/Render/Primitives/ScreenLine.cpp b/Source/Render/Primitives/ScreenLine.cpp index e117645df..d02f2abf5 100644 --- a/Source/Render/Primitives/ScreenLine.cpp +++ b/Source/Render/Primitives/ScreenLine.cpp @@ -1,7 +1,7 @@ #include "Render/DeviceContext/DCSurface.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/Textures/TextureCache.h" #include "Script/LuaScript.h" #include "Script/MiniMapPosition.h" @@ -11,8 +11,8 @@ #include "Contents/Map/MapSkyMgr.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" -#include "Render/ScreenGeometry.h" -#include "Render/TextureQuad.h" +#include "Render/Projection/ScreenGeometry.h" +#include "Render/Primitives/TextureQuad.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Primitives/RenderPrimitivePool.h" diff --git a/Source/Render/SpriteQuad.cpp b/Source/Render/Primitives/SpriteQuad.cpp similarity index 97% rename from Source/Render/SpriteQuad.cpp rename to Source/Render/Primitives/SpriteQuad.cpp index 46c14d53a..977689be4 100644 --- a/Source/Render/SpriteQuad.cpp +++ b/Source/Render/Primitives/SpriteQuad.cpp @@ -1,7 +1,7 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Render/Renderer.h" -#include "Render/SpriteQuad.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/SpriteQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Render/SpriteQuad.h b/Source/Render/Primitives/SpriteQuad.h similarity index 88% rename from Source/Render/SpriteQuad.h rename to Source/Render/Primitives/SpriteQuad.h index 75ba6981e..a9a99a1c4 100644 --- a/Source/Render/SpriteQuad.h +++ b/Source/Render/Primitives/SpriteQuad.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_SPRITEQUAD_H -#define RAGNAROK_SOURCE_RENDER_SPRITEQUAD_H +#ifndef RAGNAROK_SOURCE_RENDER_PRIMITIVES_SPRITEQUAD_H +#define RAGNAROK_SOURCE_RENDER_PRIMITIVES_SPRITEQUAD_H #include #include diff --git a/Source/Render/TextureQuad.cpp b/Source/Render/Primitives/TextureQuad.cpp similarity index 98% rename from Source/Render/TextureQuad.cpp rename to Source/Render/Primitives/TextureQuad.cpp index 5587dd8b8..9c7a7d5ef 100644 --- a/Source/Render/TextureQuad.cpp +++ b/Source/Render/Primitives/TextureQuad.cpp @@ -2,7 +2,7 @@ #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Render/TextureQuad.h b/Source/Render/Primitives/TextureQuad.h similarity index 78% rename from Source/Render/TextureQuad.h rename to Source/Render/Primitives/TextureQuad.h index 0c353bef1..a469cb802 100644 --- a/Source/Render/TextureQuad.h +++ b/Source/Render/Primitives/TextureQuad.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_TEXTUREQUAD_H -#define RAGNAROK_SOURCE_RENDER_TEXTUREQUAD_H +#ifndef RAGNAROK_SOURCE_RENDER_PRIMITIVES_TEXTUREQUAD_H +#define RAGNAROK_SOURCE_RENDER_PRIMITIVES_TEXTUREQUAD_H #include diff --git a/Source/Render/UIRPDataDrawing.cpp b/Source/Render/Primitives/UIRPDataDrawing.cpp similarity index 100% rename from Source/Render/UIRPDataDrawing.cpp rename to Source/Render/Primitives/UIRPDataDrawing.cpp diff --git a/Source/Render/Projection/RendererViewport.cpp b/Source/Render/Projection/RendererViewport.cpp index 04c8eba0e..8207ef398 100644 --- a/Source/Render/Projection/RendererViewport.cpp +++ b/Source/Render/Projection/RendererViewport.cpp @@ -1,4 +1,4 @@ -#include "Render/SpriteGeometry.h" +#include "Render/Drawing/SpriteGeometry.h" #include "Render/Projection/RendererViewport.h" #include diff --git a/Source/Render/ScreenGeometry.cpp b/Source/Render/Projection/ScreenGeometry.cpp similarity index 97% rename from Source/Render/ScreenGeometry.cpp rename to Source/Render/Projection/ScreenGeometry.cpp index af6c4a610..20a613f50 100644 --- a/Source/Render/ScreenGeometry.cpp +++ b/Source/Render/Projection/ScreenGeometry.cpp @@ -1,9 +1,9 @@ -#include "Render/ScreenGeometry.h" +#include "Render/Projection/ScreenGeometry.h" #include "Render/DX9/RendererDX9.h" #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Render/ScreenGeometry.h b/Source/Render/Projection/ScreenGeometry.h similarity index 83% rename from Source/Render/ScreenGeometry.h rename to Source/Render/Projection/ScreenGeometry.h index dd9a8b902..30ba57ec9 100644 --- a/Source/Render/ScreenGeometry.h +++ b/Source/Render/Projection/ScreenGeometry.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_SCREENGEOMETRY_H -#define RAGNAROK_SOURCE_RENDER_SCREENGEOMETRY_H +#ifndef RAGNAROK_SOURCE_RENDER_PROJECTION_SCREENGEOMETRY_H +#define RAGNAROK_SOURCE_RENDER_PROJECTION_SCREENGEOMETRY_H #include diff --git a/Source/Render/ScreenRectangle.cpp b/Source/Render/Projection/ScreenRectangle.cpp similarity index 98% rename from Source/Render/ScreenRectangle.cpp rename to Source/Render/Projection/ScreenRectangle.cpp index aaf2af64e..be3ca7aae 100644 --- a/Source/Render/ScreenRectangle.cpp +++ b/Source/Render/Projection/ScreenRectangle.cpp @@ -1,8 +1,8 @@ -#include "Render/ScreenRectangle.h" +#include "Render/Projection/ScreenRectangle.h" #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" diff --git a/Source/Render/ScreenRectangle.h b/Source/Render/Projection/ScreenRectangle.h similarity index 77% rename from Source/Render/ScreenRectangle.h rename to Source/Render/Projection/ScreenRectangle.h index 21c4c14a5..b8d13f640 100644 --- a/Source/Render/ScreenRectangle.h +++ b/Source/Render/Projection/ScreenRectangle.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RENDER_SCREENRECTANGLE_H -#define RAGNAROK_SOURCE_RENDER_SCREENRECTANGLE_H +#ifndef RAGNAROK_SOURCE_RENDER_PROJECTION_SCREENRECTANGLE_H +#define RAGNAROK_SOURCE_RENDER_PROJECTION_SCREENRECTANGLE_H #include diff --git a/Source/Render/ViewportProjection.cpp b/Source/Render/Projection/ViewportProjection.cpp similarity index 100% rename from Source/Render/ViewportProjection.cpp rename to Source/Render/Projection/ViewportProjection.cpp diff --git a/Source/Render/Renderer.cpp b/Source/Render/Renderer.cpp index a884e0f4b..97f08d2dd 100644 --- a/Source/Render/Renderer.cpp +++ b/Source/Render/Renderer.cpp @@ -1,12 +1,12 @@ #include "Render/Renderer.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Jobs/JobInheritance.h" -#include "Render/ActionSpriteDrawing.h" -#include "Render/TextureQuad.h" +#include "Render/Drawing/ActionSpriteDrawing.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Render/Textures/TextureCache.cpp b/Source/Render/Textures/TextureCache.cpp index e5460a190..62a1d0f75 100644 --- a/Source/Render/Textures/TextureCache.cpp +++ b/Source/Render/Textures/TextureCache.cpp @@ -8,7 +8,7 @@ #include "Render/Textures/TextureCache.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include #include diff --git a/Source/Resource/BinkRuntime.h b/Source/Resource/Audio/BinkRuntime.h similarity index 93% rename from Source/Resource/BinkRuntime.h rename to Source/Resource/Audio/BinkRuntime.h index 84dd00f0f..286679302 100644 --- a/Source/Resource/BinkRuntime.h +++ b/Source/Resource/Audio/BinkRuntime.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_BINKRUNTIME_H -#define RAGNAROK_SOURCE_RESOURCE_BINKRUNTIME_H +#ifndef RAGNAROK_SOURCE_RESOURCE_AUDIO_BINKRUNTIME_H +#define RAGNAROK_SOURCE_RESOURCE_AUDIO_BINKRUNTIME_H #include #include diff --git a/Source/Resource/EmblemResource.cpp b/Source/Resource/Bitmap/EmblemResource.cpp similarity index 97% rename from Source/Resource/EmblemResource.cpp rename to Source/Resource/Bitmap/EmblemResource.cpp index c742c1574..34dd81adb 100644 --- a/Source/Resource/EmblemResource.cpp +++ b/Source/Resource/Bitmap/EmblemResource.cpp @@ -1,4 +1,4 @@ -#include "Resource/EmblemResource.h" +#include "Resource/Bitmap/EmblemResource.h" #include "Contents/Guild/GuildMgr.h" #include "File/File.h" diff --git a/Source/Resource/EmblemResource.h b/Source/Resource/Bitmap/EmblemResource.h similarity index 72% rename from Source/Resource/EmblemResource.h rename to Source/Resource/Bitmap/EmblemResource.h index 86b7b6966..574a52b4e 100644 --- a/Source/Resource/EmblemResource.h +++ b/Source/Resource/Bitmap/EmblemResource.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_EMBLEMRESOURCE_H -#define RAGNAROK_SOURCE_RESOURCE_EMBLEMRESOURCE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_BITMAP_EMBLEMRESOURCE_H +#define RAGNAROK_SOURCE_RESOURCE_BITMAP_EMBLEMRESOURCE_H -#include "Resource/GifResource.h" +#include "Resource/Bitmap/GifResource.h" #include "Resource/Resource.h" class CEmblemRes : public CRes { diff --git a/Source/Resource/GifLzw.cpp b/Source/Resource/Bitmap/GifLzw.cpp similarity index 98% rename from Source/Resource/GifLzw.cpp rename to Source/Resource/Bitmap/GifLzw.cpp index e704cc1d6..9fbe0fb08 100644 --- a/Source/Resource/GifLzw.cpp +++ b/Source/Resource/Bitmap/GifLzw.cpp @@ -1,4 +1,4 @@ -#include "Resource/GifResource.h" +#include "Resource/Bitmap/GifResource.h" #include diff --git a/Source/Resource/GifLzw.h b/Source/Resource/Bitmap/GifLzw.h similarity index 56% rename from Source/Resource/GifLzw.h rename to Source/Resource/Bitmap/GifLzw.h index aefe84fed..8ce3be307 100644 --- a/Source/Resource/GifLzw.h +++ b/Source/Resource/Bitmap/GifLzw.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_GIFLZW_H -#define RAGNAROK_SOURCE_RESOURCE_GIFLZW_H +#ifndef RAGNAROK_SOURCE_RESOURCE_BITMAP_GIFLZW_H +#define RAGNAROK_SOURCE_RESOURCE_BITMAP_GIFLZW_H int __stdcall DecodeGifLzw(int minimumCodeSize, const unsigned char* input, int inputBytes, unsigned char* output); diff --git a/Source/Resource/GifResource.cpp b/Source/Resource/Bitmap/GifResource.cpp similarity index 99% rename from Source/Resource/GifResource.cpp rename to Source/Resource/Bitmap/GifResource.cpp index 7473ee090..0eb67c647 100644 --- a/Source/Resource/GifResource.cpp +++ b/Source/Resource/Bitmap/GifResource.cpp @@ -1,8 +1,8 @@ -#include "Resource/GifResource.h" +#include "Resource/Bitmap/GifResource.h" #include "Client/Application/ErrorDialog.h" #include "File/File.h" -#include "Resource/GifLzw.h" +#include "Resource/Bitmap/GifLzw.h" #include "Render/DeviceContext/DCSurface.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Resource/GifResource.h b/Source/Resource/Bitmap/GifResource.h similarity index 89% rename from Source/Resource/GifResource.h rename to Source/Resource/Bitmap/GifResource.h index cc2eaa8fc..ab986e8f7 100644 --- a/Source/Resource/GifResource.h +++ b/Source/Resource/Bitmap/GifResource.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_GIFRESOURCE_H -#define RAGNAROK_SOURCE_RESOURCE_GIFRESOURCE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_BITMAP_GIFRESOURCE_H +#define RAGNAROK_SOURCE_RESOURCE_BITMAP_GIFRESOURCE_H #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/Resource/PaletteResource.cpp b/Source/Resource/Bitmap/PaletteResource.cpp similarity index 96% rename from Source/Resource/PaletteResource.cpp rename to Source/Resource/Bitmap/PaletteResource.cpp index c085bade5..5754aff4a 100644 --- a/Source/Resource/PaletteResource.cpp +++ b/Source/Resource/Bitmap/PaletteResource.cpp @@ -1,4 +1,4 @@ -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Client/Application/ErrorDialog.h" #include "File/File.h" #include "Render/DeviceContext/DCSurface.h" diff --git a/Source/Resource/PaletteResource.h b/Source/Resource/Bitmap/PaletteResource.h similarity index 80% rename from Source/Resource/PaletteResource.h rename to Source/Resource/Bitmap/PaletteResource.h index 2fd903ff5..f2cfff183 100644 --- a/Source/Resource/PaletteResource.h +++ b/Source/Resource/Bitmap/PaletteResource.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_PALETTERESOURCE_H -#define RAGNAROK_SOURCE_RESOURCE_PALETTERESOURCE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_BITMAP_PALETTERESOURCE_H +#define RAGNAROK_SOURCE_RESOURCE_BITMAP_PALETTERESOURCE_H #include "Resource/Resource.h" diff --git a/Source/Resource/SkinPalette.cpp b/Source/Resource/Bitmap/SkinPalette.cpp similarity index 93% rename from Source/Resource/SkinPalette.cpp rename to Source/Resource/Bitmap/SkinPalette.cpp index 0b71c0c33..e5ce46ed8 100644 --- a/Source/Resource/SkinPalette.cpp +++ b/Source/Resource/Bitmap/SkinPalette.cpp @@ -1,7 +1,7 @@ -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" // INLINED std::uint32_t SkinPaletteColor(ResourceMgr& resources, const SkinPaletteCell& cell, bool resolveSkin) { diff --git a/Source/Resource/SkinPalette.h b/Source/Resource/Bitmap/SkinPalette.h similarity index 79% rename from Source/Resource/SkinPalette.h rename to Source/Resource/Bitmap/SkinPalette.h index 85449c495..a55ec07ee 100644 --- a/Source/Resource/SkinPalette.h +++ b/Source/Resource/Bitmap/SkinPalette.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_SKINPALETTE_H -#define RAGNAROK_SOURCE_RESOURCE_SKINPALETTE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_BITMAP_SKINPALETTE_H +#define RAGNAROK_SOURCE_RESOURCE_BITMAP_SKINPALETTE_H #include diff --git a/Source/Resource/TextureNames.cpp b/Source/Resource/Bitmap/TextureNames.cpp similarity index 98% rename from Source/Resource/TextureNames.cpp rename to Source/Resource/Bitmap/TextureNames.cpp index 925cc9d0b..8b06b8f75 100644 --- a/Source/Resource/TextureNames.cpp +++ b/Source/Resource/Bitmap/TextureNames.cpp @@ -4,7 +4,7 @@ #include "Contents/Skin/SkinMgr.h" #include "Resource/ResourceMgr.h" #include "File/ResourcePath.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include #include diff --git a/Source/Resource/Bitmap/TextureNames.h b/Source/Resource/Bitmap/TextureNames.h new file mode 100644 index 000000000..1ec7aba07 --- /dev/null +++ b/Source/Resource/Bitmap/TextureNames.h @@ -0,0 +1,6 @@ +#ifndef RAGNAROK_SOURCE_RESOURCE_BITMAP_TEXTURENAMES_H +#define RAGNAROK_SOURCE_RESOURCE_BITMAP_TEXTURENAMES_H + +const char* Resolve(const char* name); + +#endif diff --git a/Source/Resource/EZeffectResource.cpp b/Source/Resource/Effects/EZeffectResource.cpp similarity index 98% rename from Source/Resource/EZeffectResource.cpp rename to Source/Resource/Effects/EZeffectResource.cpp index 7af94a19e..70a05ec53 100644 --- a/Source/Resource/EZeffectResource.cpp +++ b/Source/Resource/Effects/EZeffectResource.cpp @@ -1,7 +1,7 @@ #include "Client/Application/ErrorDialog.h" #include "Render/Textures/Texture.h" #include "Render/DeviceContext/DCSurface.h" -#include "Resource/EZeffectResource.h" +#include "Resource/Effects/EZeffectResource.h" #include "Render/Textures/TextureCache.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Resource/EZeffectResource.h b/Source/Resource/Effects/EZeffectResource.h similarity index 94% rename from Source/Resource/EZeffectResource.h rename to Source/Resource/Effects/EZeffectResource.h index 3d4470927..c354474bc 100644 --- a/Source/Resource/EZeffectResource.h +++ b/Source/Resource/Effects/EZeffectResource.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_EZEFFECTRESOURCE_H -#define RAGNAROK_SOURCE_RESOURCE_EZEFFECTRESOURCE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_EFFECTS_EZEFFECTRESOURCE_H +#define RAGNAROK_SOURCE_RESOURCE_EFFECTS_EZEFFECTRESOURCE_H #include "File/File.h" #include "Resource/Resource.h" diff --git a/Source/Utility/JsonCppLoader.cpp b/Source/Resource/Json/JsonCppLoader.cpp similarity index 99% rename from Source/Utility/JsonCppLoader.cpp rename to Source/Resource/Json/JsonCppLoader.cpp index 190772103..8bb5fbe9c 100644 --- a/Source/Utility/JsonCppLoader.cpp +++ b/Source/Resource/Json/JsonCppLoader.cpp @@ -1,4 +1,4 @@ -#include "Utility/JsonCppLoader.h" +#include "Resource/Json/JsonCppLoader.h" #include #include diff --git a/Source/Utility/JsonCppLoader.h b/Source/Resource/Json/JsonCppLoader.h similarity index 98% rename from Source/Utility/JsonCppLoader.h rename to Source/Resource/Json/JsonCppLoader.h index 829ece43e..2bf8918d3 100644 --- a/Source/Utility/JsonCppLoader.h +++ b/Source/Resource/Json/JsonCppLoader.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_JSONCPPLOADER_H -#define RAGNAROK_SOURCE_UTILITY_JSONCPPLOADER_H +#ifndef RAGNAROK_SOURCE_RESOURCE_JSON_JSONCPPLOADER_H +#define RAGNAROK_SOURCE_RESOURCE_JSON_JSONCPPLOADER_H #include #include diff --git a/Source/Resource/Models/ModelResource.cpp b/Source/Resource/Models/ModelResource.cpp index 7ff7441c2..d7b032a48 100644 --- a/Source/Resource/Models/ModelResource.cpp +++ b/Source/Resource/Models/ModelResource.cpp @@ -1,5 +1,5 @@ #include "Client/Application/ErrorDialog.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "File/File.h" #include "File/ResourcePath.h" #include "Render/DeviceContext/DCSurface.h" diff --git a/Source/Resource/RmaResource.cpp b/Source/Resource/Models/RmaResource.cpp similarity index 97% rename from Source/Resource/RmaResource.cpp rename to Source/Resource/Models/RmaResource.cpp index 23f796bfc..b46bd4286 100644 --- a/Source/Resource/RmaResource.cpp +++ b/Source/Resource/Models/RmaResource.cpp @@ -1,8 +1,8 @@ -#include "Resource/RmaResource.h" +#include "Resource/Models/RmaResource.h" #include "Client/Application/ErrorDialog.h" #include "File/File.h" #include "Render/DeviceContext/DCSurface.h" -#include "Utility/Tokenizer.h" +#include "Utility/Text/Tokenizer.h" #include "Resource/ResourceMgr.h" #include diff --git a/Source/Resource/RmaResource.h b/Source/Resource/Models/RmaResource.h similarity index 90% rename from Source/Resource/RmaResource.h rename to Source/Resource/Models/RmaResource.h index 730c57361..85ec275d2 100644 --- a/Source/Resource/RmaResource.h +++ b/Source/Resource/Models/RmaResource.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_RMARESOURCE_H -#define RAGNAROK_SOURCE_RESOURCE_RMARESOURCE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_MODELS_RMARESOURCE_H +#define RAGNAROK_SOURCE_RESOURCE_MODELS_RMARESOURCE_H #include "Resource/Resource.h" diff --git a/Source/Resource/ImfLayerIndex.cpp b/Source/Resource/Sprites/ImfLayerIndex.cpp similarity index 94% rename from Source/Resource/ImfLayerIndex.cpp rename to Source/Resource/Sprites/ImfLayerIndex.cpp index 1a392c93c..257d29fca 100644 --- a/Source/Resource/ImfLayerIndex.cpp +++ b/Source/Resource/Sprites/ImfLayerIndex.cpp @@ -1,4 +1,4 @@ -#include "Resource/ImfResource.h" +#include "Resource/Sprites/ImfResource.h" // OFFSET: 0x00750540 // FUNCTION: fn_07937 diff --git a/Source/Resource/ImfResource.cpp b/Source/Resource/Sprites/ImfResource.cpp similarity index 97% rename from Source/Resource/ImfResource.cpp rename to Source/Resource/Sprites/ImfResource.cpp index 6eea7c1a5..9902fc211 100644 --- a/Source/Resource/ImfResource.cpp +++ b/Source/Resource/Sprites/ImfResource.cpp @@ -1,4 +1,4 @@ -#include "Resource/ImfResource.h" +#include "Resource/Sprites/ImfResource.h" #include "File/File.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Resource/ImfResource.h b/Source/Resource/Sprites/ImfResource.h similarity index 87% rename from Source/Resource/ImfResource.h rename to Source/Resource/Sprites/ImfResource.h index e71575f23..1943e32dc 100644 --- a/Source/Resource/ImfResource.h +++ b/Source/Resource/Sprites/ImfResource.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_IMFRESOURCE_H -#define RAGNAROK_SOURCE_RESOURCE_IMFRESOURCE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_SPRITES_IMFRESOURCE_H +#define RAGNAROK_SOURCE_RESOURCE_SPRITES_IMFRESOURCE_H #include "Resource/Resource.h" diff --git a/Source/Resource/TextureNames.h b/Source/Resource/TextureNames.h deleted file mode 100644 index 40d60cc5d..000000000 --- a/Source/Resource/TextureNames.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_TEXTURENAMES_H -#define RAGNAROK_SOURCE_RESOURCE_TEXTURENAMES_H - -const char* Resolve(const char* name); - -#endif diff --git a/Source/Resource/XmlNode.cpp b/Source/Resource/Xml/XmlNode.cpp similarity index 97% rename from Source/Resource/XmlNode.cpp rename to Source/Resource/Xml/XmlNode.cpp index 6da84a1c7..05eb33c58 100644 --- a/Source/Resource/XmlNode.cpp +++ b/Source/Resource/Xml/XmlNode.cpp @@ -1,4 +1,4 @@ -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" #include #include diff --git a/Source/Resource/XmlNode.h b/Source/Resource/Xml/XmlNode.h similarity index 91% rename from Source/Resource/XmlNode.h rename to Source/Resource/Xml/XmlNode.h index e4b817a88..25dc1ac70 100644 --- a/Source/Resource/XmlNode.h +++ b/Source/Resource/Xml/XmlNode.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_RESOURCE_XMLNODE_H -#define RAGNAROK_SOURCE_RESOURCE_XMLNODE_H +#ifndef RAGNAROK_SOURCE_RESOURCE_XML_XMLNODE_H +#define RAGNAROK_SOURCE_RESOURCE_XML_XMLNODE_H #include #include diff --git a/Source/Resource/XmlParsing.cpp b/Source/Resource/Xml/XmlParsing.cpp similarity index 99% rename from Source/Resource/XmlParsing.cpp rename to Source/Resource/Xml/XmlParsing.cpp index 32d3b3b28..fc1483802 100644 --- a/Source/Resource/XmlParsing.cpp +++ b/Source/Resource/Xml/XmlParsing.cpp @@ -1,4 +1,4 @@ -#include "Resource/XmlNode.h" +#include "Resource/Xml/XmlNode.h" #include #include diff --git a/Source/Script/LuaScript.cpp b/Source/Script/LuaScript.cpp index 524464fe3..26635241d 100644 --- a/Source/Script/LuaScript.cpp +++ b/Source/Script/LuaScript.cpp @@ -2,7 +2,7 @@ #include "Contents/Effects/Core/EffectMessageId.h" #include "Script/LuaScript.h" #include "Archive/PakRegistry.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/GameSettingsMgr.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/EntryQueue/EntryQueueMgr.h" @@ -19,9 +19,9 @@ #include "UI/Chat/UINewChatWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/UIWindow.h" -#include "UI/UICheckAttendanceWnd.h" -#include "UI/UILapineScrollBar.h" -#include "UI/UILapineUpgradeBoxWnd.h" +#include "UI/Events/UICheckAttendanceWnd.h" +#include "UI/Items/UILapineScrollBar.h" +#include "UI/Items/UILapineUpgradeBoxWnd.h" #include "UI/Window/UIWindowMgr.h" extern "C" { diff --git a/Source/Utility/FileSignatureVerifier.cpp b/Source/Security/FileSignatureVerifier.cpp similarity index 99% rename from Source/Utility/FileSignatureVerifier.cpp rename to Source/Security/FileSignatureVerifier.cpp index ba51fa1bc..afd1d879a 100644 --- a/Source/Utility/FileSignatureVerifier.cpp +++ b/Source/Security/FileSignatureVerifier.cpp @@ -1,4 +1,4 @@ -#include "Utility/FileSignatureVerifier.h" +#include "Security/FileSignatureVerifier.h" #include #include diff --git a/Source/Utility/FileSignatureVerifier.h b/Source/Security/FileSignatureVerifier.h similarity index 95% rename from Source/Utility/FileSignatureVerifier.h rename to Source/Security/FileSignatureVerifier.h index 03359e3b6..3bb38d02d 100644 --- a/Source/Utility/FileSignatureVerifier.h +++ b/Source/Security/FileSignatureVerifier.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_FILESIGNATUREVERIFIER_H -#define RAGNAROK_SOURCE_UTILITY_FILESIGNATUREVERIFIER_H +#ifndef RAGNAROK_SOURCE_SECURITY_FILESIGNATUREVERIFIER_H +#define RAGNAROK_SOURCE_SECURITY_FILESIGNATUREVERIFIER_H #include #include diff --git a/Source/Security/NProtectGameGuardMgr.cpp b/Source/Security/NProtectGameGuardMgr.cpp index 7a5d1ab75..a911116bc 100644 --- a/Source/Security/NProtectGameGuardMgr.cpp +++ b/Source/Security/NProtectGameGuardMgr.cpp @@ -1,7 +1,7 @@ #include "Security/NProtectGameGuardMgr.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Application/Launcher.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Tables/MessageTable.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Utility/ProcessSecurity.cpp b/Source/Security/ProcessSecurity.cpp similarity index 98% rename from Source/Utility/ProcessSecurity.cpp rename to Source/Security/ProcessSecurity.cpp index 36c03201f..7e1b32dc9 100644 --- a/Source/Utility/ProcessSecurity.cpp +++ b/Source/Security/ProcessSecurity.cpp @@ -1,4 +1,4 @@ -#include "Utility/ProcessSecurity.h" +#include "Security/ProcessSecurity.h" #include #include diff --git a/Source/Utility/ProcessSecurity.h b/Source/Security/ProcessSecurity.h similarity index 67% rename from Source/Utility/ProcessSecurity.h rename to Source/Security/ProcessSecurity.h index cf50d4c51..844029e2e 100644 --- a/Source/Utility/ProcessSecurity.h +++ b/Source/Security/ProcessSecurity.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_PROCESSSECURITY_H -#define RAGNAROK_SOURCE_UTILITY_PROCESSSECURITY_H +#ifndef RAGNAROK_SOURCE_SECURITY_PROCESSSECURITY_H +#define RAGNAROK_SOURCE_SECURITY_PROCESSSECURITY_H #include diff --git a/Source/Archive/UnknownA68.cpp b/Source/Security/UnknownA68.cpp similarity index 100% rename from Source/Archive/UnknownA68.cpp rename to Source/Security/UnknownA68.cpp diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index c3d69878b..d5080802d 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -17,8 +17,8 @@ #include "Render/DeviceContext/DCSurface.h" #include "UI/Exchange/UIExchangeUI.h" #include "UI/Items/UISpellListWnd.h" -#include "Client/Registry.h" -#include "Client/Session.h" +#include "Client/Application/Registry.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/NeoPackageItemMgr.h" @@ -44,7 +44,7 @@ #include "Contents/World/World.h" #include "Client/Mode/ModeEvents.h" #include "Client/Mode/ModeDragState.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" @@ -52,8 +52,8 @@ #include "Render/Textures/Texture.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "UI/Text/TextWrapping.h" @@ -72,26 +72,26 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Edit/UIItemTagCtrl.h" #include "UI/Dialogs/UIBookWnd.h" -#include "UI/Dialogs/UIChooseWarpWnd.h" +#include "UI/Navigation/UIChooseWarpWnd.h" #include "UI/Dialogs/UIChooseWnd.h" #include "UI/Dialogs/UIDisconnectedServerMsgWnd.h" -#include "UI/Dialogs/UIEmailAddressWnd.h" -#include "UI/Dialogs/UIGraffiStrboxWnd.h" +#include "UI/Login/UIEmailAddressWnd.h" +#include "UI/Skill/UIGraffiStrboxWnd.h" #include "UI/Dialogs/UILoadingWnd.h" #include "UI/Dialogs/UIMenuWnd.h" -#include "UI/Dialogs/UIMinimapZoomWnd.h" +#include "UI/Navigation/UIMinimapZoomWnd.h" #include "UI/Dialogs/UINoticeConfirmWnd.h" #include "UI/Dialogs/UINpcEditDialogWnd.h" -#include "UI/Dialogs/UIPasswordWnd.h" +#include "UI/Login/UIPasswordWnd.h" #include "UI/Dialogs/UINotifyJobLevelUpWnd.h" #include "UI/Dialogs/UINotifyLevelUpWnd.h" -#include "UI/Dialogs/UINotifyQuestWnd.h" -#include "UI/Dialogs/UIPetTamingDeceiveWnd.h" +#include "UI/Quest/UINotifyQuestWnd.h" +#include "UI/Status/UIPetTamingDeceiveWnd.h" #include "UI/Dialogs/UIProhibitListWnd.h" #include "UI/Dialogs/UIQuitWnd.h" #include "UI/Dialogs/UIRestartWnd.h" #include "UI/Dialogs/UISayDialogWnd.h" -#include "UI/Dialogs/UISelectCartWnd.h" +#include "UI/Items/UISelectCartWnd.h" #include "UI/Dialogs/UITipOfTheDayWnd.h" #include "UI/Dialogs/UITipboxWnd.h" #include "UI/Dialogs/UIToolTipWnd.h" @@ -125,14 +125,14 @@ #include "UI/Text/UIStaticText.h" #include "UI/Text/UITagTextViewer.h" #include "UI/Text/UITextViewer.h" -#include "UI/Window/UIChangeNameWnd.h" +#include "UI/Login/UIChangeNameWnd.h" #include "UI/Window/InputFocus.h" -#include "UI/Window/UIMonsterDisplayWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Monster/UIMonsterDisplayWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "UI/Layout/SnapMgr.h" -#include "UI/Window/FuncDrawWNDChar.h" +#include "UI/Login/FuncDrawWNDChar.h" #include "UI/Lists/UITabControl.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" @@ -147,7 +147,7 @@ #include "Contents/Map/TownInfoMgr.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Navigation/NavigationManager.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "Utility/Text/GroupedInteger.h" #include "Utility/Math/Int64Math.h" #include "Script/LuaScript.h" @@ -168,7 +168,7 @@ #include #include #include -#include "UI/Window/UICntWnd.h" +#include "UI/Dialogs/UICntWnd.h" #include "Resource/MSGSTRINGID.h" namespace { diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp index 5c9bb41ff..63a245905 100644 --- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp @@ -8,16 +8,16 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Tables/MessageTable.h" #include "Client/Mode/ModeEvents.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/UserData/NormalItemSlots.h" #include "File/ShortcutFilename.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Acceptance/UIJoinPartyAcceptWnd.h" #include "UI/Text/UITextViewer.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/WindowManagerWindows.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp index 3cd8e9b2a..acf6f3fd4 100644 --- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp @@ -5,11 +5,11 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Tables/MessageTable.h" #include "Client/Mode/ModeEvents.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "UI/Buttons/UIButton.h" #include "UI/Acceptance/UIJoinPartyAcceptWnd.h" #include "UI/Text/UITextViewer.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/WindowManagerWindows.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Text/UIAchWnd.cpp b/Source/UI/Achievement/UIAchWnd.cpp similarity index 99% rename from Source/UI/Text/UIAchWnd.cpp rename to Source/UI/Achievement/UIAchWnd.cpp index f17af091e..980a80230 100644 --- a/Source/UI/Text/UIAchWnd.cpp +++ b/Source/UI/Achievement/UIAchWnd.cpp @@ -1,7 +1,7 @@ #include "Script/LuaScript.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Tables/MessageTable.h" @@ -11,12 +11,12 @@ #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIRadioBtn.h" #include "UI/Buttons/UITextButton.h" #include "UI/Text/ColoredText.h" -#include "UI/Text/UIAchWnd.h" +#include "UI/Achievement/UIAchWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Text/UIAchWnd.h b/Source/UI/Achievement/UIAchWnd.h similarity index 98% rename from Source/UI/Text/UIAchWnd.h rename to Source/UI/Achievement/UIAchWnd.h index 73bae8b4e..788e378a6 100644 --- a/Source/UI/Text/UIAchWnd.h +++ b/Source/UI/Achievement/UIAchWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_TEXT_UIACHWND_H -#define RAGNAROK_SOURCE_UI_TEXT_UIACHWND_H +#ifndef RAGNAROK_SOURCE_UI_ACHIEVEMENT_UIACHWND_H +#define RAGNAROK_SOURCE_UI_ACHIEVEMENT_UIACHWND_H #include "Contents/Achievement/AchievementMgr.h" #include "Contents/Jobs/JobInheritance.h" diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp index c236357b5..a9d811aa3 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp +++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Contents/AdventureGuide/AdventureGuideMgr.h" diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.h b/Source/UI/AdventureGuide/UIAdventureGuide.h index e92bd49d5..484232c80 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.h +++ b/Source/UI/AdventureGuide/UIAdventureGuide.h @@ -1,11 +1,11 @@ #ifndef RAGNAROK_SOURCE_UI_ADVENTUREGUIDE_UIADVENTUREGUIDE_H #define RAGNAROK_SOURCE_UI_ADVENTUREGUIDE_UIADVENTUREGUIDE_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "UI/Window/UIControl.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include diff --git a/Source/UI/Window/UIBalloonOpenBtn.cpp b/Source/UI/Buttons/UIBalloonOpenBtn.cpp similarity index 96% rename from Source/UI/Window/UIBalloonOpenBtn.cpp rename to Source/UI/Buttons/UIBalloonOpenBtn.cpp index 8a72c1786..b6c8156c5 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.cpp +++ b/Source/UI/Buttons/UIBalloonOpenBtn.cpp @@ -1,8 +1,8 @@ -#include "UI/Window/UIBalloonOpenBtn.h" +#include "UI/Buttons/UIBalloonOpenBtn.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Events/SpecialPopupMgr.h" #include "Render/Renderer.h" #include "UI/Text/UITransBalloonText.h" diff --git a/Source/UI/Window/UIBalloonOpenBtn.h b/Source/UI/Buttons/UIBalloonOpenBtn.h similarity index 87% rename from Source/UI/Window/UIBalloonOpenBtn.h rename to Source/UI/Buttons/UIBalloonOpenBtn.h index 11cad9c5a..2742251e2 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.h +++ b/Source/UI/Buttons/UIBalloonOpenBtn.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIBALLOONOPENBTN_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIBALLOONOPENBTN_H +#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIBALLOONOPENBTN_H +#define RAGNAROK_SOURCE_UI_BUTTONS_UIBALLOONOPENBTN_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Buttons/UIBasicButton.cpp b/Source/UI/Buttons/UIBasicButton.cpp index ef4b049d9..61e205ce9 100644 --- a/Source/UI/Buttons/UIBasicButton.cpp +++ b/Source/UI/Buttons/UIBasicButton.cpp @@ -1,7 +1,7 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include diff --git a/Source/UI/Buttons/UIBitmapButton.cpp b/Source/UI/Buttons/UIBitmapButton.cpp index 264963e2e..3524b1fb8 100644 --- a/Source/UI/Buttons/UIBitmapButton.cpp +++ b/Source/UI/Buttons/UIBitmapButton.cpp @@ -1,6 +1,6 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" // OFFSET: 0x0084EAB0 // FUNCTION: fn_10650 diff --git a/Source/UI/Buttons/UIBmpTextButton.cpp b/Source/UI/Buttons/UIBmpTextButton.cpp index e0e80b194..69176bcbb 100644 --- a/Source/UI/Buttons/UIBmpTextButton.cpp +++ b/Source/UI/Buttons/UIBmpTextButton.cpp @@ -1,7 +1,7 @@ #include "Render/Text/FontCache.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBmpTextButton.h" #include diff --git a/Source/UI/Buttons/UIBmpTextButton2.cpp b/Source/UI/Buttons/UIBmpTextButton2.cpp index b624fa20c..98fbea64d 100644 --- a/Source/UI/Buttons/UIBmpTextButton2.cpp +++ b/Source/UI/Buttons/UIBmpTextButton2.cpp @@ -1,6 +1,6 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBmpTextButton2.h" // OFFSET: 0x0084ECB0 diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index 9eabaff48..5c3004915 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -1,16 +1,16 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMessage.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "UI/Window/WindowPolicy.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Contents/Tables/MessageTable.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/ModeEvents.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Buttons/UICheckBox.cpp b/Source/UI/Buttons/UICheckBox.cpp index f3ef7be40..5483184f6 100644 --- a/Source/UI/Buttons/UICheckBox.cpp +++ b/Source/UI/Buttons/UICheckBox.cpp @@ -1,12 +1,12 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "Client/Replay.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "Client/Replay/Replay.h" #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UICheckBox.h" // OFFSET: 0x0084F010 diff --git a/Source/UI/Buttons/UIColorButton.cpp b/Source/UI/Buttons/UIColorButton.cpp index 29ec49ca2..3c3ad3fbb 100644 --- a/Source/UI/Buttons/UIColorButton.cpp +++ b/Source/UI/Buttons/UIColorButton.cpp @@ -1,5 +1,5 @@ #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UIColorButton.h" // OFFSET: 0x0085C9A0 diff --git a/Source/UI/Window/UIMiniBtnWnd.cpp b/Source/UI/Buttons/UIMiniBtnWnd.cpp similarity index 95% rename from Source/UI/Window/UIMiniBtnWnd.cpp rename to Source/UI/Buttons/UIMiniBtnWnd.cpp index 16032f5b3..a8d7e005a 100644 --- a/Source/UI/Window/UIMiniBtnWnd.cpp +++ b/Source/UI/Buttons/UIMiniBtnWnd.cpp @@ -1,9 +1,9 @@ -#include "UI/Window/UIMiniBtnWnd.h" +#include "UI/Buttons/UIMiniBtnWnd.h" #include "UI/Window/UIEnums.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Window/UIMiniBtnWnd.h b/Source/UI/Buttons/UIMiniBtnWnd.h similarity index 76% rename from Source/UI/Window/UIMiniBtnWnd.h rename to Source/UI/Buttons/UIMiniBtnWnd.h index 063c09810..fb67d0f37 100644 --- a/Source/UI/Window/UIMiniBtnWnd.h +++ b/Source/UI/Buttons/UIMiniBtnWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMINIBTNWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMINIBTNWND_H +#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIMINIBTNWND_H +#define RAGNAROK_SOURCE_UI_BUTTONS_UIMINIBTNWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Buttons/UINaviLinkButton.cpp b/Source/UI/Buttons/UINaviLinkButton.cpp index eedb9be2f..bab261e79 100644 --- a/Source/UI/Buttons/UINaviLinkButton.cpp +++ b/Source/UI/Buttons/UINaviLinkButton.cpp @@ -1,5 +1,5 @@ #include "Contents/Navigation/NavigationManager.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Buttons/UINaviLinkButton.h" // OFFSET: 0x0086DF60 diff --git a/Source/UI/Buttons/UIRadioBtn.cpp b/Source/UI/Buttons/UIRadioBtn.cpp index 93271d1cb..ce67bf768 100644 --- a/Source/UI/Buttons/UIRadioBtn.cpp +++ b/Source/UI/Buttons/UIRadioBtn.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UIRadioBtn.h" diff --git a/Source/UI/UISlotBitmap.cpp b/Source/UI/Buttons/UISlotBitmap.cpp similarity index 98% rename from Source/UI/UISlotBitmap.cpp rename to Source/UI/Buttons/UISlotBitmap.cpp index fa216db7f..f9835ddba 100644 --- a/Source/UI/UISlotBitmap.cpp +++ b/Source/UI/Buttons/UISlotBitmap.cpp @@ -1,4 +1,4 @@ -#include "UI/UISlotBitmap.h" +#include "UI/Buttons/UISlotBitmap.h" #include "UI/Window/UIEnums.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/UISlotBitmap.h b/Source/UI/Buttons/UISlotBitmap.h similarity index 81% rename from Source/UI/UISlotBitmap.h rename to Source/UI/Buttons/UISlotBitmap.h index e810b7b94..d097314d6 100644 --- a/Source/UI/UISlotBitmap.h +++ b/Source/UI/Buttons/UISlotBitmap.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_UISLOTBITMAP_H -#define RAGNAROK_SOURCE_UI_UISLOTBITMAP_H +#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UISLOTBITMAP_H +#define RAGNAROK_SOURCE_UI_BUTTONS_UISLOTBITMAP_H -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" class UIBitmapButton; diff --git a/Source/UI/UIStaticBitmap.cpp b/Source/UI/Buttons/UIStaticBitmap.cpp similarity index 97% rename from Source/UI/UIStaticBitmap.cpp rename to Source/UI/Buttons/UIStaticBitmap.cpp index 685bc0511..9e8d54751 100644 --- a/Source/UI/UIStaticBitmap.cpp +++ b/Source/UI/Buttons/UIStaticBitmap.cpp @@ -1,9 +1,9 @@ -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "UI/Buttons/UIButton.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/UIStaticBitmap.h b/Source/UI/Buttons/UIStaticBitmap.h similarity index 89% rename from Source/UI/UIStaticBitmap.h rename to Source/UI/Buttons/UIStaticBitmap.h index 872f231b4..184541413 100644 --- a/Source/UI/UIStaticBitmap.h +++ b/Source/UI/Buttons/UIStaticBitmap.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UISTATICBITMAP_H -#define RAGNAROK_SOURCE_UI_UISTATICBITMAP_H +#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UISTATICBITMAP_H +#define RAGNAROK_SOURCE_UI_BUTTONS_UISTATICBITMAP_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/UIStaticItem.cpp b/Source/UI/Buttons/UIStaticItem.cpp similarity index 83% rename from Source/UI/UIStaticItem.cpp rename to Source/UI/Buttons/UIStaticItem.cpp index 6d01b1d05..659c7fbff 100644 --- a/Source/UI/UIStaticItem.cpp +++ b/Source/UI/Buttons/UIStaticItem.cpp @@ -1,4 +1,4 @@ -#include "UI/UIStaticItem.h" +#include "UI/Buttons/UIStaticItem.h" // OFFSET: 0x0086E970 // FUNCTION: fn_11079 diff --git a/Source/UI/UIStaticItem.h b/Source/UI/Buttons/UIStaticItem.h similarity index 83% rename from Source/UI/UIStaticItem.h rename to Source/UI/Buttons/UIStaticItem.h index 872cd6136..982e896b4 100644 --- a/Source/UI/UIStaticItem.h +++ b/Source/UI/Buttons/UIStaticItem.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UISTATICITEM_H -#define RAGNAROK_SOURCE_UI_UISTATICITEM_H +#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UISTATICITEM_H +#define RAGNAROK_SOURCE_UI_BUTTONS_UISTATICITEM_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index 14f06544a..5ec79a57b 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -6,39 +6,39 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Render/Renderer.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "Client/Replay.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "Client/Replay/Replay.h" #include "UI/Window/WindowPolicy.h" #include "Render/Text/FontCache.h" #include "Render/DeviceContext/DeviceContext.h" -#include "UI/UIBarGraph.h" +#include "UI/Gauges/UIBarGraph.h" #include "UI/Buttons/UIBmpRadioBtn.h" #include "Render/Text/TextContext.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Buttons/UIItemTagButton.h" -#include "UI/Buttons/UIItemMoveInfo.h" +#include "UI/Items/UIItemMoveInfo.h" #include "UI/Buttons/UITextButton.h" #include "UI/Lists/UIImgMenu.h" #include "UI/Lists/UITabControl.h" #include "UI/Lists/UITreeView.h" -#include "UI/UIStaticItem.h" -#include "Client/Session.h" +#include "UI/Buttons/UIStaticItem.h" +#include "Client/Session/Session.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Skills/ClientSkills.h" -#include "UI/UIBasicCtrl.h" +#include "UI/Window/UIBasicCtrl.h" #include "Utility/Text/FormatString.h" #include "UI/Lists/UIMemberListBox.h" #include "UI/Buttons/UIBitmapButton2.h" #include "UI/Buttons/UISlotBmpButton.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "UI/Buttons/UITVBitmapButton.h" #include "UI/Buttons/UITVTextButton.h" #include "UI/Lists/UIComboBox.h" #include "UI/Lists/UIComboBoxV2Wnd.h" -#include "UI/Lists/UIItemStoreComboBox.h" -#include "UI/Lists/UIPackageBoxNameList.h" +#include "UI/Items/UIItemStoreComboBox.h" +#include "UI/SelectPackageItemBox/UIPackageBoxNameList.h" #include "UI/Lists/UIListBoxEx.h" #include "UI/Lists/UIListBoxID.h" #include "UI/Lists/UIScrollBarVariants.h" @@ -52,12 +52,12 @@ #include "Contents/Items/ItemDescription.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/Lists/UIListBoxNavi.h" +#include "UI/Navigation/UIListBoxNavi.h" #include "UI/Text/ColoredText.h" #include "UI/Window/WindowBorder.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include #include #include @@ -2674,7 +2674,7 @@ int UITextButton::GetLinesCount() const { void __stdcall Nullsub275(int, int, int, int) { } -#include "UI/Buttons/UIDescriptRace.h" +#include "UI/Login/UIDescriptRace.h" #include "UI/Window/InputFocus.h" // OFFSET: 0x008901E0 @@ -2807,7 +2807,7 @@ void UIScrollBar_Custom::SetThumbBitmaps(std::string top, std::string middle, st #include "UI/Dialogs/UINpcEditDialogWnd.h" #include "UI/Dialogs/UITipboxWnd.h" #include "UI/Lists/UIComboBoxDefWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Client/Mode/CMode.h" #include "Client/Mode/CLoginMode.h" @@ -3375,7 +3375,7 @@ void UITextViewEX::Paint() { this->Refresh(); } -#include "UI/Window/UIRPImageWnd.h" +#include "UI/Dialogs/UIRPImageWnd.h" // OFFSET: 0x0088D560 // FUNCTION: fn_11376 diff --git a/Source/UI/Buttons/UITextureButton.cpp b/Source/UI/Buttons/UITextureButton.cpp index bc2eb9786..53731b646 100644 --- a/Source/UI/Buttons/UITextureButton.cpp +++ b/Source/UI/Buttons/UITextureButton.cpp @@ -1,8 +1,8 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "UI/Window/WindowPolicy.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Contents/Tables/MessageTable.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/Window/UIWindowCallBtnWnd.h b/Source/UI/Buttons/UIWindowCallBtnWnd.h similarity index 69% rename from Source/UI/Window/UIWindowCallBtnWnd.h rename to Source/UI/Buttons/UIWindowCallBtnWnd.h index e050f9c26..ebf53abf3 100644 --- a/Source/UI/Window/UIWindowCallBtnWnd.h +++ b/Source/UI/Buttons/UIWindowCallBtnWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIWINDOWCALLBTNWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIWINDOWCALLBTNWND_H +#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIWINDOWCALLBTNWND_H +#define RAGNAROK_SOURCE_UI_BUTTONS_UIWINDOWCALLBTNWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Buttons/UICashEmotionSprBtn.h b/Source/UI/CashEmotion/UICashEmotionSprBtn.h similarity index 73% rename from Source/UI/Buttons/UICashEmotionSprBtn.h rename to Source/UI/CashEmotion/UICashEmotionSprBtn.h index a1af9530f..99e061d0f 100644 --- a/Source/UI/Buttons/UICashEmotionSprBtn.h +++ b/Source/UI/CashEmotion/UICashEmotionSprBtn.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UICASHEMOTIONSPRBTN_H -#define RAGNAROK_SOURCE_UI_BUTTONS_UICASHEMOTIONSPRBTN_H +#ifndef RAGNAROK_SOURCE_UI_CASHEMOTION_UICASHEMOTIONSPRBTN_H +#define RAGNAROK_SOURCE_UI_CASHEMOTION_UICASHEMOTIONSPRBTN_H #include "UI/Buttons/UISpriteButton.h" diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp index bb66570c7..e2a84e744 100644 --- a/Source/UI/CashShop/UICashShopWnd.cpp +++ b/Source/UI/CashShop/UICashShopWnd.cpp @@ -2,14 +2,14 @@ #include "UI/Window/WindowId.h" #include "UI/CashShop/UICashShopWnd.h" #include "UI/Window/UIEnums.h" -#include "Utility/EncryptedName.h" +#include "Utility/Cipher/EncryptedName.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Registry.h" -#include "Client/Session.h" +#include "Client/Application/Registry.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Tables/MessageTable.h" @@ -17,7 +17,7 @@ #include "Network/Packets/PacketId.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpRadioBtn.h" @@ -26,8 +26,8 @@ #include "UI/Edit/UIEditCtrl_Currency.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Lists/UIScrollBarVariants.h" -#include "UI/UIStaticBitmap.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Buttons/UIStaticBitmap.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/UI/Window/UIMileageWnd.cpp b/Source/UI/CashShop/UIMileageWnd.cpp similarity index 96% rename from Source/UI/Window/UIMileageWnd.cpp rename to Source/UI/CashShop/UIMileageWnd.cpp index 3b863f398..771e6c716 100644 --- a/Source/UI/Window/UIMileageWnd.cpp +++ b/Source/UI/CashShop/UIMileageWnd.cpp @@ -1,14 +1,14 @@ #include "Resource/Bitmap/BitmapResource.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIMileageWnd.h" -#include "Client/Session.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/CashShop/UIMileageWnd.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Configuration/ServiceOptions.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Text/ColoredText.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UIMileageWnd.h b/Source/UI/CashShop/UIMileageWnd.h similarity index 89% rename from Source/UI/Window/UIMileageWnd.h rename to Source/UI/CashShop/UIMileageWnd.h index 68bd4e442..9e351b863 100644 --- a/Source/UI/Window/UIMileageWnd.h +++ b/Source/UI/CashShop/UIMileageWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMILEAGEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMILEAGEWND_H +#ifndef RAGNAROK_SOURCE_UI_CASHSHOP_UIMILEAGEWND_H +#define RAGNAROK_SOURCE_UI_CASHSHOP_UIMILEAGEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIPayConfirmWnd.h b/Source/UI/CashShop/UIPayConfirmWnd.h similarity index 74% rename from Source/UI/Window/UIPayConfirmWnd.h rename to Source/UI/CashShop/UIPayConfirmWnd.h index 8df67b305..c68af6c93 100644 --- a/Source/UI/Window/UIPayConfirmWnd.h +++ b/Source/UI/CashShop/UIPayConfirmWnd.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIPAYCONFIRMWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIPAYCONFIRMWND_H +#ifndef RAGNAROK_SOURCE_UI_CASHSHOP_UIPAYCONFIRMWND_H +#define RAGNAROK_SOURCE_UI_CASHSHOP_UIPAYCONFIRMWND_H -#include "UI/Window/UIMessageBox.h" +#include "UI/Dialogs/UIMessageBox.h" #include diff --git a/Source/UI/Chat/ChatSuggestions.cpp b/Source/UI/Chat/ChatSuggestions.cpp index 0fbd65f54..d715826b0 100644 --- a/Source/UI/Chat/ChatSuggestions.cpp +++ b/Source/UI/Chat/ChatSuggestions.cpp @@ -5,7 +5,7 @@ #include "UI/Window/InputFocus.h" #include "UI/Edit/UIItemTagCtrl.h" #include "UI/Edit/UIEditCtrl.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Lists/UITabControl.h" diff --git a/Source/UI/Chat/UIChatRoomTitle.cpp b/Source/UI/Chat/UIChatRoomTitle.cpp index f3962249f..7d08ebd27 100644 --- a/Source/UI/Chat/UIChatRoomTitle.cpp +++ b/Source/UI/Chat/UIChatRoomTitle.cpp @@ -7,10 +7,10 @@ #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Chat/UIChatRoomTitle.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Window/UIChatRoomWnd.h b/Source/UI/Chat/UIChatRoomWnd.h similarity index 92% rename from Source/UI/Window/UIChatRoomWnd.h rename to Source/UI/Chat/UIChatRoomWnd.h index e9d67cd49..5f4eefbfd 100644 --- a/Source/UI/Window/UIChatRoomWnd.h +++ b/Source/UI/Chat/UIChatRoomWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UICHATROOMWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UICHATROOMWND_H +#ifndef RAGNAROK_SOURCE_UI_CHAT_UICHATROOMWND_H +#define RAGNAROK_SOURCE_UI_CHAT_UICHATROOMWND_H #include "UI/Window/UIFrameWnd.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Chat/UINewChatWnd.cpp b/Source/UI/Chat/UINewChatWnd.cpp index 35d4e2583..b9b30a2f9 100644 --- a/Source/UI/Chat/UINewChatWnd.cpp +++ b/Source/UI/Chat/UINewChatWnd.cpp @@ -6,8 +6,8 @@ #include "Client/Input/Mouse.h" #include "Client/Mode/CMode.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Tables/MessageTable.h" @@ -19,7 +19,7 @@ #include "UI/Edit/UIItemTagCtrl.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Lists/UITabControl.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextMarkup.h" #include "UI/Text/TextWrapping.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp index bbb7f8ff7..c5dcf5402 100644 --- a/Source/UI/Chat/UISubChatHisWnd.cpp +++ b/Source/UI/Chat/UISubChatHisWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Chat/UISubChatHisWnd.h" #include "Contents/UserData/NormalItemSlots.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/TextEncoding.h" #include "Render/Text/FontCache.h" diff --git a/Source/UI/Window/UIZeroChatWnd.cpp b/Source/UI/Chat/UIZeroChatWnd.cpp similarity index 97% rename from Source/UI/Window/UIZeroChatWnd.cpp rename to Source/UI/Chat/UIZeroChatWnd.cpp index ef628721e..ef9d4d7da 100644 --- a/Source/UI/Window/UIZeroChatWnd.cpp +++ b/Source/UI/Chat/UIZeroChatWnd.cpp @@ -1,11 +1,11 @@ -#include "UI/Window/UIBalloonOpenBtn.h" +#include "UI/Buttons/UIBalloonOpenBtn.h" #include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Guild/UIGuild_Storage_Log.h" #include "UI/Lists/UITabControl.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/UIDebuffRemoveWnd.h" +#include "UI/Skill/UIDebuffRemoveWnd.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/UI/Clan/UIClanWnd.cpp b/Source/UI/Clan/UIClanWnd.cpp index f9f541295..471ac2cd5 100644 --- a/Source/UI/Clan/UIClanWnd.cpp +++ b/Source/UI/Clan/UIClanWnd.cpp @@ -1,5 +1,5 @@ #include "UI/Clan/UIClanWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" @@ -9,8 +9,8 @@ #include "Contents/UserData/NormalItemSlots.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Cooldowns/CooldownState.cpp b/Source/UI/Cooldowns/CooldownState.cpp index 271608a97..dd6a2d7a8 100644 --- a/Source/UI/Cooldowns/CooldownState.cpp +++ b/Source/UI/Cooldowns/CooldownState.cpp @@ -1,5 +1,5 @@ #include "UI/Cooldowns/CooldownState.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include #include diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.cpp b/Source/UI/Dialogs/UIAccountLimitedToolWnd.cpp similarity index 99% rename from Source/UI/Window/UIAccountLimitedToolWnd.cpp rename to Source/UI/Dialogs/UIAccountLimitedToolWnd.cpp index 77f1ff6e7..f829ddfaf 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.cpp +++ b/Source/UI/Dialogs/UIAccountLimitedToolWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIAccountLimitedToolWnd.h" +#include "UI/Dialogs/UIAccountLimitedToolWnd.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.h b/Source/UI/Dialogs/UIAccountLimitedToolWnd.h similarity index 84% rename from Source/UI/Window/UIAccountLimitedToolWnd.h rename to Source/UI/Dialogs/UIAccountLimitedToolWnd.h index 41a2426ee..f50ff9c7f 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.h +++ b/Source/UI/Dialogs/UIAccountLimitedToolWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIACCOUNTLIMITEDTOOLWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIACCOUNTLIMITEDTOOLWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIACCOUNTLIMITEDTOOLWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIACCOUNTLIMITEDTOOLWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UICntWnd.h b/Source/UI/Dialogs/UICntWnd.h similarity index 83% rename from Source/UI/Window/UICntWnd.h rename to Source/UI/Dialogs/UICntWnd.h index 2663b27f1..103e9cf3e 100644 --- a/Source/UI/Window/UICntWnd.h +++ b/Source/UI/Dialogs/UICntWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UICNTWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UICNTWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UICNTWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UICNTWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp index eea4d9ec7..123e7923c 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.cpp +++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp @@ -6,11 +6,11 @@ #include "Client/Application/Launcher.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Resource/Sprites/SpriteResource.h" #include "Render/Textures/SpritePixels.h" #include "Contents/Tables/MessageTable.h" @@ -21,10 +21,10 @@ #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Buttons/UISpriteButton.h" -#include "UI/Dialogs/UIMiniMapWnd.h" +#include "UI/Navigation/UIMiniMapWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/InputFocus.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Dialogs/UILoadingWnd.h b/Source/UI/Dialogs/UILoadingWnd.h index c6ad86fe6..45b1e1f6e 100644 --- a/Source/UI/Dialogs/UILoadingWnd.h +++ b/Source/UI/Dialogs/UILoadingWnd.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_DIALOGS_UILOADINGWND_H #define RAGNAROK_SOURCE_UI_DIALOGS_UILOADINGWND_H -#include "UI/UIBarGraph.h" +#include "UI/Gauges/UIBarGraph.h" #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/Window/UILocaleTextWnd.cpp b/Source/UI/Dialogs/UILocaleTextWnd.cpp similarity index 100% rename from Source/UI/Window/UILocaleTextWnd.cpp rename to Source/UI/Dialogs/UILocaleTextWnd.cpp diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Dialogs/UIMessageBox.cpp similarity index 99% rename from Source/UI/Window/UIMessageBox.cpp rename to Source/UI/Dialogs/UIMessageBox.cpp index ce21cf7f9..dac540895 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Dialogs/UIMessageBox.cpp @@ -8,57 +8,57 @@ #include "Contents/CombatTypes.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" -#include "Resource/SkinPalette.h" -#include "UI/Window/UICntWnd.h" -#include "UI/Window/UIChatRoomWnd.h" -#include "UI/Window/UIBank_NewWnd.h" +#include "Resource/Bitmap/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "UI/Dialogs/UICntWnd.h" +#include "UI/Chat/UIChatRoomWnd.h" +#include "UI/Shop/UIBank_NewWnd.h" #include "UI/Edit/UIEditCtrl.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Utility/Text/GroupedInteger.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpTextButton.h" -#include "UI/Window/UILoginWnd.h" -#include "UI/Window/UIMessageBox.h" -#include "UI/Window/UINoticeWnd.h" +#include "UI/Login/UILoginWnd.h" +#include "UI/Dialogs/UIMessageBox.h" +#include "UI/Dialogs/UINoticeWnd.h" #include "UI/Lists/UIScrollBar.h" -#include "UI/Lists/UIReplayListBox.h" -#include "UI/Window/UISelectReplayDataWnd.h" -#include "UI/Window/UISelectServerWnd.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Replay/UIReplayListBox.h" +#include "UI/Replay/UISelectReplayDataWnd.h" +#include "UI/Login/UISelectServerWnd.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "UI/Buttons/UITextButton.h" #include "UI/Text/UITextViewer.h" #include "UI/Window/WindowBorder.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UIMerInfoWnd.h" -#include "UI/Window/UIMessageBoxAutoreturn.h" -#include "UI/Window/UIMonsterInfoWnd.h" -#include "UI/Window/UITalkboxTrapInputWnd.h" -#include "UI/Window/UIHomunInfoWnd.h" -#include "UI/Window/UIPetInfoWnd.h" -#include "UI/Window/UIReplayRECControlWnd.h" +#include "UI/Status/UIMerInfoWnd.h" +#include "UI/Dialogs/UIMessageBoxAutoreturn.h" +#include "UI/Monster/UIMonsterInfoWnd.h" +#include "UI/Dialogs/UITalkboxTrapInputWnd.h" +#include "UI/Status/UIHomunInfoWnd.h" +#include "UI/Status/UIPetInfoWnd.h" +#include "UI/Replay/UIReplayRECControlWnd.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Registry.h" +#include "Client/Application/Registry.h" #include "Utility/Cipher/XorBytes.h" -#include "UI/Window/UILoginOTPWnd.h" +#include "UI/Login/UILoginOTPWnd.h" #include "UI/Window/InputFocus.h" #include "UI/Buttons/UIButton.h" #include "Render/Text/TextContext.h" #include "Contents/Tables/MessageTable.h" #include "UI/Text/ColoredText.h" #include "Client/Mode/CMode.h" -#include "UI/Window/UIPayConfirmWnd.h" -#include "UI/Window/UIReplayControlWnd.h" -#include "UI/Window/UIMakeCharWnd.h" +#include "UI/CashShop/UIPayConfirmWnd.h" +#include "UI/Replay/UIReplayControlWnd.h" +#include "UI/Login/UIMakeCharWnd.h" #include "Client/Mode/CLoginMode.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Client/Application/Launcher.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Lists/UIMemberListBox.h" #include "UI/Window/UIResizer.h" #include "Client/Application/ApplicationWindow.h" #include "UI/Text/UIStaticText.h" -#include "UI/UIBarGraph.h" +#include "UI/Gauges/UIBarGraph.h" #include "Utility/Text/FormatString.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" @@ -77,13 +77,13 @@ #include "UI/Lists/UIComboBox.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Item/UIItemWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Items/UIItemWnd.h" #include "Contents/Sound/SoundMaker.h" #include "UI/Buttons/UICheckBox.h" #include "Contents/ClientState.h" #include "Contents/Tables/ForbiddenWords.h" -#include "UI/Window/UINormalMB.h" +#include "UI/Dialogs/UINormalMB.h" #include "UI/Buttons/UINoneVisibleButton.h" #include "Contents/Pet/PetEvolutionMgr.h" #include "Contents/Items/ItemInfo.h" @@ -95,8 +95,8 @@ #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" -#include "Resource/ImfResource.h" -#include "Resource/PaletteResource.h" +#include "Resource/Sprites/ImfResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Contents/Jobs/JobInheritance.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Window/UIMessageBox.h b/Source/UI/Dialogs/UIMessageBox.h similarity index 92% rename from Source/UI/Window/UIMessageBox.h rename to Source/UI/Dialogs/UIMessageBox.h index 923b3f8fd..6a58aa5d4 100644 --- a/Source/UI/Window/UIMessageBox.h +++ b/Source/UI/Dialogs/UIMessageBox.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMESSAGEBOX_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMESSAGEBOX_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIMESSAGEBOX_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIMESSAGEBOX_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIMessageBoxAutoreturn.h b/Source/UI/Dialogs/UIMessageBoxAutoreturn.h similarity index 85% rename from Source/UI/Window/UIMessageBoxAutoreturn.h rename to Source/UI/Dialogs/UIMessageBoxAutoreturn.h index 4b98e6ad5..21da72672 100644 --- a/Source/UI/Window/UIMessageBoxAutoreturn.h +++ b/Source/UI/Dialogs/UIMessageBoxAutoreturn.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMESSAGEBOXAUTORETURN_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMESSAGEBOXAUTORETURN_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIMESSAGEBOXAUTORETURN_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIMESSAGEBOXAUTORETURN_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UINormalMB.cpp b/Source/UI/Dialogs/UINormalMB.cpp similarity index 97% rename from Source/UI/Window/UINormalMB.cpp rename to Source/UI/Dialogs/UINormalMB.cpp index 61eeca8bf..dc9f7d0e4 100644 --- a/Source/UI/Window/UINormalMB.cpp +++ b/Source/UI/Dialogs/UINormalMB.cpp @@ -1,13 +1,13 @@ #include "UI/Window/UIEnums.h" -#include "UI/Window/UINormalMB.h" +#include "UI/Dialogs/UINormalMB.h" #include "UI/Window/UIEnums.h" #include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Text/UITextViewer.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "UI/Window/UIWindowMgr.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Window/UINormalMB.h b/Source/UI/Dialogs/UINormalMB.h similarity index 90% rename from Source/UI/Window/UINormalMB.h rename to Source/UI/Dialogs/UINormalMB.h index 474acb531..7a449f971 100644 --- a/Source/UI/Window/UINormalMB.h +++ b/Source/UI/Dialogs/UINormalMB.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINORMALMB_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINORMALMB_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UINORMALMB_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UINORMALMB_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UINoteWnd.cpp b/Source/UI/Dialogs/UINoteWnd.cpp similarity index 98% rename from Source/UI/Window/UINoteWnd.cpp rename to Source/UI/Dialogs/UINoteWnd.cpp index 79580b77d..296efed22 100644 --- a/Source/UI/Window/UINoteWnd.cpp +++ b/Source/UI/Dialogs/UINoteWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UINoteWnd.h" +#include "UI/Dialogs/UINoteWnd.h" #include "UI/Window/UIEnums.h" #include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBasicButton.h" diff --git a/Source/UI/Window/UINoteWnd.h b/Source/UI/Dialogs/UINoteWnd.h similarity index 86% rename from Source/UI/Window/UINoteWnd.h rename to Source/UI/Dialogs/UINoteWnd.h index 432f22152..1207dc1b8 100644 --- a/Source/UI/Window/UINoteWnd.h +++ b/Source/UI/Dialogs/UINoteWnd.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINOTEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINOTEWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UINOTEWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UINOTEWND_H -#include "UI/UIScrollWnd.h" +#include "UI/Lists/UIScrollWnd.h" #include "UI/Window/UIFrameWnd.h" class UIStaticText_LF; diff --git a/Source/UI/Window/UINoticeWnd.cpp b/Source/UI/Dialogs/UINoticeWnd.cpp similarity index 98% rename from Source/UI/Window/UINoticeWnd.cpp rename to Source/UI/Dialogs/UINoticeWnd.cpp index 33595aac4..c436f2863 100644 --- a/Source/UI/Window/UINoticeWnd.cpp +++ b/Source/UI/Dialogs/UINoticeWnd.cpp @@ -1,5 +1,5 @@ #include "UI/Text/UIStaticText.h" -#include "UI/Window/UINoticeWnd.h" +#include "UI/Dialogs/UINoticeWnd.h" #include "UI/Lists/UIScrollBar.h" #include diff --git a/Source/UI/Window/UINoticeWnd.h b/Source/UI/Dialogs/UINoticeWnd.h similarity index 89% rename from Source/UI/Window/UINoticeWnd.h rename to Source/UI/Dialogs/UINoticeWnd.h index 6ebbc36c7..5f3da116f 100644 --- a/Source/UI/Window/UINoticeWnd.h +++ b/Source/UI/Dialogs/UINoticeWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINOTICEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINOTICEWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UINOTICEWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UINOTICEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIRPImageWnd.cpp b/Source/UI/Dialogs/UIRPImageWnd.cpp similarity index 83% rename from Source/UI/Window/UIRPImageWnd.cpp rename to Source/UI/Dialogs/UIRPImageWnd.cpp index a8dbfa6b8..eb0a362dc 100644 --- a/Source/UI/Window/UIRPImageWnd.cpp +++ b/Source/UI/Dialogs/UIRPImageWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIRPImageWnd.h" +#include "UI/Dialogs/UIRPImageWnd.h" // OFFSET: 0x0086E310 // FUNCTION: fn_11068 diff --git a/Source/UI/Window/UIRPImageWnd.h b/Source/UI/Dialogs/UIRPImageWnd.h similarity index 73% rename from Source/UI/Window/UIRPImageWnd.h rename to Source/UI/Dialogs/UIRPImageWnd.h index afb9a964f..af9870134 100644 --- a/Source/UI/Window/UIRPImageWnd.h +++ b/Source/UI/Dialogs/UIRPImageWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIRPIMAGEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIRPIMAGEWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIRPIMAGEWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIRPIMAGEWND_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Window/UIRPImageWnd2.cpp b/Source/UI/Dialogs/UIRPImageWnd2.cpp similarity index 94% rename from Source/UI/Window/UIRPImageWnd2.cpp rename to Source/UI/Dialogs/UIRPImageWnd2.cpp index ce742c685..fa463007d 100644 --- a/Source/UI/Window/UIRPImageWnd2.cpp +++ b/Source/UI/Dialogs/UIRPImageWnd2.cpp @@ -1,5 +1,5 @@ #include "Render/Renderer.h" -#include "UI/Window/UIRPImageWnd2.h" +#include "UI/Dialogs/UIRPImageWnd2.h" // OFFSET: 0x0094EAF0 // FUNCTION: fn_12912 diff --git a/Source/UI/Window/UIRPImageWnd2.h b/Source/UI/Dialogs/UIRPImageWnd2.h similarity index 76% rename from Source/UI/Window/UIRPImageWnd2.h rename to Source/UI/Dialogs/UIRPImageWnd2.h index e47df2ef4..9e7db5465 100644 --- a/Source/UI/Window/UIRPImageWnd2.h +++ b/Source/UI/Dialogs/UIRPImageWnd2.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIRPIMAGEWND2_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIRPIMAGEWND2_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIRPIMAGEWND2_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIRPIMAGEWND2_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UITalkboxTrapInputWnd.h b/Source/UI/Dialogs/UITalkboxTrapInputWnd.h similarity index 84% rename from Source/UI/Window/UITalkboxTrapInputWnd.h rename to Source/UI/Dialogs/UITalkboxTrapInputWnd.h index 0a06c98b5..e1fedcf34 100644 --- a/Source/UI/Window/UITalkboxTrapInputWnd.h +++ b/Source/UI/Dialogs/UITalkboxTrapInputWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UITALKBOXTRAPINPUTWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UITALKBOXTRAPINPUTWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UITALKBOXTRAPINPUTWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UITALKBOXTRAPINPUTWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UITransMenuWnd.cpp b/Source/UI/Dialogs/UITransMenuWnd.cpp similarity index 98% rename from Source/UI/Window/UITransMenuWnd.cpp rename to Source/UI/Dialogs/UITransMenuWnd.cpp index 0418c865c..c033f314d 100644 --- a/Source/UI/Window/UITransMenuWnd.cpp +++ b/Source/UI/Dialogs/UITransMenuWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UITransMenuWnd.h" +#include "UI/Dialogs/UITransMenuWnd.h" #include "UI/Window/UIEnums.h" #include "UI/Buttons/UIButton.h" #include diff --git a/Source/UI/Window/UITransMenuWnd.h b/Source/UI/Dialogs/UITransMenuWnd.h similarity index 91% rename from Source/UI/Window/UITransMenuWnd.h rename to Source/UI/Dialogs/UITransMenuWnd.h index 8332986bf..c563fefce 100644 --- a/Source/UI/Window/UITransMenuWnd.h +++ b/Source/UI/Dialogs/UITransMenuWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UITRANSMENUWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UITRANSMENUWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UITRANSMENUWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UITRANSMENUWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIVideoWnd.cpp b/Source/UI/Dialogs/UIVideoWnd.cpp similarity index 99% rename from Source/UI/Window/UIVideoWnd.cpp rename to Source/UI/Dialogs/UIVideoWnd.cpp index 38e70d761..35eb7f210 100644 --- a/Source/UI/Window/UIVideoWnd.cpp +++ b/Source/UI/Dialogs/UIVideoWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UIVideoWnd.h" +#include "UI/Dialogs/UIVideoWnd.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Movies/BinkMovie.h" diff --git a/Source/UI/Window/UIVideoWnd.h b/Source/UI/Dialogs/UIVideoWnd.h similarity index 88% rename from Source/UI/Window/UIVideoWnd.h rename to Source/UI/Dialogs/UIVideoWnd.h index df19da5c8..76a227b04 100644 --- a/Source/UI/Window/UIVideoWnd.h +++ b/Source/UI/Dialogs/UIVideoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIVIDEOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIVIDEOWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIVIDEOWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIVIDEOWND_H #include "UI/Buttons/UIButton.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Window/UIWordDisplayWnd.cpp b/Source/UI/Dialogs/UIWordDisplayWnd.cpp similarity index 93% rename from Source/UI/Window/UIWordDisplayWnd.cpp rename to Source/UI/Dialogs/UIWordDisplayWnd.cpp index dd9728926..0822d129c 100644 --- a/Source/UI/Window/UIWordDisplayWnd.cpp +++ b/Source/UI/Dialogs/UIWordDisplayWnd.cpp @@ -1,13 +1,13 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" -#include "UI/Window/UIWordDisplayWnd.h" +#include "Resource/Bitmap/TextureNames.h" +#include "UI/Dialogs/UIWordDisplayWnd.h" // OFFSET: 0x0085B000 // FUNCTION: fn_10791 diff --git a/Source/UI/Window/UIWordDisplayWnd.h b/Source/UI/Dialogs/UIWordDisplayWnd.h similarity index 83% rename from Source/UI/Window/UIWordDisplayWnd.h rename to Source/UI/Dialogs/UIWordDisplayWnd.h index 55141e98b..be2addd51 100644 --- a/Source/UI/Window/UIWordDisplayWnd.h +++ b/Source/UI/Dialogs/UIWordDisplayWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIWORDDISPLAYWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIWORDDISPLAYWND_H +#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIWORDDISPLAYWND_H +#define RAGNAROK_SOURCE_UI_DIALOGS_UIWORDDISPLAYWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Edit/UICandidateWnd.cpp b/Source/UI/Edit/UICandidateWnd.cpp index bf0ceee54..8b47bfdb9 100644 --- a/Source/UI/Edit/UICandidateWnd.cpp +++ b/Source/UI/Edit/UICandidateWnd.cpp @@ -3,7 +3,7 @@ #include "Client/Input/InputCharset.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UIButton.h" #include "UI/Window/WindowBorder.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index e578eba03..0b69d0c27 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -7,16 +7,16 @@ #include "Client/Input/InputCharset.h" #include "Client/Input/Language.h" #include "Client/Input/Mouse.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "File/File.h" #include "Network/TextEncoding.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Text/TextContext.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Contents/Configuration/GameSettingsMgr.h" #include "UI/Layout/SnapMgr.h" #include "Contents/Skin/SkinMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Resource/Bitmap/BitmapImage.h" #include "Resource/Bitmap/BitmapResource.h" #include "Contents/Items/ItemDescription.h" @@ -31,8 +31,8 @@ #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "Render/Renderer.h" -#include "Render/ScreenRectangle.h" -#include "Render/TextureQuad.h" +#include "Render/Projection/ScreenRectangle.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Render/Textures/SpritePixels.h" @@ -42,20 +42,20 @@ #include "UI/Buttons/UIBmpTextButton2.h" #include "UI/Buttons/UINaviLinkButton.h" #include "UI/Text/TextFitting.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Buttons/UIItemTagButton.h" #include "UI/Buttons/UISpriteButton.h" #include "UI/Buttons/UITextureButton.h" -#include "UI/Item/UIItemPurchaseWnd.h" -#include "UI/Item/UIParaItemShopWnd.h" -#include "UI/Item/UIItemSellWnd.h" -#include "UI/Item/UIItemSellWnd2.h" -#include "UI/Item/UIItemShopWnd.h" -#include "UI/Item/UIItemShopWnd2.h" -#include "UI/Item/UIItemStoreFindWnd.h" -#include "UI/Item/UIItemStoreSubWnd.h" -#include "UI/Item/UIItemStoreWnd.h" -#include "UI/Item/UIItemWnd.h" +#include "UI/Items/UIItemPurchaseWnd.h" +#include "UI/Items/UIParaItemShopWnd.h" +#include "UI/Items/UIItemSellWnd.h" +#include "UI/Items/UIItemSellWnd2.h" +#include "UI/Items/UIItemShopWnd.h" +#include "UI/Items/UIItemShopWnd2.h" +#include "UI/Items/UIItemStoreFindWnd.h" +#include "UI/Items/UIItemStoreSubWnd.h" +#include "UI/Items/UIItemStoreWnd.h" +#include "UI/Items/UIItemWnd.h" #include "UI/Shop/UIMerchantItemMyShopWnd.h" #include "UI/Shop/UIMerchantItemPurchaseWnd.h" #include "UI/Shop/UIMerchantItemShopWnd.h" @@ -68,10 +68,10 @@ #include "UI/Buttons/UIBitmapButton.h" #include "UI/Window/UIResizer.h" #include "UI/Window/UITab.h" -#include "UI/Lists/UIItemStoreComboBox.h" +#include "UI/Items/UIItemStoreComboBox.h" #include "UI/Buttons/UICheckBox.h" -#include "UI/Dialogs/UIPasswordWnd.h" -#include "Client/Session.h" +#include "UI/Login/UIPasswordWnd.h" +#include "Client/Session/Session.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/CLoginMode.h" #include "Client/Mode/CMode.h" @@ -79,14 +79,14 @@ #include "Client/Mode/ModeDragState.h" #include "UI/Shop/UIMerchantItemPurchaseMSGWnd.h" #include "UI/Lists/UITabControl.h" -#include "UI/UIGradeEnchantWnd.h" -#include "UI/UIRefiningWnd.h" +#include "UI/Items/UIGradeEnchantWnd.h" +#include "UI/Items/UIRefiningWnd.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" #include "UI/Text/UIStaticText.h" #include "UI/Lists/UIScrollBar.h" -#include "UI/PriceCommission.h" +#include "UI/Shop/PriceCommission.h" #include "UI/Shop/PriceColor.h" #include "Utility/Text/GroupedInteger.h" #include "Contents/Configuration/ServiceConfiguration.h" @@ -96,7 +96,7 @@ #include "Contents/Actors/PlayerNameDictionary.h" #include "UI/Edit/UIItemTagCtrl.h" #include "UI/Window/WindowBorder.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Contents/Tables/TipBoxTitles.h" #include #include @@ -116,7 +116,7 @@ #include "UI/Chat/UINewChatWnd.h" #include "UI/Dialogs/UINpcEditDialogWnd.h" #include "UI/Rodex/UIRodexComposeWnd.h" -#include "UI/UIBartermarketWnd.h" +#include "UI/Shop/UIBartermarketWnd.h" #include "UI/Edit/UIEditPaint.inl" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Edit/UIEditCtrl3.cpp b/Source/UI/Edit/UIEditCtrl3.cpp index 136eaae6e..3fd68765e 100644 --- a/Source/UI/Edit/UIEditCtrl3.cpp +++ b/Source/UI/Edit/UIEditCtrl3.cpp @@ -2,7 +2,7 @@ #include "UI/Lists/UIScrollBar.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UINaviLinkButton.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextFitting.h" // OFFSET: 0x00861AB0 diff --git a/Source/UI/Edit/UIEditLinks.cpp b/Source/UI/Edit/UIEditLinks.cpp index 907d8a636..a690a6301 100644 --- a/Source/UI/Edit/UIEditLinks.cpp +++ b/Source/UI/Edit/UIEditLinks.cpp @@ -3,7 +3,7 @@ #include "Client/Input/InputCharset.h" #include "Client/Input/Language.h" #include "UI/Window/InputFocus.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextFitting.h" #include "UI/Buttons/UIButton.h" #include "UI/Edit/UIEditCtrl.h" diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index 5a94ac0f2..14e7ab8aa 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -7,8 +7,8 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UIItemTagButton.h" #include "UI/Window/InputFocus.h" diff --git a/Source/UI/Edit/UIItemTagCtrl.h b/Source/UI/Edit/UIItemTagCtrl.h index 315abed4c..311226e8a 100644 --- a/Source/UI/Edit/UIItemTagCtrl.h +++ b/Source/UI/Edit/UIItemTagCtrl.h @@ -3,7 +3,7 @@ #include "UI/Edit/ItemTagRetirement.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/TextTags.h" +#include "UI/Text/TextTags.h" #include #include diff --git a/Source/UI/Emotion/UIEmotionWnd.cpp b/Source/UI/Emotion/UIEmotionWnd.cpp index 06f713b9d..33358da5a 100644 --- a/Source/UI/Emotion/UIEmotionWnd.cpp +++ b/Source/UI/Emotion/UIEmotionWnd.cpp @@ -3,7 +3,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/CashEmotion/CashEmotionMgr.h" #include "UI/CashEmotion/UICashEmotionListWnd.h" #include "Contents/Hotkeys/EmotionHotkeys.h" diff --git a/Source/UI/Enchant/EnchantUI.h b/Source/UI/Enchant/EnchantUI.h index 2041f53ba..9aed1f2f1 100644 --- a/Source/UI/Enchant/EnchantUI.h +++ b/Source/UI/Enchant/EnchantUI.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_ENCHANT_ENCHANTUI_H #include "Contents/Items/ItemInfo.h" -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Items/UIGameItem.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Enchant/UIEnchantUI.cpp b/Source/UI/Enchant/UIEnchantUI.cpp index b89e0e67d..c096a7c13 100644 --- a/Source/UI/Enchant/UIEnchantUI.cpp +++ b/Source/UI/Enchant/UIEnchantUI.cpp @@ -1,6 +1,6 @@ #include "UI/Enchant/EnchantUI.h" #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/EnchantMgr.h" #include "Render/Renderer.h" #include "UI/Buttons/UIRadioButton.h" diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index ef5f06a7b..19fa2c799 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -4,8 +4,8 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Guild/GuildInfo.h" #include "Contents/Guild/GuildMgr.h" #include "Contents/EntryQueue/EntryQueueMgr.h" @@ -15,8 +15,8 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Text/UIStaticText.h" #include "UI/Text/UITextViewer.h" diff --git a/Source/UI/UICheckAttendanceWnd.cpp b/Source/UI/Events/UICheckAttendanceWnd.cpp similarity index 98% rename from Source/UI/UICheckAttendanceWnd.cpp rename to Source/UI/Events/UICheckAttendanceWnd.cpp index 5d8dacb39..37b2b5729 100644 --- a/Source/UI/UICheckAttendanceWnd.cpp +++ b/Source/UI/Events/UICheckAttendanceWnd.cpp @@ -3,22 +3,22 @@ #include "Render/Text/FontCache.h" #include "UI/Window/UIEnums.h" #include "Render/Text/TextContext.h" -#include "UI/UICheckAttendanceWnd.h" +#include "UI/Events/UICheckAttendanceWnd.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Events/CheckAttendanceMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Render/Renderer.h" -#include "Render/ScreenRectangle.h" -#include "Render/TextureQuad.h" +#include "Render/Projection/ScreenRectangle.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" @@ -26,7 +26,7 @@ #include "UI/Buttons/UIBmpRadioBtn.h" #include "UI/Buttons/UIBmpTextButton.h" #include "UI/Shop/ItemDrawing.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/UICheckAttendanceWnd.h b/Source/UI/Events/UICheckAttendanceWnd.h similarity index 94% rename from Source/UI/UICheckAttendanceWnd.h rename to Source/UI/Events/UICheckAttendanceWnd.h index 35ba80230..ca6ac0c52 100644 --- a/Source/UI/UICheckAttendanceWnd.h +++ b/Source/UI/Events/UICheckAttendanceWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UICHECKATTENDANCEWND_H -#define RAGNAROK_SOURCE_UI_UICHECKATTENDANCEWND_H +#ifndef RAGNAROK_SOURCE_UI_EVENTS_UICHECKATTENDANCEWND_H +#define RAGNAROK_SOURCE_UI_EVENTS_UICHECKATTENDANCEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIOpenRoulletteWnd.cpp b/Source/UI/Events/UIOpenRoulletteWnd.cpp similarity index 97% rename from Source/UI/Window/UIOpenRoulletteWnd.cpp rename to Source/UI/Events/UIOpenRoulletteWnd.cpp index ae29723f5..3e7acc2b8 100644 --- a/Source/UI/Window/UIOpenRoulletteWnd.cpp +++ b/Source/UI/Events/UIOpenRoulletteWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIOpenRoulletteWnd.h" +#include "UI/Events/UIOpenRoulletteWnd.h" #include "UI/Buttons/UIBitmapButton.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Window/UIOpenRoulletteWnd.h b/Source/UI/Events/UIOpenRoulletteWnd.h similarity index 76% rename from Source/UI/Window/UIOpenRoulletteWnd.h rename to Source/UI/Events/UIOpenRoulletteWnd.h index a0bb6861e..5bdbb69c0 100644 --- a/Source/UI/Window/UIOpenRoulletteWnd.h +++ b/Source/UI/Events/UIOpenRoulletteWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIOPENROULLETTEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIOPENROULLETTEWND_H +#ifndef RAGNAROK_SOURCE_UI_EVENTS_UIOPENROULLETTEWND_H +#define RAGNAROK_SOURCE_UI_EVENTS_UIOPENROULLETTEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIRoulletteWnd.cpp b/Source/UI/Events/UIRoulletteWnd.cpp similarity index 99% rename from Source/UI/Window/UIRoulletteWnd.cpp rename to Source/UI/Events/UIRoulletteWnd.cpp index 55b17125f..a085acc1b 100644 --- a/Source/UI/Window/UIRoulletteWnd.cpp +++ b/Source/UI/Events/UIRoulletteWnd.cpp @@ -1,10 +1,10 @@ #include "UI/Window/WindowId.h" -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "UI/Window/UIEnums.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" @@ -16,7 +16,7 @@ #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UISpriteButton.h" diff --git a/Source/UI/Window/UIRoulletteWnd.h b/Source/UI/Events/UIRoulletteWnd.h similarity index 94% rename from Source/UI/Window/UIRoulletteWnd.h rename to Source/UI/Events/UIRoulletteWnd.h index a6ec9f848..b5941f2d8 100644 --- a/Source/UI/Window/UIRoulletteWnd.h +++ b/Source/UI/Events/UIRoulletteWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIROULLETTEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIROULLETTEWND_H +#ifndef RAGNAROK_SOURCE_UI_EVENTS_UIROULLETTEWND_H +#define RAGNAROK_SOURCE_UI_EVENTS_UIROULLETTEWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Exchange/UIExchangeUI.cpp b/Source/UI/Exchange/UIExchangeUI.cpp index 3913cc3ff..77b7a1deb 100644 --- a/Source/UI/Exchange/UIExchangeUI.cpp +++ b/Source/UI/Exchange/UIExchangeUI.cpp @@ -3,7 +3,7 @@ #include "UI/Exchange/UIExchangeUI.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" @@ -13,7 +13,7 @@ #include "File/ShortcutFilename.h" #include "Render/Renderer.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UIRadioButton.h" #include "UI/Lists/UIVScrollBar.h" #include "UI/Shop/PriceColor.h" diff --git a/Source/UI/Exchange/UIExchangeUI.h b/Source/UI/Exchange/UIExchangeUI.h index dee9a5a4f..4783afa45 100644 --- a/Source/UI/Exchange/UIExchangeUI.h +++ b/Source/UI/Exchange/UIExchangeUI.h @@ -3,7 +3,7 @@ #include "Contents/Items/ItemInfo.h" #include "UI/Edit/UIEditBoxEx.h" -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Items/UIGameItem.h" #include "UI/Lists/UIListBoxTemplate.h" diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index 0405fcc48..418131690 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -4,7 +4,7 @@ #include "UI/GameSettings/GameSettingsUI.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/GameSettingsMgr.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Hotkeys/HotkeyInfo.h" @@ -14,21 +14,21 @@ #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Render/DeviceContext/DCSurface.h" -#include "Render/DisplayMode.h" +#include "Render/Device/DisplayMode.h" #include "Render/DX7/RenderSystemDX7.h" -#include "Render/DeviceSelection.h" +#include "Render/Device/DeviceSelection.h" #include "Render/Renderer.h" #include "Render/Textures/TextureCache.h" -#include "Render/RenderAdapter.h" -#include "Render/RenderBackends.h" +#include "Render/Device/RenderAdapter.h" +#include "Render/Device/RenderBackends.h" #include "Resource/ResourcePreload.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIRadioButton.h" #include "UI/Dialogs/UITipboxWnd.h" #include "UI/Lists/UIVScrollBar.h" #include "UI/Text/UIStaticTextControl.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "UI/Lists/UIDropDownBox.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/GameSettings/GameSettingsUI.h b/Source/UI/GameSettings/GameSettingsUI.h index 69c8b318b..bd9f1639e 100644 --- a/Source/UI/GameSettings/GameSettingsUI.h +++ b/Source/UI/GameSettings/GameSettingsUI.h @@ -1,10 +1,10 @@ #ifndef RAGNAROK_SOURCE_UI_GAMESETTINGS_GAMESETTINGSUI_H #define RAGNAROK_SOURCE_UI_GAMESETTINGS_GAMESETTINGSUI_H -#include "Render/DisplayMode.h" -#include "Render/RenderAdapter.h" -#include "Render/RenderBackends.h" -#include "UI/FrameSkin.h" +#include "Render/Device/DisplayMode.h" +#include "Render/Device/RenderAdapter.h" +#include "Render/Device/RenderBackends.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Window/UIControl.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.cpp b/Source/UI/GameSettings/UIBattleMsgOptionWnd.cpp similarity index 98% rename from Source/UI/Window/UIBattleMsgOptionWnd.cpp rename to Source/UI/GameSettings/UIBattleMsgOptionWnd.cpp index 358f21593..9a153b14b 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.cpp +++ b/Source/UI/GameSettings/UIBattleMsgOptionWnd.cpp @@ -1,14 +1,14 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UIBattleMsgOptionWnd.h" +#include "UI/GameSettings/UIBattleMsgOptionWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Lists/UIScrollBar.h" diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.h b/Source/UI/GameSettings/UIBattleMsgOptionWnd.h similarity index 89% rename from Source/UI/Window/UIBattleMsgOptionWnd.h rename to Source/UI/GameSettings/UIBattleMsgOptionWnd.h index ed7dc8d0e..85edaaf50 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.h +++ b/Source/UI/GameSettings/UIBattleMsgOptionWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIBATTLEMSGOPTIONWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIBATTLEMSGOPTIONWND_H +#ifndef RAGNAROK_SOURCE_UI_GAMESETTINGS_UIBATTLEMSGOPTIONWND_H +#define RAGNAROK_SOURCE_UI_GAMESETTINGS_UIBATTLEMSGOPTIONWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIEscOptionWnd.cpp b/Source/UI/GameSettings/UIEscOptionWnd.cpp similarity index 98% rename from Source/UI/Window/UIEscOptionWnd.cpp rename to Source/UI/GameSettings/UIEscOptionWnd.cpp index 9dfd9b724..b6ef15b7f 100644 --- a/Source/UI/Window/UIEscOptionWnd.cpp +++ b/Source/UI/GameSettings/UIEscOptionWnd.cpp @@ -1,9 +1,9 @@ #include "UI/Window/WindowId.h" #include "Client/Mode/ModeMessage.h" -#include "UI/Window/UIEscOptionWnd.h" +#include "UI/GameSettings/UIEscOptionWnd.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "File/ShortcutFilename.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Window/UIEscOptionWnd.h b/Source/UI/GameSettings/UIEscOptionWnd.h similarity index 84% rename from Source/UI/Window/UIEscOptionWnd.h rename to Source/UI/GameSettings/UIEscOptionWnd.h index 6f9951a76..c3e7461bc 100644 --- a/Source/UI/Window/UIEscOptionWnd.h +++ b/Source/UI/GameSettings/UIEscOptionWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIESCOPTIONWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIESCOPTIONWND_H +#ifndef RAGNAROK_SOURCE_UI_GAMESETTINGS_UIESCOPTIONWND_H +#define RAGNAROK_SOURCE_UI_GAMESETTINGS_UIESCOPTIONWND_H #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/GameSettings/UIHotKeyWnd.cpp similarity index 99% rename from Source/UI/Window/UIHotKeyWnd.cpp rename to Source/UI/GameSettings/UIHotKeyWnd.cpp index 1ff05a737..b9c3defa6 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/GameSettings/UIHotKeyWnd.cpp @@ -6,9 +6,9 @@ #include "Client/Mode/ModeMgr.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" -#include "UI/Window/UIHotKeyWnd.h" +#include "UI/GameSettings/UIHotKeyWnd.h" #include "UI/Chat/UINewChatWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Hotkeys/UserHotkeyMgr.h" #include "Contents/Skills/AutomaticSkills.h" #include "Contents/Tables/MessageTable.h" @@ -23,8 +23,8 @@ #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UISerachStoreInfoWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Shop/UISerachStoreInfoWnd.h" #include "UI/Window/WindowBorder.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UIHotKeyWnd.h b/Source/UI/GameSettings/UIHotKeyWnd.h similarity index 94% rename from Source/UI/Window/UIHotKeyWnd.h rename to Source/UI/GameSettings/UIHotKeyWnd.h index 9ce8f1f24..3771244c2 100644 --- a/Source/UI/Window/UIHotKeyWnd.h +++ b/Source/UI/GameSettings/UIHotKeyWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIHOTKEYWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIHOTKEYWND_H +#ifndef RAGNAROK_SOURCE_UI_GAMESETTINGS_UIHOTKEYWND_H +#define RAGNAROK_SOURCE_UI_GAMESETTINGS_UIHOTKEYWND_H #include "Contents/Hotkeys/HotkeyInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIHotkeyGuideWnd.cpp b/Source/UI/GameSettings/UIHotkeyGuideWnd.cpp similarity index 99% rename from Source/UI/UIHotkeyGuideWnd.cpp rename to Source/UI/GameSettings/UIHotkeyGuideWnd.cpp index ad895f64e..3abb9dc03 100644 --- a/Source/UI/UIHotkeyGuideWnd.cpp +++ b/Source/UI/GameSettings/UIHotkeyGuideWnd.cpp @@ -1,16 +1,16 @@ #include "Script/LuaScript.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/UIHotkeyGuideWnd.h" +#include "UI/GameSettings/UIHotkeyGuideWnd.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Map/MapSkyMgr.h" #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpTextButton.h" diff --git a/Source/UI/UIHotkeyGuideWnd.h b/Source/UI/GameSettings/UIHotkeyGuideWnd.h similarity index 94% rename from Source/UI/UIHotkeyGuideWnd.h rename to Source/UI/GameSettings/UIHotkeyGuideWnd.h index 831fcdf40..3c9705a5d 100644 --- a/Source/UI/UIHotkeyGuideWnd.h +++ b/Source/UI/GameSettings/UIHotkeyGuideWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIHOTKEYGUIDEWND_H -#define RAGNAROK_SOURCE_UI_UIHOTKEYGUIDEWND_H +#ifndef RAGNAROK_SOURCE_UI_GAMESETTINGS_UIHOTKEYGUIDEWND_H +#define RAGNAROK_SOURCE_UI_GAMESETTINGS_UIHOTKEYGUIDEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIViewCameraInfoWnd.cpp b/Source/UI/GameSettings/UIViewCameraInfoWnd.cpp similarity index 96% rename from Source/UI/Window/UIViewCameraInfoWnd.cpp rename to Source/UI/GameSettings/UIViewCameraInfoWnd.cpp index f770d9e3a..d91cf54b6 100644 --- a/Source/UI/Window/UIViewCameraInfoWnd.cpp +++ b/Source/UI/GameSettings/UIViewCameraInfoWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIViewCameraInfoWnd.h" +#include "UI/GameSettings/UIViewCameraInfoWnd.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/Window/UIViewCameraInfoWnd.h b/Source/UI/GameSettings/UIViewCameraInfoWnd.h similarity index 77% rename from Source/UI/Window/UIViewCameraInfoWnd.h rename to Source/UI/GameSettings/UIViewCameraInfoWnd.h index d77276071..29ef1dd0d 100644 --- a/Source/UI/Window/UIViewCameraInfoWnd.h +++ b/Source/UI/GameSettings/UIViewCameraInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIVIEWCAMERAINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIVIEWCAMERAINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_GAMESETTINGS_UIVIEWCAMERAINFOWND_H +#define RAGNAROK_SOURCE_UI_GAMESETTINGS_UIVIEWCAMERAINFOWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIBarGraph.cpp b/Source/UI/Gauges/UIBarGraph.cpp similarity index 98% rename from Source/UI/UIBarGraph.cpp rename to Source/UI/Gauges/UIBarGraph.cpp index 42ea94eb6..670843985 100644 --- a/Source/UI/UIBarGraph.cpp +++ b/Source/UI/Gauges/UIBarGraph.cpp @@ -1,8 +1,8 @@ -#include "UI/UIBarGraph.h" +#include "UI/Gauges/UIBarGraph.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/UI/UIBarGraph.h b/Source/UI/Gauges/UIBarGraph.h similarity index 96% rename from Source/UI/UIBarGraph.h rename to Source/UI/Gauges/UIBarGraph.h index 2063a2399..fddd5ff44 100644 --- a/Source/UI/UIBarGraph.h +++ b/Source/UI/Gauges/UIBarGraph.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIBARGRAPH_H -#define RAGNAROK_SOURCE_UI_UIBARGRAPH_H +#ifndef RAGNAROK_SOURCE_UI_GAUGES_UIBARGRAPH_H +#define RAGNAROK_SOURCE_UI_GAUGES_UIBARGRAPH_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Gauges/UIPetInfoBarGraph.cpp b/Source/UI/Gauges/UIPetInfoBarGraph.cpp index 6740cc6dc..c2a669540 100644 --- a/Source/UI/Gauges/UIPetInfoBarGraph.cpp +++ b/Source/UI/Gauges/UIPetInfoBarGraph.cpp @@ -1,7 +1,7 @@ -#include "UI/UIBarGraph.h" +#include "UI/Gauges/UIBarGraph.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" // OFFSET: 0x0089B4D0 // FUNCTION: fn_11564 diff --git a/Source/UI/Guild/UIAgitWnd.cpp b/Source/UI/Guild/UIAgitWnd.cpp index f8795a7d9..138aa966d 100644 --- a/Source/UI/Guild/UIAgitWnd.cpp +++ b/Source/UI/Guild/UIAgitWnd.cpp @@ -3,16 +3,16 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Guild/GuildInfo.h" #include "Contents/Guild/GuildMgr.h" #include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIButton.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/UIEmblemWnd.cpp b/Source/UI/Guild/UIEmblemWnd.cpp similarity index 94% rename from Source/UI/Window/UIEmblemWnd.cpp rename to Source/UI/Guild/UIEmblemWnd.cpp index 9a0511e8c..d3a321438 100644 --- a/Source/UI/Window/UIEmblemWnd.cpp +++ b/Source/UI/Guild/UIEmblemWnd.cpp @@ -1,14 +1,14 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIEnums.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Guild/GuildMgr.h" #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/EmblemResource.h" +#include "Resource/Bitmap/EmblemResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" -#include "UI/Window/UIEmblemWnd.h" +#include "Resource/Bitmap/TextureNames.h" +#include "UI/Guild/UIEmblemWnd.h" #include diff --git a/Source/UI/Window/UIEmblemWnd.h b/Source/UI/Guild/UIEmblemWnd.h similarity index 84% rename from Source/UI/Window/UIEmblemWnd.h rename to Source/UI/Guild/UIEmblemWnd.h index ef13f4c1c..2b8b441d8 100644 --- a/Source/UI/Window/UIEmblemWnd.h +++ b/Source/UI/Guild/UIEmblemWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIEMBLEMWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIEMBLEMWND_H +#ifndef RAGNAROK_SOURCE_UI_GUILD_UIEMBLEMWND_H +#define RAGNAROK_SOURCE_UI_GUILD_UIEMBLEMWND_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Guild/UIGuildHelperWnd.cpp b/Source/UI/Guild/UIGuildHelperWnd.cpp index a431cdee2..1448a0157 100644 --- a/Source/UI/Guild/UIGuildHelperWnd.cpp +++ b/Source/UI/Guild/UIGuildHelperWnd.cpp @@ -15,7 +15,7 @@ #include "UI/Text/UIStaticText.h" #include "Contents/Guild/GuildTip.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Text/UITextViewer.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index f3c09d0ea..3dd89594a 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -6,18 +6,18 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Guild/GuildMgr.h" #include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "File/ShortcutFilename.h" #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/EmblemResource.h" +#include "Resource/Bitmap/EmblemResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index fe95bbf27..ea71ec0ef 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -17,7 +17,7 @@ #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/SpritePixels.h" #include "Render/Textures/Texture.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "UI/Party/UIMiniPartyWnd.h" diff --git a/Source/UI/Guild/UIGuild_Storage_Log.cpp b/Source/UI/Guild/UIGuild_Storage_Log.cpp index ffcf409e1..ef0e47c75 100644 --- a/Source/UI/Guild/UIGuild_Storage_Log.cpp +++ b/Source/UI/Guild/UIGuild_Storage_Log.cpp @@ -4,7 +4,7 @@ #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Lists/UITabControl.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Items/MergeItemWnd.cpp b/Source/UI/Items/MergeItemWnd.cpp index a2be0aee9..61e5710be 100644 --- a/Source/UI/Items/MergeItemWnd.cpp +++ b/Source/UI/Items/MergeItemWnd.cpp @@ -6,7 +6,7 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" @@ -16,7 +16,7 @@ #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Lists/UIScrollBar.h" diff --git a/Source/UI/UIChangeMaterialWnd.cpp b/Source/UI/Items/UIChangeMaterialWnd.cpp similarity index 99% rename from Source/UI/UIChangeMaterialWnd.cpp rename to Source/UI/Items/UIChangeMaterialWnd.cpp index e0f1fdf87..9ee3d7d0d 100644 --- a/Source/UI/UIChangeMaterialWnd.cpp +++ b/Source/UI/Items/UIChangeMaterialWnd.cpp @@ -2,11 +2,11 @@ #include "Render/Text/FontCache.h" #include "UI/Window/UIEnums.h" #include "Render/Text/TextContext.h" -#include "UI/UIChangeMaterialWnd.h" +#include "UI/Items/UIChangeMaterialWnd.h" #include "Client/Mode/CMode.h" #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ChangeMaterialMgr.h" #include "Contents/Items/ItemDescription.h" @@ -17,7 +17,7 @@ #include "Network/Connection/Connection.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpTextButton.h" @@ -26,7 +26,7 @@ #include "UI/Shop/ItemDrawing.h" #include "UI/Text/ColoredText.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Utility/StackAlloc.h" #include "Utility/Text/FormatString.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/UIChangeMaterialWnd.h b/Source/UI/Items/UIChangeMaterialWnd.h similarity index 97% rename from Source/UI/UIChangeMaterialWnd.h rename to Source/UI/Items/UIChangeMaterialWnd.h index 86fe601a4..10b99e965 100644 --- a/Source/UI/UIChangeMaterialWnd.h +++ b/Source/UI/Items/UIChangeMaterialWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UICHANGEMATERIALWND_H -#define RAGNAROK_SOURCE_UI_UICHANGEMATERIALWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UICHANGEMATERIALWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UICHANGEMATERIALWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Buttons/UICheckBox.h" diff --git a/Source/UI/Window/UICollectionSystemWnd.cpp b/Source/UI/Items/UICollectionSystemWnd.cpp similarity index 98% rename from Source/UI/Window/UICollectionSystemWnd.cpp rename to Source/UI/Items/UICollectionSystemWnd.cpp index 4c02be4b4..77ffd7d7e 100644 --- a/Source/UI/Window/UICollectionSystemWnd.cpp +++ b/Source/UI/Items/UICollectionSystemWnd.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UICollectionSystemWnd.h" +#include "UI/Items/UICollectionSystemWnd.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" diff --git a/Source/UI/Window/UICollectionSystemWnd.h b/Source/UI/Items/UICollectionSystemWnd.h similarity index 87% rename from Source/UI/Window/UICollectionSystemWnd.h rename to Source/UI/Items/UICollectionSystemWnd.h index e5e183f34..4896e3c43 100644 --- a/Source/UI/Window/UICollectionSystemWnd.h +++ b/Source/UI/Items/UICollectionSystemWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UICOLLECTIONSYSTEMWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UICOLLECTIONSYSTEMWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UICOLLECTIONSYSTEMWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UICOLLECTIONSYSTEMWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Items/UIEquipmentPropertiesWnd.cpp similarity index 99% rename from Source/UI/Item/UIEquipmentPropertiesWnd.cpp rename to Source/UI/Items/UIEquipmentPropertiesWnd.cpp index 76d363291..749480296 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Items/UIEquipmentPropertiesWnd.cpp @@ -1,13 +1,13 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "UI/Item/UIEquipmentPropertiesWnd.h" +#include "UI/Items/UIEquipmentPropertiesWnd.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Text/UIStaticTextControl.h" #include "UI/Window/UIRegisterMgr.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.h b/Source/UI/Items/UIEquipmentPropertiesWnd.h similarity index 95% rename from Source/UI/Item/UIEquipmentPropertiesWnd.h rename to Source/UI/Items/UIEquipmentPropertiesWnd.h index 4ae22c0de..44ad64103 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.h +++ b/Source/UI/Items/UIEquipmentPropertiesWnd.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIEQUIPMENTPROPERTIESWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIEQUIPMENTPROPERTIESWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIEQUIPMENTPROPERTIESWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIEQUIPMENTPROPERTIESWND_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include diff --git a/Source/UI/Items/UIGameItem.cpp b/Source/UI/Items/UIGameItem.cpp index 199d95000..36b5fe46a 100644 --- a/Source/UI/Items/UIGameItem.cpp +++ b/Source/UI/Items/UIGameItem.cpp @@ -4,7 +4,7 @@ #include "UI/Text/ColoredText.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" @@ -12,7 +12,7 @@ #include "Contents/Actors/PlayerNameDictionary.h" #include "Resource/ResourceMgr.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/UIGradeEnchantWnd.cpp b/Source/UI/Items/UIGradeEnchantWnd.cpp similarity index 99% rename from Source/UI/UIGradeEnchantWnd.cpp rename to Source/UI/Items/UIGradeEnchantWnd.cpp index 128f98109..b0a2f2d71 100644 --- a/Source/UI/UIGradeEnchantWnd.cpp +++ b/Source/UI/Items/UIGradeEnchantWnd.cpp @@ -3,16 +3,16 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Resource/Bitmap/BitmapResource.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Shop/ItemDrawing.h" -#include "UI/UIGradeEnchantWnd.h" +#include "UI/Items/UIGradeEnchantWnd.h" #include "Client/Mode/CMode.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Tables/MessageTable.h" @@ -20,7 +20,7 @@ #include "Network/Packets/PacketLengths.h" #include "Network/Packets/ModeResultEnums.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/UIGradeEnchantWnd.h b/Source/UI/Items/UIGradeEnchantWnd.h similarity index 96% rename from Source/UI/UIGradeEnchantWnd.h rename to Source/UI/Items/UIGradeEnchantWnd.h index f09902621..a7b693c1f 100644 --- a/Source/UI/UIGradeEnchantWnd.h +++ b/Source/UI/Items/UIGradeEnchantWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIGRADEENCHANTWND_H -#define RAGNAROK_SOURCE_UI_UIGRADEENCHANTWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIGRADEENCHANTWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIGRADEENCHANTWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Items/UIIllustWnd.cpp b/Source/UI/Items/UIIllustWnd.cpp index 2c44c8c74..9bd5ee351 100644 --- a/Source/UI/Items/UIIllustWnd.cpp +++ b/Source/UI/Items/UIIllustWnd.cpp @@ -6,7 +6,7 @@ #include "Client/Mode/ModeMgr.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/UIIngredientInfoWnd.h b/Source/UI/Items/UIIngredientInfoWnd.h similarity index 90% rename from Source/UI/UIIngredientInfoWnd.h rename to Source/UI/Items/UIIngredientInfoWnd.h index 75976c6e4..9ac4497f8 100644 --- a/Source/UI/UIIngredientInfoWnd.h +++ b/Source/UI/Items/UIIngredientInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIINGREDIENTINFOWND_H -#define RAGNAROK_SOURCE_UI_UIINGREDIENTINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIINGREDIENTINFOWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIINGREDIENTINFOWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Item/UIItemBaseWnd.h b/Source/UI/Items/UIItemBaseWnd.h similarity index 92% rename from Source/UI/Item/UIItemBaseWnd.h rename to Source/UI/Items/UIItemBaseWnd.h index adebf0b81..1e7a63bd6 100644 --- a/Source/UI/Item/UIItemBaseWnd.h +++ b/Source/UI/Items/UIItemBaseWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMBASEWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMBASEWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMBASEWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMBASEWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Items/UIItemCollectionWnd.h b/Source/UI/Items/UIItemCollectionWnd.h index 5316a355a..f4db18c48 100644 --- a/Source/UI/Items/UIItemCollectionWnd.h +++ b/Source/UI/Items/UIItemCollectionWnd.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMCOLLECTIONWND_H #define RAGNAROK_SOURCE_UI_ITEMS_UIITEMCOLLECTIONWND_H -#include "UI/Buttons/UIItemMoveInfo.h" +#include "UI/Items/UIItemMoveInfo.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIResizer.h" diff --git a/Source/UI/Buttons/UIItemMoveInfo.cpp b/Source/UI/Items/UIItemMoveInfo.cpp similarity index 74% rename from Source/UI/Buttons/UIItemMoveInfo.cpp rename to Source/UI/Items/UIItemMoveInfo.cpp index 1b713fd22..81dba9b0f 100644 --- a/Source/UI/Buttons/UIItemMoveInfo.cpp +++ b/Source/UI/Items/UIItemMoveInfo.cpp @@ -1,4 +1,4 @@ -#include "UI/Buttons/UIItemMoveInfo.h" +#include "UI/Items/UIItemMoveInfo.h" // OFFSET: 0x0086D4D0 // FUNCTION: fn_11046 diff --git a/Source/UI/Buttons/UIItemMoveInfo.h b/Source/UI/Items/UIItemMoveInfo.h similarity index 78% rename from Source/UI/Buttons/UIItemMoveInfo.h rename to Source/UI/Items/UIItemMoveInfo.h index 5b83e2590..cb5c1ccc2 100644 --- a/Source/UI/Buttons/UIItemMoveInfo.h +++ b/Source/UI/Items/UIItemMoveInfo.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIITEMMOVEINFO_H -#define RAGNAROK_SOURCE_UI_BUTTONS_UIITEMMOVEINFO_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMMOVEINFO_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMMOVEINFO_H #include "Contents/Items/ItemInfo.h" #include "UI/Buttons/UITextButton.h" diff --git a/Source/UI/Item/UIItemPurchaseWnd.h b/Source/UI/Items/UIItemPurchaseWnd.h similarity index 87% rename from Source/UI/Item/UIItemPurchaseWnd.h rename to Source/UI/Items/UIItemPurchaseWnd.h index 1b88408f5..bd72b38db 100644 --- a/Source/UI/Item/UIItemPurchaseWnd.h +++ b/Source/UI/Items/UIItemPurchaseWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMPURCHASEWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMPURCHASEWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMPURCHASEWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMPURCHASEWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include diff --git a/Source/UI/UIItemReformWnd.cpp b/Source/UI/Items/UIItemReformWnd.cpp similarity index 99% rename from Source/UI/UIItemReformWnd.cpp rename to Source/UI/Items/UIItemReformWnd.cpp index 432d09a19..4f5f6a5aa 100644 --- a/Source/UI/UIItemReformWnd.cpp +++ b/Source/UI/Items/UIItemReformWnd.cpp @@ -1,12 +1,12 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/UIItemReformWnd.h" +#include "UI/Items/UIItemReformWnd.h" #include "UI/Window/UIEnums.h" #include "Client/Input/InputCharset.h" #include "Client/Input/Mouse.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" @@ -19,7 +19,7 @@ #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Text/CreateLineInfo.h" diff --git a/Source/UI/UIItemReformWnd.h b/Source/UI/Items/UIItemReformWnd.h similarity index 96% rename from Source/UI/UIItemReformWnd.h rename to Source/UI/Items/UIItemReformWnd.h index f543842e6..1ece16afc 100644 --- a/Source/UI/UIItemReformWnd.h +++ b/Source/UI/Items/UIItemReformWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIITEMREFORMWND_H -#define RAGNAROK_SOURCE_UI_UIITEMREFORMWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMREFORMWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMREFORMWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Items/UIItemRepairWnd.cpp b/Source/UI/Items/UIItemRepairWnd.cpp index f508d4435..435843c31 100644 --- a/Source/UI/Items/UIItemRepairWnd.cpp +++ b/Source/UI/Items/UIItemRepairWnd.cpp @@ -6,7 +6,7 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" diff --git a/Source/UI/Item/UIItemSellWnd.h b/Source/UI/Items/UIItemSellWnd.h similarity index 87% rename from Source/UI/Item/UIItemSellWnd.h rename to Source/UI/Items/UIItemSellWnd.h index bc8b346f5..3ccb0c430 100644 --- a/Source/UI/Item/UIItemSellWnd.h +++ b/Source/UI/Items/UIItemSellWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSELLWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSELLWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSELLWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSELLWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include diff --git a/Source/UI/Item/UIItemSellWnd2.h b/Source/UI/Items/UIItemSellWnd2.h similarity index 87% rename from Source/UI/Item/UIItemSellWnd2.h rename to Source/UI/Items/UIItemSellWnd2.h index 7e1a455a3..de4eece75 100644 --- a/Source/UI/Item/UIItemSellWnd2.h +++ b/Source/UI/Items/UIItemSellWnd2.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSELLWND2_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSELLWND2_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSELLWND2_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSELLWND2_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Item/UIItemShopWnd.h b/Source/UI/Items/UIItemShopWnd.h similarity index 89% rename from Source/UI/Item/UIItemShopWnd.h rename to Source/UI/Items/UIItemShopWnd.h index 1f869eb54..2305aa94a 100644 --- a/Source/UI/Item/UIItemShopWnd.h +++ b/Source/UI/Items/UIItemShopWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSHOPWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSHOPWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSHOPWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSHOPWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Item/UIItemShopWnd2.h b/Source/UI/Items/UIItemShopWnd2.h similarity index 88% rename from Source/UI/Item/UIItemShopWnd2.h rename to Source/UI/Items/UIItemShopWnd2.h index e7d4aaf28..6385fb4b9 100644 --- a/Source/UI/Item/UIItemShopWnd2.h +++ b/Source/UI/Items/UIItemShopWnd2.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSHOPWND2_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSHOPWND2_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSHOPWND2_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSHOPWND2_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Lists/UIItemStoreComboBox.cpp b/Source/UI/Items/UIItemStoreComboBox.cpp similarity index 97% rename from Source/UI/Lists/UIItemStoreComboBox.cpp rename to Source/UI/Items/UIItemStoreComboBox.cpp index c179855d6..edae3aa40 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.cpp +++ b/Source/UI/Items/UIItemStoreComboBox.cpp @@ -1,5 +1,5 @@ #include "UI/Buttons/UIBitmapButton.h" -#include "UI/Lists/UIItemStoreComboBox.h" +#include "UI/Items/UIItemStoreComboBox.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Lists/UIItemStoreComboBox.h b/Source/UI/Items/UIItemStoreComboBox.h similarity index 86% rename from Source/UI/Lists/UIItemStoreComboBox.h rename to Source/UI/Items/UIItemStoreComboBox.h index 8b4654eaf..1889ce02b 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.h +++ b/Source/UI/Items/UIItemStoreComboBox.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_LISTS_UIITEMSTORECOMBOBOX_H -#define RAGNAROK_SOURCE_UI_LISTS_UIITEMSTORECOMBOBOX_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTORECOMBOBOX_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTORECOMBOBOX_H #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Lists/UIComboBoxEx.h" diff --git a/Source/UI/Item/UIItemStoreFindWnd.h b/Source/UI/Items/UIItemStoreFindWnd.h similarity index 92% rename from Source/UI/Item/UIItemStoreFindWnd.h rename to Source/UI/Items/UIItemStoreFindWnd.h index 8bf1dcfb6..f3a5ea1c5 100644 --- a/Source/UI/Item/UIItemStoreFindWnd.h +++ b/Source/UI/Items/UIItemStoreFindWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSTOREFINDWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSTOREFINDWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTOREFINDWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTOREFINDWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Item/UIItemStoreSubWnd.h b/Source/UI/Items/UIItemStoreSubWnd.h similarity index 92% rename from Source/UI/Item/UIItemStoreSubWnd.h rename to Source/UI/Items/UIItemStoreSubWnd.h index 924079dea..3434d5ccc 100644 --- a/Source/UI/Item/UIItemStoreSubWnd.h +++ b/Source/UI/Items/UIItemStoreSubWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSTORESUBWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSTORESUBWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTORESUBWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTORESUBWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Item/UIItemStoreWnd.cpp b/Source/UI/Items/UIItemStoreWnd.cpp similarity index 84% rename from Source/UI/Item/UIItemStoreWnd.cpp rename to Source/UI/Items/UIItemStoreWnd.cpp index f42d0fbe9..f8afbd8ec 100644 --- a/Source/UI/Item/UIItemStoreWnd.cpp +++ b/Source/UI/Items/UIItemStoreWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Item/UIItemStoreWnd.h" +#include "UI/Items/UIItemStoreWnd.h" #include "UI/Text/UIStaticText.h" #include diff --git a/Source/UI/Item/UIItemStoreWnd.h b/Source/UI/Items/UIItemStoreWnd.h similarity index 93% rename from Source/UI/Item/UIItemStoreWnd.h rename to Source/UI/Items/UIItemStoreWnd.h index 3a1f1213f..8e4cc8b61 100644 --- a/Source/UI/Item/UIItemStoreWnd.h +++ b/Source/UI/Items/UIItemStoreWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMSTOREWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMSTOREWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTOREWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMSTOREWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Item/UIItemWnd.h b/Source/UI/Items/UIItemWnd.h similarity index 93% rename from Source/UI/Item/UIItemWnd.h rename to Source/UI/Items/UIItemWnd.h index 3896f711c..f3588bb97 100644 --- a/Source/UI/Item/UIItemWnd.h +++ b/Source/UI/Items/UIItemWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIITEMWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIITEMWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/UILapineBoxWnd.cpp b/Source/UI/Items/UILapineBoxWnd.cpp similarity index 99% rename from Source/UI/UILapineBoxWnd.cpp rename to Source/UI/Items/UILapineBoxWnd.cpp index 58691a578..7eabb5bbd 100644 --- a/Source/UI/UILapineBoxWnd.cpp +++ b/Source/UI/Items/UILapineBoxWnd.cpp @@ -1,11 +1,11 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/UILapineScrollBar.h" +#include "UI/Items/UILapineScrollBar.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" @@ -14,7 +14,7 @@ #include "Network/Packets/PacketId.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" -#include "UI/UIIngredientInfoWnd.h" +#include "UI/Items/UIIngredientInfoWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/UILapineScrollBar.cpp b/Source/UI/Items/UILapineScrollBar.cpp similarity index 98% rename from Source/UI/UILapineScrollBar.cpp rename to Source/UI/Items/UILapineScrollBar.cpp index 07895bff1..7ecd31375 100644 --- a/Source/UI/UILapineScrollBar.cpp +++ b/Source/UI/Items/UILapineScrollBar.cpp @@ -2,13 +2,13 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMessage.h" #include "Render/Text/TextContext.h" -#include "UI/UIIngredientInfoWnd.h" -#include "UI/UILapineScrollBar.h" +#include "UI/Items/UIIngredientInfoWnd.h" +#include "UI/Items/UILapineScrollBar.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" @@ -16,7 +16,7 @@ #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Shop/ItemDrawing.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/UILapineScrollBar.h b/Source/UI/Items/UILapineScrollBar.h similarity index 95% rename from Source/UI/UILapineScrollBar.h rename to Source/UI/Items/UILapineScrollBar.h index 9f79f97ce..3c698eba5 100644 --- a/Source/UI/UILapineScrollBar.h +++ b/Source/UI/Items/UILapineScrollBar.h @@ -1,10 +1,10 @@ -#ifndef RAGNAROK_SOURCE_UI_UILAPINESCROLLBAR_H -#define RAGNAROK_SOURCE_UI_UILAPINESCROLLBAR_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UILAPINESCROLLBAR_H +#define RAGNAROK_SOURCE_UI_ITEMS_UILAPINESCROLLBAR_H #include "Contents/Items/ItemInfo.h" #include "UI/Lists/UIScrollBar.h" -#include "UI/UIIngredientInfoWnd.h" -#include "UI/UIScrollWnd.h" +#include "UI/Items/UIIngredientInfoWnd.h" +#include "UI/Lists/UIScrollWnd.h" #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/UILapineUpgradeBoxWnd.cpp b/Source/UI/Items/UILapineUpgradeBoxWnd.cpp similarity index 99% rename from Source/UI/UILapineUpgradeBoxWnd.cpp rename to Source/UI/Items/UILapineUpgradeBoxWnd.cpp index 7a8f208e1..ec2b00bcd 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.cpp +++ b/Source/UI/Items/UILapineUpgradeBoxWnd.cpp @@ -2,14 +2,14 @@ #include "Client/Mode/ModeMessage.h" #include "Client/Mode/CMode.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/UILapineUpgradeBoxWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Items/UILapineUpgradeBoxWnd.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeEvents.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Tables/MessageTable.h" @@ -17,11 +17,11 @@ #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Shop/ItemDrawing.h" -#include "UI/UILapineScrollBar.h" +#include "UI/Items/UILapineScrollBar.h" #include "UI/Window/WindowManagerWindows.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/UILapineUpgradeBoxWnd.h b/Source/UI/Items/UILapineUpgradeBoxWnd.h similarity index 95% rename from Source/UI/UILapineUpgradeBoxWnd.h rename to Source/UI/Items/UILapineUpgradeBoxWnd.h index 663dc1183..9b81ed28b 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.h +++ b/Source/UI/Items/UILapineUpgradeBoxWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UILAPINEUPGRADEBOXWND_H -#define RAGNAROK_SOURCE_UI_UILAPINEUPGRADEBOXWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UILAPINEUPGRADEBOXWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UILAPINEUPGRADEBOXWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Items/UIMakeTargetListWnd.cpp b/Source/UI/Items/UIMakeTargetListWnd.cpp index 2791f0f0a..6cbf41e52 100644 --- a/Source/UI/Items/UIMakeTargetListWnd.cpp +++ b/Source/UI/Items/UIMakeTargetListWnd.cpp @@ -6,8 +6,8 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Jobs/JobId.h" #include "Contents/Items/ItemDescription.h" diff --git a/Source/UI/Items/UIMakeTargetProcessWnd.cpp b/Source/UI/Items/UIMakeTargetProcessWnd.cpp index 927bc2cc9..e0f1ba709 100644 --- a/Source/UI/Items/UIMakeTargetProcessWnd.cpp +++ b/Source/UI/Items/UIMakeTargetProcessWnd.cpp @@ -5,14 +5,14 @@ #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemId.h" #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Item/UIMerchantItemLogWnd.cpp b/Source/UI/Items/UIMerchantItemLogWnd.cpp similarity index 98% rename from Source/UI/Item/UIMerchantItemLogWnd.cpp rename to Source/UI/Items/UIMerchantItemLogWnd.cpp index b287b7143..1ac2e26e1 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.cpp +++ b/Source/UI/Items/UIMerchantItemLogWnd.cpp @@ -2,9 +2,9 @@ #include "Render/Text/FontCache.h" #include "UI/Window/UIEnums.h" #include "Render/Text/TextContext.h" -#include "UI/Item/UIMerchantItemLogWnd.h" +#include "UI/Items/UIMerchantItemLogWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Tables/MessageTable.h" @@ -22,8 +22,8 @@ #include "Utility/Timestamp.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Shop/ItemDrawing.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Item/UIMerchantItemLogWnd.h b/Source/UI/Items/UIMerchantItemLogWnd.h similarity index 84% rename from Source/UI/Item/UIMerchantItemLogWnd.h rename to Source/UI/Items/UIMerchantItemLogWnd.h index eb36fafdf..81a2d7238 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.h +++ b/Source/UI/Items/UIMerchantItemLogWnd.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIMERCHANTITEMLOGWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIMERCHANTITEMLOGWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIMERCHANTITEMLOGWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIMERCHANTITEMLOGWND_H -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Items/UIParaItemShopWnd.cpp similarity index 99% rename from Source/UI/Item/UIParaItemShopWnd.cpp rename to Source/UI/Items/UIParaItemShopWnd.cpp index 7825d745c..a446e1a11 100644 --- a/Source/UI/Item/UIParaItemShopWnd.cpp +++ b/Source/UI/Items/UIParaItemShopWnd.cpp @@ -5,15 +5,15 @@ #include "Contents/Items/ItemType.h" #include "UI/Window/UIEnums.h" #include "Render/Text/TextContext.h" -#include "UI/Item/UIParaItemShopWnd.h" +#include "UI/Items/UIParaItemShopWnd.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" @@ -22,17 +22,17 @@ #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Client/Mode/CLoginMode.h" #include "UI/Buttons/UIButton.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" -#include "UI/Dialogs/UIPasswordWnd.h" +#include "UI/Login/UIPasswordWnd.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIResizer.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Item/UIParaItemShopWnd.h b/Source/UI/Items/UIParaItemShopWnd.h similarity index 88% rename from Source/UI/Item/UIParaItemShopWnd.h rename to Source/UI/Items/UIParaItemShopWnd.h index f129087bb..7f5abb972 100644 --- a/Source/UI/Item/UIParaItemShopWnd.h +++ b/Source/UI/Items/UIParaItemShopWnd.h @@ -1,10 +1,10 @@ -#ifndef RAGNAROK_SOURCE_UI_ITEM_UIPARAITEMSHOPWND_H -#define RAGNAROK_SOURCE_UI_ITEM_UIPARAITEMSHOPWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIPARAITEMSHOPWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIPARAITEMSHOPWND_H #include "Contents/Items/ItemInfo.h" -#include "UI/Item/UIItemBaseWnd.h" -#include "UI/Item/UIItemPurchaseWnd.h" -#include "UI/Item/UIItemShopWnd.h" +#include "UI/Items/UIItemBaseWnd.h" +#include "UI/Items/UIItemPurchaseWnd.h" +#include "UI/Items/UIItemShopWnd.h" #include #include diff --git a/Source/UI/UIPreviewEquipWnd.cpp b/Source/UI/Items/UIPreviewEquipWnd.cpp similarity index 99% rename from Source/UI/UIPreviewEquipWnd.cpp rename to Source/UI/Items/UIPreviewEquipWnd.cpp index 5400bb9fe..04ff63ee5 100644 --- a/Source/UI/UIPreviewEquipWnd.cpp +++ b/Source/UI/Items/UIPreviewEquipWnd.cpp @@ -1,10 +1,10 @@ -#include "UI/UIPreviewEquipWnd.h" +#include "UI/Items/UIPreviewEquipWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/CharacterRender.h" #include "Contents/Actors/Pc.h" #include "Contents/Items/ItemInfo.h" @@ -17,7 +17,7 @@ #include "UI/Text/UIStaticText.h" #include "UI/Window/UIWindowMgr.h" #include "Contents/World/World.h" -#include "UI/Window/FuncDrawWNDChar.h" +#include "UI/Login/FuncDrawWNDChar.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/UI/UIPreviewEquipWnd.h b/Source/UI/Items/UIPreviewEquipWnd.h similarity index 88% rename from Source/UI/UIPreviewEquipWnd.h rename to Source/UI/Items/UIPreviewEquipWnd.h index 7157dd633..f02173b41 100644 --- a/Source/UI/UIPreviewEquipWnd.h +++ b/Source/UI/Items/UIPreviewEquipWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIPREVIEWEQUIPWND_H -#define RAGNAROK_SOURCE_UI_UIPREVIEWEQUIPWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIPREVIEWEQUIPWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIPREVIEWEQUIPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIRefiningWnd.cpp b/Source/UI/Items/UIRefiningWnd.cpp similarity index 99% rename from Source/UI/UIRefiningWnd.cpp rename to Source/UI/Items/UIRefiningWnd.cpp index 93ca19639..e7c5ddd03 100644 --- a/Source/UI/UIRefiningWnd.cpp +++ b/Source/UI/Items/UIRefiningWnd.cpp @@ -1,16 +1,16 @@ -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/UIRefiningWnd.h" +#include "UI/Items/UIRefiningWnd.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemId.h" @@ -19,7 +19,7 @@ #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/UIRefiningWnd.h b/Source/UI/Items/UIRefiningWnd.h similarity index 97% rename from Source/UI/UIRefiningWnd.h rename to Source/UI/Items/UIRefiningWnd.h index a56875bfd..f5d8547a1 100644 --- a/Source/UI/UIRefiningWnd.h +++ b/Source/UI/Items/UIRefiningWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIREFININGWND_H -#define RAGNAROK_SOURCE_UI_UIREFININGWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIREFININGWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UIREFININGWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Window/UISecondCostumeWnd.cpp b/Source/UI/Items/UISecondCostumeWnd.cpp similarity index 97% rename from Source/UI/Window/UISecondCostumeWnd.cpp rename to Source/UI/Items/UISecondCostumeWnd.cpp index 11431d551..cee7b5d25 100644 --- a/Source/UI/Window/UISecondCostumeWnd.cpp +++ b/Source/UI/Items/UISecondCostumeWnd.cpp @@ -2,21 +2,21 @@ #include "UI/Window/UIEnums.h" #include "Resource/Bitmap/BitmapResource.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UISecondCostumeWnd.h" +#include "UI/Items/UISecondCostumeWnd.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" -#include "UI/Window/FuncDrawWNDChar.h" +#include "UI/Login/FuncDrawWNDChar.h" #include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Lists/UIComboBoxDefWnd.h" -#include "UI/Lists/UIListBoxNavi.h" +#include "UI/Navigation/UIListBoxNavi.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Lists/UIListBox.h" #include "UI/Window/WindowManagerWindows.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Script/LuaScript.h" #include "Resource/MSGSTRINGID.h" // OFFSET: 0x00948D20 diff --git a/Source/UI/Window/UISecondCostumeWnd.h b/Source/UI/Items/UISecondCostumeWnd.h similarity index 92% rename from Source/UI/Window/UISecondCostumeWnd.h rename to Source/UI/Items/UISecondCostumeWnd.h index 4ea262481..c46a8887a 100644 --- a/Source/UI/Window/UISecondCostumeWnd.h +++ b/Source/UI/Items/UISecondCostumeWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISECONDCOSTUMEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISECONDCOSTUMEWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UISECONDCOSTUMEWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UISECONDCOSTUMEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Dialogs/UISelectCartWnd.h b/Source/UI/Items/UISelectCartWnd.h similarity index 83% rename from Source/UI/Dialogs/UISelectCartWnd.h rename to Source/UI/Items/UISelectCartWnd.h index bb491f616..d7566285e 100644 --- a/Source/UI/Dialogs/UISelectCartWnd.h +++ b/Source/UI/Items/UISelectCartWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UISELECTCARTWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UISELECTCARTWND_H +#ifndef RAGNAROK_SOURCE_UI_ITEMS_UISELECTCARTWND_H +#define RAGNAROK_SOURCE_UI_ITEMS_UISELECTCARTWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Items/UISwapEquipmentWnd.cpp b/Source/UI/Items/UISwapEquipmentWnd.cpp index 14611992a..e39c936a0 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.cpp +++ b/Source/UI/Items/UISwapEquipmentWnd.cpp @@ -8,7 +8,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" @@ -19,14 +19,14 @@ #include "Contents/World/World.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Dialogs/UINpcEditDialogWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Rodex/UIRodexComposeWnd.h" #include "UI/Shop/ItemDrawing.h" -#include "UI/Window/FuncDrawWNDChar.h" +#include "UI/Login/FuncDrawWNDChar.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Items/UIWeaponRefineWnd.cpp b/Source/UI/Items/UIWeaponRefineWnd.cpp index 60383dafe..8b0e81616 100644 --- a/Source/UI/Items/UIWeaponRefineWnd.cpp +++ b/Source/UI/Items/UIWeaponRefineWnd.cpp @@ -5,7 +5,7 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index 950dcc52b..abbedb30a 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -1,11 +1,11 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "UI/Window/WindowPolicy.h" #include "Render/DeviceContext/DeviceContext.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Lists/UIComboBoxDefWnd.h" -#include "UI/Lists/UIItemStoreComboBox.h" +#include "UI/Items/UIItemStoreComboBox.h" #include "UI/Lists/UIListBox.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/UIWindowMgr.h" @@ -13,10 +13,10 @@ #include #include "UI/Text/UITextViewer.h" #include "UI/Text/UIString.h" -#include "UI/Buttons/UIDescriptRace.h" +#include "UI/Login/UIDescriptRace.h" #include "Contents/Tables/MessageTable.h" #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Sprites/SpriteRidingOffset.h" @@ -24,12 +24,12 @@ #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" -#include "Resource/ImfResource.h" +#include "Resource/Sprites/ImfResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "UI/Text/TextWrapping.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Resource/MSGSTRINGID.h" #include namespace { diff --git a/Source/UI/Lists/UIComboBoxEx.cpp b/Source/UI/Lists/UIComboBoxEx.cpp index 848e61d60..9454a4b07 100644 --- a/Source/UI/Lists/UIComboBoxEx.cpp +++ b/Source/UI/Lists/UIComboBoxEx.cpp @@ -4,11 +4,11 @@ #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Lists/UIComboBoxEx.h" #include "UI/Lists/UIListBox.h" #include "UI/Lists/UIScrollBar.h" -#include "UI/Lists/UIScrollBarNavi.h" +#include "UI/Navigation/UIScrollBarNavi.h" #include "UI/Window/WindowManagerWindows.h" #include diff --git a/Source/UI/Lists/UIComboBoxEx.h b/Source/UI/Lists/UIComboBoxEx.h index cc6f37a9e..4bf496250 100644 --- a/Source/UI/Lists/UIComboBoxEx.h +++ b/Source/UI/Lists/UIComboBoxEx.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_LISTS_UICOMBOBOXEX_H #define RAGNAROK_SOURCE_UI_LISTS_UICOMBOBOXEX_H -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Lists/UIListBoxEx.h" class UIComboBoxEx : public UIListBoxEx { diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index 33eb16ed8..76dbe5794 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -5,7 +5,7 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Contents/Skin/SkinMgr.h" #include "Contents/Items/ItemLink.h" #include "UI/Text/ColoredText.h" @@ -15,9 +15,9 @@ #include "UI/Lists/UIMemberListBox.h" #include "Render/Text/FontCache.h" #include "UI/Lists/UIScrollBar.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/PixelTextWrapping.h" -#include "UI/TextTags.h" +#include "UI/Text/TextTags.h" #include "UI/Window/WindowManagerWindows.h" #include diff --git a/Source/UI/Lists/UIListBoxEx.cpp b/Source/UI/Lists/UIListBoxEx.cpp index 8cf009ce9..5c1a6c667 100644 --- a/Source/UI/Lists/UIListBoxEx.cpp +++ b/Source/UI/Lists/UIListBoxEx.cpp @@ -3,7 +3,7 @@ #include "UI/Window/UIEnums.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Contents/Skin/SkinMgr.h" #include "UI/Text/ColoredText.h" #include "UI/Lists/UIListBox.h" diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index cda568831..87e1ff613 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -11,9 +11,9 @@ #include "UI/Lists/UIScrollBar.h" #include "UI/Lists/UIScrollBarVariants.h" #include "Contents/Items/ItemDescription.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" -#include "UI/UIBasicCtrl.h" +#include "UI/Window/UIBasicCtrl.h" #include "Utility/Text/FormatString.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Lists/UIImgMenu.h" @@ -38,10 +38,10 @@ #include "UI/Gauges/UIPcGage.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Skills/SkillInfo.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Client/Input/InputCharset.h" #include "Client/Input/Language.h" #include "Contents/Map/MapSkyMgr.h" @@ -1883,7 +1883,7 @@ bool UIItemTagCtrl::RemoveInvalidTag(std::list::iterator& entry) #include "Contents/Items/ItemNaming.h" #include "Contents/Actors/PlayerNameDictionary.h" #include "Contents/Tables/TipBoxTitles.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include diff --git a/Source/UI/Lists/UIScrollBarVariants.h b/Source/UI/Lists/UIScrollBarVariants.h index e91c931d2..29b2cbef8 100644 --- a/Source/UI/Lists/UIScrollBarVariants.h +++ b/Source/UI/Lists/UIScrollBarVariants.h @@ -7,7 +7,7 @@ #include #include "Contents/Skin/SkinMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Lists/UIListBoxID.h" class CBitmapRes; diff --git a/Source/UI/UIScrollWnd.cpp b/Source/UI/Lists/UIScrollWnd.cpp similarity index 99% rename from Source/UI/UIScrollWnd.cpp rename to Source/UI/Lists/UIScrollWnd.cpp index 46522236b..da3edc02c 100644 --- a/Source/UI/UIScrollWnd.cpp +++ b/Source/UI/Lists/UIScrollWnd.cpp @@ -1,6 +1,6 @@ #include "Render/DeviceContext/DCSurface.h" #include "UI/Window/UIEnums.h" -#include "UI/UIScrollWnd.h" +#include "UI/Lists/UIScrollWnd.h" #include "Render/DeviceContext/DCBitmap.h" #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Renderer.h" diff --git a/Source/UI/UIScrollWnd.h b/Source/UI/Lists/UIScrollWnd.h similarity index 94% rename from Source/UI/UIScrollWnd.h rename to Source/UI/Lists/UIScrollWnd.h index 4fe9aad8f..c860895b7 100644 --- a/Source/UI/UIScrollWnd.h +++ b/Source/UI/Lists/UIScrollWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UISCROLLWND_H -#define RAGNAROK_SOURCE_UI_UISCROLLWND_H +#ifndef RAGNAROK_SOURCE_UI_LISTS_UISCROLLWND_H +#define RAGNAROK_SOURCE_UI_LISTS_UISCROLLWND_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Lists/UITagListBox.h b/Source/UI/Lists/UITagListBox.h index 097f2b0a1..282b110af 100644 --- a/Source/UI/Lists/UITagListBox.h +++ b/Source/UI/Lists/UITagListBox.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_LISTS_UITAGLISTBOX_H #include "UI/Lists/UIListBox.h" -#include "UI/TextTags.h" +#include "UI/Text/TextTags.h" #include #include diff --git a/Source/UI/Window/FuncDrawWNDChar.cpp b/Source/UI/Login/FuncDrawWNDChar.cpp similarity index 99% rename from Source/UI/Window/FuncDrawWNDChar.cpp rename to Source/UI/Login/FuncDrawWNDChar.cpp index 7f35dbc42..96640dfc2 100644 --- a/Source/UI/Window/FuncDrawWNDChar.cpp +++ b/Source/UI/Login/FuncDrawWNDChar.cpp @@ -1,5 +1,5 @@ -#include "UI/Window/FuncDrawWNDChar.h" -#include "Client/Session.h" +#include "UI/Login/FuncDrawWNDChar.h" +#include "Client/Session/Session.h" #include "Script/LuaScript.h" #include "Contents/Sprites/SpriteRidingOffset.h" #include "Contents/Sprites/SpriteRidingPolicy.h" @@ -12,7 +12,7 @@ #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/SpritePixels.h" #include "Render/Textures/Texture.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/SpriteResource.h" #include "Script/LuaScript.h" diff --git a/Source/UI/Window/FuncDrawWNDChar.h b/Source/UI/Login/FuncDrawWNDChar.h similarity index 95% rename from Source/UI/Window/FuncDrawWNDChar.h rename to Source/UI/Login/FuncDrawWNDChar.h index 08222143f..f9165b698 100644 --- a/Source/UI/Window/FuncDrawWNDChar.h +++ b/Source/UI/Login/FuncDrawWNDChar.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_FUNCDRAWWNDCHAR_H -#define RAGNAROK_SOURCE_UI_WINDOW_FUNCDRAWWNDCHAR_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_FUNCDRAWWNDCHAR_H +#define RAGNAROK_SOURCE_UI_LOGIN_FUNCDRAWWNDCHAR_H #include #include diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Login/UIChangeNameWnd.cpp similarity index 97% rename from Source/UI/Window/UIChangeNameWnd.cpp rename to Source/UI/Login/UIChangeNameWnd.cpp index 8ba72c2a9..f4040d0ca 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Login/UIChangeNameWnd.cpp @@ -1,18 +1,18 @@ #include "Client/Mode/ModeMessage.h" -#include "UI/Window/UIChangeNameWnd.h" +#include "UI/Login/UIChangeNameWnd.h" #include "UI/Window/UIEnums.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Text/NavigationLink.h" -#include "Client/Session.h" +#include "UI/Navigation/NavigationLink.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Tables/ForbiddenWords.h" #include "Contents/Jobs/JobInheritance.h" diff --git a/Source/UI/Window/UIChangeNameWnd.h b/Source/UI/Login/UIChangeNameWnd.h similarity index 87% rename from Source/UI/Window/UIChangeNameWnd.h rename to Source/UI/Login/UIChangeNameWnd.h index 1eff52316..b1e6bc59f 100644 --- a/Source/UI/Window/UIChangeNameWnd.h +++ b/Source/UI/Login/UIChangeNameWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UICHANGENAMEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UICHANGENAMEWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UICHANGENAMEWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UICHANGENAMEWND_H #include "Client/Mode/CLoginMode.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Buttons/UIDescriptRace.cpp b/Source/UI/Login/UIDescriptRace.cpp similarity index 97% rename from Source/UI/Buttons/UIDescriptRace.cpp rename to Source/UI/Login/UIDescriptRace.cpp index af0ccd200..ae90ef10d 100644 --- a/Source/UI/Buttons/UIDescriptRace.cpp +++ b/Source/UI/Login/UIDescriptRace.cpp @@ -1,5 +1,5 @@ #include "UI/Window/UIEnums.h" -#include "UI/Buttons/UIDescriptRace.h" +#include "UI/Login/UIDescriptRace.h" #include #include diff --git a/Source/UI/Buttons/UIDescriptRace.h b/Source/UI/Login/UIDescriptRace.h similarity index 92% rename from Source/UI/Buttons/UIDescriptRace.h rename to Source/UI/Login/UIDescriptRace.h index 2df7804a2..572e0c992 100644 --- a/Source/UI/Buttons/UIDescriptRace.h +++ b/Source/UI/Login/UIDescriptRace.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIDESCRIPTRACE_H -#define RAGNAROK_SOURCE_UI_BUTTONS_UIDESCRIPTRACE_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UIDESCRIPTRACE_H +#define RAGNAROK_SOURCE_UI_LOGIN_UIDESCRIPTRACE_H #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.cpp b/Source/UI/Login/UIEmailAddressWnd.cpp similarity index 94% rename from Source/UI/Dialogs/UIEmailAddressWnd.cpp rename to Source/UI/Login/UIEmailAddressWnd.cpp index 4d2ba917e..497f21dc8 100644 --- a/Source/UI/Dialogs/UIEmailAddressWnd.cpp +++ b/Source/UI/Login/UIEmailAddressWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Dialogs/UIEmailAddressWnd.h" +#include "UI/Login/UIEmailAddressWnd.h" #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.h b/Source/UI/Login/UIEmailAddressWnd.h similarity index 79% rename from Source/UI/Dialogs/UIEmailAddressWnd.h rename to Source/UI/Login/UIEmailAddressWnd.h index 5d5e9bee1..1d6a0e4ad 100644 --- a/Source/UI/Dialogs/UIEmailAddressWnd.h +++ b/Source/UI/Login/UIEmailAddressWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIEMAILADDRESSWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIEMAILADDRESSWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UIEMAILADDRESSWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UIEMAILADDRESSWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UILoginOTPWnd.h b/Source/UI/Login/UILoginOTPWnd.h similarity index 84% rename from Source/UI/Window/UILoginOTPWnd.h rename to Source/UI/Login/UILoginOTPWnd.h index 0da006902..c34929b13 100644 --- a/Source/UI/Window/UILoginOTPWnd.h +++ b/Source/UI/Login/UILoginOTPWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UILOGINOTPWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UILOGINOTPWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UILOGINOTPWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UILOGINOTPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UILoginWnd.cpp b/Source/UI/Login/UILoginWnd.cpp similarity index 89% rename from Source/UI/Window/UILoginWnd.cpp rename to Source/UI/Login/UILoginWnd.cpp index c8d1e0bb7..1746d986f 100644 --- a/Source/UI/Window/UILoginWnd.cpp +++ b/Source/UI/Login/UILoginWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UILoginWnd.h" +#include "UI/Login/UILoginWnd.h" #include "Client/Application/ApplicationWindow.h" #include diff --git a/Source/UI/Window/UILoginWnd.h b/Source/UI/Login/UILoginWnd.h similarity index 90% rename from Source/UI/Window/UILoginWnd.h rename to Source/UI/Login/UILoginWnd.h index 22a220857..361e7f750 100644 --- a/Source/UI/Window/UILoginWnd.h +++ b/Source/UI/Login/UILoginWnd.h @@ -1,10 +1,10 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UILOGINWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UILOGINWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UILOGINWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UILOGINWND_H #include "UI/Edit/UIEditCtrl_Currency.h" #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Window/UIFrameWnd.h" -#include "UI/Window/UIRPImageWnd2.h" +#include "UI/Dialogs/UIRPImageWnd2.h" #include #include diff --git a/Source/UI/Window/UIMakeCharWnd.h b/Source/UI/Login/UIMakeCharWnd.h similarity index 86% rename from Source/UI/Window/UIMakeCharWnd.h rename to Source/UI/Login/UIMakeCharWnd.h index 5c1b0023b..3d6cb86a2 100644 --- a/Source/UI/Window/UIMakeCharWnd.h +++ b/Source/UI/Login/UIMakeCharWnd.h @@ -1,9 +1,9 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMAKECHARWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMAKECHARWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UIMAKECHARWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UIMAKECHARWND_H #include "Client/Mode/CLoginMode.h" #include "UI/Window/UIFrameWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" class UIBitmapButton; class UIBitmapEditCtrl; diff --git a/Source/UI/Window/UINewMakeCharWnd.cpp b/Source/UI/Login/UINewMakeCharWnd.cpp similarity index 99% rename from Source/UI/Window/UINewMakeCharWnd.cpp rename to Source/UI/Login/UINewMakeCharWnd.cpp index a05f5f3fc..ba4aef2fd 100644 --- a/Source/UI/Window/UINewMakeCharWnd.cpp +++ b/Source/UI/Login/UINewMakeCharWnd.cpp @@ -2,10 +2,10 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UINewMakeCharWnd.h" +#include "UI/Login/UINewMakeCharWnd.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Tables/MessageTable.h" @@ -16,13 +16,13 @@ #include "Render/Textures/SpritePixels.h" #include "Render/Textures/Texture.h" #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/ImfResource.h" -#include "Resource/PaletteResource.h" +#include "Resource/Sprites/ImfResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" -#include "Resource/TextureNames.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "Resource/Bitmap/TextureNames.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Login/UINewMakeCharWnd.h similarity index 97% rename from Source/UI/Window/UINewMakeCharWnd.h rename to Source/UI/Login/UINewMakeCharWnd.h index dff064659..3856fdf95 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Login/UINewMakeCharWnd.h @@ -1,10 +1,10 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINEWMAKECHARWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINEWMAKECHARWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UINEWMAKECHARWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UINEWMAKECHARWND_H #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpRadioBtn.h" #include "UI/Buttons/UIBmpTextButton.h" -#include "UI/Buttons/UIDescriptRace.h" +#include "UI/Login/UIDescriptRace.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/InputFocus.h" diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Login/UINewSelectCharWnd.cpp similarity index 99% rename from Source/UI/Window/UINewSelectCharWnd.cpp rename to Source/UI/Login/UINewSelectCharWnd.cpp index 62e65769f..72e1cdf77 100644 --- a/Source/UI/Window/UINewSelectCharWnd.cpp +++ b/Source/UI/Login/UINewSelectCharWnd.cpp @@ -4,25 +4,25 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/CMode.h" #include "Client/Input/Mouse.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpTextButton.h" #include "UI/Buttons/UISlotBmpButton.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/UIControl.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/FuncDrawWNDChar.h" -#include "Client/Registry.h" +#include "UI/Login/FuncDrawWNDChar.h" +#include "Client/Application/Registry.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CLoginMode.h" #include "Utility/Timestamp.h" #include "Utility/Text/FormatString.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" #include "Contents/Actors/Pc.h" #include "Contents/Sprites/SpriteRidingOffset.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Hotkeys/EmotionHotkeys.h" #include "Contents/Sound/SoundMgr.h" @@ -31,7 +31,7 @@ #include "Network/Packets/PacketLengths.h" #include "Render/DeviceContext/DCSurface.h" #include "Script/LuaScript.h" -#include "UI/Window/UIChangeNameWnd.h" +#include "UI/Login/UIChangeNameWnd.h" #include "Resource/MSGSTRINGID.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Window/UINewSelectCharWnd.h b/Source/UI/Login/UINewSelectCharWnd.h similarity index 95% rename from Source/UI/Window/UINewSelectCharWnd.h rename to Source/UI/Login/UINewSelectCharWnd.h index efd3cfc21..ecb1c5ef2 100644 --- a/Source/UI/Window/UINewSelectCharWnd.h +++ b/Source/UI/Login/UINewSelectCharWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINEWSELECTCHARWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINEWSELECTCHARWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UINEWSELECTCHARWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UINEWSELECTCHARWND_H #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/Dialogs/UIPasswordWnd.cpp b/Source/UI/Login/UIPasswordWnd.cpp similarity index 98% rename from Source/UI/Dialogs/UIPasswordWnd.cpp rename to Source/UI/Login/UIPasswordWnd.cpp index 016d10934..c65022fab 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.cpp +++ b/Source/UI/Login/UIPasswordWnd.cpp @@ -1,6 +1,6 @@ -#include "UI/Dialogs/UIPasswordWnd.h" +#include "UI/Login/UIPasswordWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Security/SecondPwdRandom.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Dialogs/UIPasswordWnd.h b/Source/UI/Login/UIPasswordWnd.h similarity index 96% rename from Source/UI/Dialogs/UIPasswordWnd.h rename to Source/UI/Login/UIPasswordWnd.h index ad598c9e6..21cb49ce5 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.h +++ b/Source/UI/Login/UIPasswordWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIPASSWORDWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIPASSWORDWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UIPASSWORDWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UIPASSWORDWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Dialogs/UISecondPasswordEditWnd.h b/Source/UI/Login/UISecondPasswordEditWnd.h similarity index 58% rename from Source/UI/Dialogs/UISecondPasswordEditWnd.h rename to Source/UI/Login/UISecondPasswordEditWnd.h index 3e78873ad..c6a3389e7 100644 --- a/Source/UI/Dialogs/UISecondPasswordEditWnd.h +++ b/Source/UI/Login/UISecondPasswordEditWnd.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UISECONDPASSWORDEDITWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UISECONDPASSWORDEDITWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UISECONDPASSWORDEDITWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UISECONDPASSWORDEDITWND_H -#include "UI/Dialogs/UIPasswordWnd.h" +#include "UI/Login/UIPasswordWnd.h" #include diff --git a/Source/UI/Window/UISelCharForUServerWnd.cpp b/Source/UI/Login/UISelCharForUServerWnd.cpp similarity index 99% rename from Source/UI/Window/UISelCharForUServerWnd.cpp rename to Source/UI/Login/UISelCharForUServerWnd.cpp index c50f17035..e24cfcc8b 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.cpp +++ b/Source/UI/Login/UISelCharForUServerWnd.cpp @@ -1,12 +1,12 @@ #include "Client/Mode/ModeMessage.h" -#include "UI/Window/UISelCharForUServerWnd.h" +#include "UI/Login/UISelCharForUServerWnd.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/CLoginMode.h" #include "Client/Mode/CMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Sprites/SpriteRidingOffset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Window/UISelCharForUServerWnd.h b/Source/UI/Login/UISelCharForUServerWnd.h similarity index 86% rename from Source/UI/Window/UISelCharForUServerWnd.h rename to Source/UI/Login/UISelCharForUServerWnd.h index 44d06139d..cb3394fa0 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.h +++ b/Source/UI/Login/UISelCharForUServerWnd.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISELCHARFORUSERVERWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISELCHARFORUSERVERWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UISELCHARFORUSERVERWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UISELCHARFORUSERVERWND_H #include "UI/Window/UIFrameWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include #include diff --git a/Source/UI/Window/UISelectServerWnd.h b/Source/UI/Login/UISelectServerWnd.h similarity index 83% rename from Source/UI/Window/UISelectServerWnd.h rename to Source/UI/Login/UISelectServerWnd.h index 45f772a99..4ef6aef88 100644 --- a/Source/UI/Window/UISelectServerWnd.h +++ b/Source/UI/Login/UISelectServerWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISELECTSERVERWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISELECTSERVERWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UISELECTSERVERWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UISELECTSERVERWND_H #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp b/Source/UI/Login/UIWaitDBSaveWnd.cpp similarity index 98% rename from Source/UI/Dialogs/UIWaitDBSaveWnd.cpp rename to Source/UI/Login/UIWaitDBSaveWnd.cpp index 27214209d..0aa21cbe5 100644 --- a/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp +++ b/Source/UI/Login/UIWaitDBSaveWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Dialogs/UIWaitDBSaveWnd.h" +#include "UI/Login/UIWaitDBSaveWnd.h" #include "UI/Window/WindowId.h" #include "Render/Textures/SpritePixels.h" @@ -6,7 +6,7 @@ #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/UI/Dialogs/UIWaitDBSaveWnd.h b/Source/UI/Login/UIWaitDBSaveWnd.h similarity index 86% rename from Source/UI/Dialogs/UIWaitDBSaveWnd.h rename to Source/UI/Login/UIWaitDBSaveWnd.h index 78a287938..7c586fa10 100644 --- a/Source/UI/Dialogs/UIWaitDBSaveWnd.h +++ b/Source/UI/Login/UIWaitDBSaveWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIWAITDBSAVEWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIWAITDBSAVEWND_H +#ifndef RAGNAROK_SOURCE_UI_LOGIN_UIWAITDBSAVEWND_H +#define RAGNAROK_SOURCE_UI_LOGIN_UIWAITDBSAVEWND_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/UICaptchaPreviewWnd.cpp b/Source/UI/Macro/UICaptchaPreviewWnd.cpp similarity index 98% rename from Source/UI/UICaptchaPreviewWnd.cpp rename to Source/UI/Macro/UICaptchaPreviewWnd.cpp index c974d3e52..0c78211a0 100644 --- a/Source/UI/UICaptchaPreviewWnd.cpp +++ b/Source/UI/Macro/UICaptchaPreviewWnd.cpp @@ -1,8 +1,8 @@ -#include "UI/UICaptchaPreviewWnd.h" +#include "UI/Macro/UICaptchaPreviewWnd.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpRadioBtn.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/UIMacroDetectorWnd.h" +#include "UI/Macro/UIMacroDetectorWnd.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/UICaptchaPreviewWnd.h b/Source/UI/Macro/UICaptchaPreviewWnd.h similarity index 85% rename from Source/UI/UICaptchaPreviewWnd.h rename to Source/UI/Macro/UICaptchaPreviewWnd.h index a124a8f8c..4a3390ffb 100644 --- a/Source/UI/UICaptchaPreviewWnd.h +++ b/Source/UI/Macro/UICaptchaPreviewWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UICAPTCHAPREVIEWWND_H -#define RAGNAROK_SOURCE_UI_UICAPTCHAPREVIEWWND_H +#ifndef RAGNAROK_SOURCE_UI_MACRO_UICAPTCHAPREVIEWWND_H +#define RAGNAROK_SOURCE_UI_MACRO_UICAPTCHAPREVIEWWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UICaptchaRegisterWnd.cpp b/Source/UI/Macro/UICaptchaRegisterWnd.cpp similarity index 98% rename from Source/UI/UICaptchaRegisterWnd.cpp rename to Source/UI/Macro/UICaptchaRegisterWnd.cpp index cec3d34f3..2ac3041ce 100644 --- a/Source/UI/UICaptchaRegisterWnd.cpp +++ b/Source/UI/Macro/UICaptchaRegisterWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/UICaptchaRegisterWnd.h" +#include "UI/Macro/UICaptchaRegisterWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" @@ -15,7 +15,7 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Text/UIStaticText.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/UICaptchaRegisterWnd.h b/Source/UI/Macro/UICaptchaRegisterWnd.h similarity index 88% rename from Source/UI/UICaptchaRegisterWnd.h rename to Source/UI/Macro/UICaptchaRegisterWnd.h index 5c2a37207..d1abc4a12 100644 --- a/Source/UI/UICaptchaRegisterWnd.h +++ b/Source/UI/Macro/UICaptchaRegisterWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UICAPTCHAREGISTERWND_H -#define RAGNAROK_SOURCE_UI_UICAPTCHAREGISTERWND_H +#ifndef RAGNAROK_SOURCE_UI_MACRO_UICAPTCHAREGISTERWND_H +#define RAGNAROK_SOURCE_UI_MACRO_UICAPTCHAREGISTERWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIMacroBlackListCheckWnd.cpp b/Source/UI/Macro/UIMacroBlackListCheckWnd.cpp similarity index 99% rename from Source/UI/UIMacroBlackListCheckWnd.cpp rename to Source/UI/Macro/UIMacroBlackListCheckWnd.cpp index d6f051e84..b3185607d 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.cpp +++ b/Source/UI/Macro/UIMacroBlackListCheckWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/UIMacroBlackListCheckWnd.h" +#include "UI/Macro/UIMacroBlackListCheckWnd.h" #include "UI/Window/UIEnums.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/UI/UIMacroBlackListCheckWnd.h b/Source/UI/Macro/UIMacroBlackListCheckWnd.h similarity index 90% rename from Source/UI/UIMacroBlackListCheckWnd.h rename to Source/UI/Macro/UIMacroBlackListCheckWnd.h index 56682f410..9b0214383 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.h +++ b/Source/UI/Macro/UIMacroBlackListCheckWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIMACROBLACKLISTCHECKWND_H -#define RAGNAROK_SOURCE_UI_UIMACROBLACKLISTCHECKWND_H +#ifndef RAGNAROK_SOURCE_UI_MACRO_UIMACROBLACKLISTCHECKWND_H +#define RAGNAROK_SOURCE_UI_MACRO_UIMACROBLACKLISTCHECKWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIMacroDetectorWnd.cpp b/Source/UI/Macro/UIMacroDetectorWnd.cpp similarity index 97% rename from Source/UI/UIMacroDetectorWnd.cpp rename to Source/UI/Macro/UIMacroDetectorWnd.cpp index aa8204235..8da655720 100644 --- a/Source/UI/UIMacroDetectorWnd.cpp +++ b/Source/UI/Macro/UIMacroDetectorWnd.cpp @@ -1,13 +1,13 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Input/InputCharset.h" -#include "UI/UIMacroDetectorWnd.h" +#include "UI/Macro/UIMacroDetectorWnd.h" #include "Client/Input/Language.h" #include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/UICaptchaPreviewWnd.h" +#include "UI/Macro/UICaptchaPreviewWnd.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" #include "Utility/StdStringCompare.h" diff --git a/Source/UI/UIMacroDetectorWnd.h b/Source/UI/Macro/UIMacroDetectorWnd.h similarity index 94% rename from Source/UI/UIMacroDetectorWnd.h rename to Source/UI/Macro/UIMacroDetectorWnd.h index e8bf461ea..81d6b6ee3 100644 --- a/Source/UI/UIMacroDetectorWnd.h +++ b/Source/UI/Macro/UIMacroDetectorWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIMACRODETECTORWND_H -#define RAGNAROK_SOURCE_UI_UIMACRODETECTORWND_H +#ifndef RAGNAROK_SOURCE_UI_MACRO_UIMACRODETECTORWND_H +#define RAGNAROK_SOURCE_UI_MACRO_UIMACRODETECTORWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIMacroReport.cpp b/Source/UI/Macro/UIMacroReport.cpp similarity index 99% rename from Source/UI/UIMacroReport.cpp rename to Source/UI/Macro/UIMacroReport.cpp index 3d8741e3d..f90281b95 100644 --- a/Source/UI/UIMacroReport.cpp +++ b/Source/UI/Macro/UIMacroReport.cpp @@ -1,8 +1,8 @@ -#include "UI/UIMacroReport.h" +#include "UI/Macro/UIMacroReport.h" #include "UI/Window/WindowId.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/UIMacroReport.h b/Source/UI/Macro/UIMacroReport.h similarity index 88% rename from Source/UI/UIMacroReport.h rename to Source/UI/Macro/UIMacroReport.h index 84d2f11ab..95e407f79 100644 --- a/Source/UI/UIMacroReport.h +++ b/Source/UI/Macro/UIMacroReport.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_UIMACROREPORT_H -#define RAGNAROK_SOURCE_UI_UIMACROREPORT_H +#ifndef RAGNAROK_SOURCE_UI_MACRO_UIMACROREPORT_H +#define RAGNAROK_SOURCE_UI_MACRO_UIMACROREPORT_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include diff --git a/Source/UI/UIMacroUserInfoWnd.cpp b/Source/UI/Macro/UIMacroUserInfoWnd.cpp similarity index 99% rename from Source/UI/UIMacroUserInfoWnd.cpp rename to Source/UI/Macro/UIMacroUserInfoWnd.cpp index 071bd012d..21e90334c 100644 --- a/Source/UI/UIMacroUserInfoWnd.cpp +++ b/Source/UI/Macro/UIMacroUserInfoWnd.cpp @@ -1,14 +1,14 @@ -#include "UI/UIMacroUserInfoWnd.h" +#include "UI/Macro/UIMacroUserInfoWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Map/MapInfoMgr.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/UI/UIMacroUserInfoWnd.h b/Source/UI/Macro/UIMacroUserInfoWnd.h similarity index 96% rename from Source/UI/UIMacroUserInfoWnd.h rename to Source/UI/Macro/UIMacroUserInfoWnd.h index 3f562876f..2743e9715 100644 --- a/Source/UI/UIMacroUserInfoWnd.h +++ b/Source/UI/Macro/UIMacroUserInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIMACROUSERINFOWND_H -#define RAGNAROK_SOURCE_UI_UIMACROUSERINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_MACRO_UIMACROUSERINFOWND_H +#define RAGNAROK_SOURCE_UI_MACRO_UIMACROUSERINFOWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Menu/UIMenuIconWnd.cpp b/Source/UI/Menu/UIMenuIconWnd.cpp index 528ab481b..f10b8a220 100644 --- a/Source/UI/Menu/UIMenuIconWnd.cpp +++ b/Source/UI/Menu/UIMenuIconWnd.cpp @@ -7,8 +7,8 @@ #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/EntryQueue/EntryQueueMgr.h" #include "Contents/Guild/GuildMgr.h" #include "Contents/Tables/MessageTable.h" @@ -16,7 +16,7 @@ #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" #include "Script/LuaScript.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UIMonsterDisplayWnd.h b/Source/UI/Monster/UIMonsterDisplayWnd.h similarity index 81% rename from Source/UI/Window/UIMonsterDisplayWnd.h rename to Source/UI/Monster/UIMonsterDisplayWnd.h index 3e224e7e1..b262cdef5 100644 --- a/Source/UI/Window/UIMonsterDisplayWnd.h +++ b/Source/UI/Monster/UIMonsterDisplayWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMONSTERDISPLAYWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMONSTERDISPLAYWND_H +#ifndef RAGNAROK_SOURCE_UI_MONSTER_UIMONSTERDISPLAYWND_H +#define RAGNAROK_SOURCE_UI_MONSTER_UIMONSTERDISPLAYWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIMonsterInfoWnd.h b/Source/UI/Monster/UIMonsterInfoWnd.h similarity index 90% rename from Source/UI/Window/UIMonsterInfoWnd.h rename to Source/UI/Monster/UIMonsterInfoWnd.h index 37dd028bd..6cc5bf6f1 100644 --- a/Source/UI/Window/UIMonsterInfoWnd.h +++ b/Source/UI/Monster/UIMonsterInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMONSTERINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMONSTERINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_MONSTER_UIMONSTERINFOWND_H +#define RAGNAROK_SOURCE_UI_MONSTER_UIMONSTERINFOWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Navigation/NavigationLink.cpp similarity index 99% rename from Source/UI/Text/NavigationLink.cpp rename to Source/UI/Navigation/NavigationLink.cpp index 1fa236ba0..c9daa2fd9 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Navigation/NavigationLink.cpp @@ -1,6 +1,6 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "Client/Mode/CMode.h" #include @@ -22,7 +22,7 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" @@ -40,14 +40,14 @@ #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UITextButton.h" #include "UI/Dialogs/UITipboxWnd.h" #include "UI/Text/ColoredText.h" #include "UI/Text/CreateLineInfo.h" #include "UI/Text/TextMarkup.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/StringUtil.h" diff --git a/Source/UI/Text/NavigationLink.h b/Source/UI/Navigation/NavigationLink.h similarity index 91% rename from Source/UI/Text/NavigationLink.h rename to Source/UI/Navigation/NavigationLink.h index 240070eba..8bc953eb6 100644 --- a/Source/UI/Text/NavigationLink.h +++ b/Source/UI/Navigation/NavigationLink.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_TEXT_NAVIGATIONLINK_H -#define RAGNAROK_SOURCE_UI_TEXT_NAVIGATIONLINK_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_NAVIGATIONLINK_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_NAVIGATIONLINK_H #include #include diff --git a/Source/UI/Dialogs/UIChooseWarpWnd.h b/Source/UI/Navigation/UIChooseWarpWnd.h similarity index 82% rename from Source/UI/Dialogs/UIChooseWarpWnd.h rename to Source/UI/Navigation/UIChooseWarpWnd.h index 7f56ac293..ef6fcde9f 100644 --- a/Source/UI/Dialogs/UIChooseWarpWnd.h +++ b/Source/UI/Navigation/UIChooseWarpWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UICHOOSEWARPWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UICHOOSEWARPWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UICHOOSEWARPWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UICHOOSEWARPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Lists/UIListBoxNavi.cpp b/Source/UI/Navigation/UIListBoxNavi.cpp similarity index 93% rename from Source/UI/Lists/UIListBoxNavi.cpp rename to Source/UI/Navigation/UIListBoxNavi.cpp index cc17c3139..1dba4ec01 100644 --- a/Source/UI/Lists/UIListBoxNavi.cpp +++ b/Source/UI/Navigation/UIListBoxNavi.cpp @@ -1,4 +1,4 @@ -#include "UI/Lists/UIListBoxNavi.h" +#include "UI/Navigation/UIListBoxNavi.h" #include #include diff --git a/Source/UI/Lists/UIListBoxNavi.h b/Source/UI/Navigation/UIListBoxNavi.h similarity index 84% rename from Source/UI/Lists/UIListBoxNavi.h rename to Source/UI/Navigation/UIListBoxNavi.h index ae9c6821d..46891db7a 100644 --- a/Source/UI/Lists/UIListBoxNavi.h +++ b/Source/UI/Navigation/UIListBoxNavi.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_LISTS_UILISTBOXNAVI_H -#define RAGNAROK_SOURCE_UI_LISTS_UILISTBOXNAVI_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UILISTBOXNAVI_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UILISTBOXNAVI_H #include "UI/Lists/UIListBox.h" diff --git a/Source/UI/Lists/UIListBoxNaviSearch.h b/Source/UI/Navigation/UIListBoxNaviSearch.h similarity index 84% rename from Source/UI/Lists/UIListBoxNaviSearch.h rename to Source/UI/Navigation/UIListBoxNaviSearch.h index 8da43dbb2..7bd15dde5 100644 --- a/Source/UI/Lists/UIListBoxNaviSearch.h +++ b/Source/UI/Navigation/UIListBoxNaviSearch.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_LISTS_UILISTBOXNAVISEARCH_H -#define RAGNAROK_SOURCE_UI_LISTS_UILISTBOXNAVISEARCH_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UILISTBOXNAVISEARCH_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UILISTBOXNAVISEARCH_H #include "UI/Lists/UIListBox.h" diff --git a/Source/UI/Dialogs/UIMemorialDunWnd.h b/Source/UI/Navigation/UIMemorialDunWnd.h similarity index 83% rename from Source/UI/Dialogs/UIMemorialDunWnd.h rename to Source/UI/Navigation/UIMemorialDunWnd.h index d119c88e9..26f33742f 100644 --- a/Source/UI/Dialogs/UIMemorialDunWnd.h +++ b/Source/UI/Navigation/UIMemorialDunWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIMEMORIALDUNWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIMEMORIALDUNWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UIMEMORIALDUNWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UIMEMORIALDUNWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Dialogs/UIMiniMapWnd.h b/Source/UI/Navigation/UIMiniMapWnd.h similarity index 93% rename from Source/UI/Dialogs/UIMiniMapWnd.h rename to Source/UI/Navigation/UIMiniMapWnd.h index 270fa85f5..aa65cd30b 100644 --- a/Source/UI/Dialogs/UIMiniMapWnd.h +++ b/Source/UI/Navigation/UIMiniMapWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIMINIMAPWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIMINIMAPWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UIMINIMAPWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UIMINIMAPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Dialogs/UIMinimapZoomWnd.cpp b/Source/UI/Navigation/UIMinimapZoomWnd.cpp similarity index 82% rename from Source/UI/Dialogs/UIMinimapZoomWnd.cpp rename to Source/UI/Navigation/UIMinimapZoomWnd.cpp index f6ebcfe4e..d8c825e16 100644 --- a/Source/UI/Dialogs/UIMinimapZoomWnd.cpp +++ b/Source/UI/Navigation/UIMinimapZoomWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Dialogs/UIMinimapZoomWnd.h" +#include "UI/Navigation/UIMinimapZoomWnd.h" // OFFSET: 0x008C8460 // FUNCTION: fn_11954 diff --git a/Source/UI/Dialogs/UIMinimapZoomWnd.h b/Source/UI/Navigation/UIMinimapZoomWnd.h similarity index 85% rename from Source/UI/Dialogs/UIMinimapZoomWnd.h rename to Source/UI/Navigation/UIMinimapZoomWnd.h index 6bfdce0e6..944e222eb 100644 --- a/Source/UI/Dialogs/UIMinimapZoomWnd.h +++ b/Source/UI/Navigation/UIMinimapZoomWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIMINIMAPZOOMWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIMINIMAPZOOMWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UIMINIMAPZOOMWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UIMINIMAPZOOMWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UINavigationHelpWnd.cpp b/Source/UI/Navigation/UINavigationHelpWnd.cpp similarity index 99% rename from Source/UI/Window/UINavigationHelpWnd.cpp rename to Source/UI/Navigation/UINavigationHelpWnd.cpp index 1185cbdf5..1a6e5fef0 100644 --- a/Source/UI/Window/UINavigationHelpWnd.cpp +++ b/Source/UI/Navigation/UINavigationHelpWnd.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "UI/Window/UINavigationHelpWnd.h" +#include "UI/Navigation/UINavigationHelpWnd.h" #include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Window/UINavigationHelpWnd.h b/Source/UI/Navigation/UINavigationHelpWnd.h similarity index 77% rename from Source/UI/Window/UINavigationHelpWnd.h rename to Source/UI/Navigation/UINavigationHelpWnd.h index eb950c389..c98df21b3 100644 --- a/Source/UI/Window/UINavigationHelpWnd.h +++ b/Source/UI/Navigation/UINavigationHelpWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINAVIGATIONHELPWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINAVIGATIONHELPWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UINAVIGATIONHELPWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UINAVIGATIONHELPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Navigation/UINavigationWnd.cpp similarity index 99% rename from Source/UI/Window/UINavigationWnd.cpp rename to Source/UI/Navigation/UINavigationWnd.cpp index c2b7966ca..91d742211 100644 --- a/Source/UI/Window/UINavigationWnd.cpp +++ b/Source/UI/Navigation/UINavigationWnd.cpp @@ -1,10 +1,10 @@ -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Client/Application/Launcher.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Navigation/NavigationManager.h" #include "File/FileEnumeration.h" @@ -19,10 +19,10 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Lists/UIComboBox.h" #include "UI/Lists/UIComboBoxDefWnd.h" -#include "UI/Lists/UIListBoxNavi.h" +#include "UI/Navigation/UIListBoxNavi.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "UI/Window/UIResizer.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UINavigationWnd.h b/Source/UI/Navigation/UINavigationWnd.h similarity index 94% rename from Source/UI/Window/UINavigationWnd.h rename to Source/UI/Navigation/UINavigationWnd.h index 5a593b3a0..9f9d60916 100644 --- a/Source/UI/Window/UINavigationWnd.h +++ b/Source/UI/Navigation/UINavigationWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINAVIGATIONWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINAVIGATIONWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UINAVIGATIONWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UINAVIGATIONWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Navigation/UIRoMapWnd.cpp similarity index 99% rename from Source/UI/Window/UIRoMapWnd.cpp rename to Source/UI/Navigation/UIRoMapWnd.cpp index 42f1f9ba5..ebd9be03f 100644 --- a/Source/UI/Window/UIRoMapWnd.cpp +++ b/Source/UI/Navigation/UIRoMapWnd.cpp @@ -1,29 +1,29 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/WindowId.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include "UI/Window/UIEnums.h" #include "Script/LuaScript.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Map/MapSkyMgr.h" #include "Contents/Navigation/NavigationManager.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" -#include "Render/ScreenGeometry.h" -#include "Render/ScreenRectangle.h" +#include "Render/Projection/ScreenGeometry.h" +#include "Render/Projection/ScreenRectangle.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" #include "UI/Text/ColoredText.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "UI/Window/WindowManagerWindows.h" #include "Contents/Messenger/ClientMessenger.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" diff --git a/Source/UI/Window/UIRoMapWnd.h b/Source/UI/Navigation/UIRoMapWnd.h similarity index 97% rename from Source/UI/Window/UIRoMapWnd.h rename to Source/UI/Navigation/UIRoMapWnd.h index a6c5e17fc..614e09dab 100644 --- a/Source/UI/Window/UIRoMapWnd.h +++ b/Source/UI/Navigation/UIRoMapWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIROMAPWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIROMAPWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UIROMAPWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UIROMAPWND_H #include "Contents/Map/FlyingShipRouteInfo.h" #include "Contents/World/WorldViewData.h" diff --git a/Source/UI/Lists/UIScrollBarNavi.cpp b/Source/UI/Navigation/UIScrollBarNavi.cpp similarity index 96% rename from Source/UI/Lists/UIScrollBarNavi.cpp rename to Source/UI/Navigation/UIScrollBarNavi.cpp index 686d77c19..1bf5156d7 100644 --- a/Source/UI/Lists/UIScrollBarNavi.cpp +++ b/Source/UI/Navigation/UIScrollBarNavi.cpp @@ -1,8 +1,8 @@ #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" -#include "UI/Lists/UIScrollBarNavi.h" +#include "Resource/Bitmap/TextureNames.h" +#include "UI/Navigation/UIScrollBarNavi.h" // OFFSET: 0x0086E6E0 // FUNCTION: fn_11075 diff --git a/Source/UI/Lists/UIScrollBarNavi.h b/Source/UI/Navigation/UIScrollBarNavi.h similarity index 72% rename from Source/UI/Lists/UIScrollBarNavi.h rename to Source/UI/Navigation/UIScrollBarNavi.h index a4be51caa..7625a077d 100644 --- a/Source/UI/Lists/UIScrollBarNavi.h +++ b/Source/UI/Navigation/UIScrollBarNavi.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_LISTS_UISCROLLBARNAVI_H -#define RAGNAROK_SOURCE_UI_LISTS_UISCROLLBARNAVI_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UISCROLLBARNAVI_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UISCROLLBARNAVI_H #include "UI/Lists/UIScrollBar.h" diff --git a/Source/UI/Window/UIShowWarpWnd.cpp b/Source/UI/Navigation/UIShowWarpWnd.cpp similarity index 96% rename from Source/UI/Window/UIShowWarpWnd.cpp rename to Source/UI/Navigation/UIShowWarpWnd.cpp index 0d6323e51..64b71f197 100644 --- a/Source/UI/Window/UIShowWarpWnd.cpp +++ b/Source/UI/Navigation/UIShowWarpWnd.cpp @@ -1,9 +1,9 @@ -#include "UI/Window/UIShowWarpWnd.h" +#include "UI/Navigation/UIShowWarpWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "UI/Buttons/UIBitmapButton.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "UI/Lists/UIListBox.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/UIShowWarpWnd.h b/Source/UI/Navigation/UIShowWarpWnd.h similarity index 78% rename from Source/UI/Window/UIShowWarpWnd.h rename to Source/UI/Navigation/UIShowWarpWnd.h index 3aa2f6189..31b5d8889 100644 --- a/Source/UI/Window/UIShowWarpWnd.h +++ b/Source/UI/Navigation/UIShowWarpWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISHOWWARPWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISHOWWARPWND_H +#ifndef RAGNAROK_SOURCE_UI_NAVIGATION_UISHOWWARPWND_H +#define RAGNAROK_SOURCE_UI_NAVIGATION_UISHOWWARPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/MiniPartyGrid.cpp b/Source/UI/Party/MiniPartyGrid.cpp similarity index 98% rename from Source/UI/MiniPartyGrid.cpp rename to Source/UI/Party/MiniPartyGrid.cpp index da54850bc..cc22e8791 100644 --- a/Source/UI/MiniPartyGrid.cpp +++ b/Source/UI/Party/MiniPartyGrid.cpp @@ -1,4 +1,4 @@ -#include "UI/MiniPartyGrid.h" +#include "UI/Party/MiniPartyGrid.h" #include diff --git a/Source/UI/MiniPartyGrid.h b/Source/UI/Party/MiniPartyGrid.h similarity index 92% rename from Source/UI/MiniPartyGrid.h rename to Source/UI/Party/MiniPartyGrid.h index b1d0a6b93..c0e64b9da 100644 --- a/Source/UI/MiniPartyGrid.h +++ b/Source/UI/Party/MiniPartyGrid.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_MINIPARTYGRID_H -#define RAGNAROK_SOURCE_UI_MINIPARTYGRID_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_MINIPARTYGRID_H +#define RAGNAROK_SOURCE_UI_PARTY_MINIPARTYGRID_H #include #include diff --git a/Source/UI/MiniPartyManager.cpp b/Source/UI/Party/MiniPartyManager.cpp similarity index 96% rename from Source/UI/MiniPartyManager.cpp rename to Source/UI/Party/MiniPartyManager.cpp index 2abb7bb38..97acc86b1 100644 --- a/Source/UI/MiniPartyManager.cpp +++ b/Source/UI/Party/MiniPartyManager.cpp @@ -1,12 +1,12 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Messenger/MessengerMember.h" -#include "UI/MiniPartyGrid.h" -#include "UI/MiniPartyPlacement.h" +#include "UI/Party/MiniPartyGrid.h" +#include "UI/Party/MiniPartyPlacement.h" #include "UI/Party/UIMiniPartyWnd.h" -#include "UI/Window/MiniPartyWndAreaMgr.h" +#include "UI/Party/MiniPartyWndAreaMgr.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIWindow.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/MiniPartyPlacement.cpp b/Source/UI/Party/MiniPartyPlacement.cpp similarity index 94% rename from Source/UI/MiniPartyPlacement.cpp rename to Source/UI/Party/MiniPartyPlacement.cpp index e9fcfbfe6..c7c0a513a 100644 --- a/Source/UI/MiniPartyPlacement.cpp +++ b/Source/UI/Party/MiniPartyPlacement.cpp @@ -1,6 +1,6 @@ -#include "UI/MiniPartyPlacement.h" -#include "UI/MiniPartyGrid.h" -#include "UI/Window/MiniPartyWndAreaMgr.h" +#include "UI/Party/MiniPartyPlacement.h" +#include "UI/Party/MiniPartyGrid.h" +#include "UI/Party/MiniPartyWndAreaMgr.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/MiniPartyPlacement.h b/Source/UI/Party/MiniPartyPlacement.h similarity index 84% rename from Source/UI/MiniPartyPlacement.h rename to Source/UI/Party/MiniPartyPlacement.h index 43fcb90e9..59d79447d 100644 --- a/Source/UI/MiniPartyPlacement.h +++ b/Source/UI/Party/MiniPartyPlacement.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_MINIPARTYPLACEMENT_H -#define RAGNAROK_SOURCE_UI_MINIPARTYPLACEMENT_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_MINIPARTYPLACEMENT_H +#define RAGNAROK_SOURCE_UI_PARTY_MINIPARTYPLACEMENT_H #include #include diff --git a/Source/UI/MiniPartyUsableArea.cpp b/Source/UI/Party/MiniPartyUsableArea.cpp similarity index 93% rename from Source/UI/MiniPartyUsableArea.cpp rename to Source/UI/Party/MiniPartyUsableArea.cpp index 989e6b6ed..82667b3ab 100644 --- a/Source/UI/MiniPartyUsableArea.cpp +++ b/Source/UI/Party/MiniPartyUsableArea.cpp @@ -1,5 +1,5 @@ #include "UI/Window/WindowId.h" -#include "UI/MiniPartyGrid.h" +#include "UI/Party/MiniPartyGrid.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/MiniPartyWndAreaMgr.h b/Source/UI/Party/MiniPartyWndAreaMgr.h similarity index 86% rename from Source/UI/Window/MiniPartyWndAreaMgr.h rename to Source/UI/Party/MiniPartyWndAreaMgr.h index 24265ebe6..b54639943 100644 --- a/Source/UI/Window/MiniPartyWndAreaMgr.h +++ b/Source/UI/Party/MiniPartyWndAreaMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_MINIPARTYWNDAREAMGR_H -#define RAGNAROK_SOURCE_UI_WINDOW_MINIPARTYWNDAREAMGR_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_MINIPARTYWNDAREAMGR_H +#define RAGNAROK_SOURCE_UI_PARTY_MINIPARTYWNDAREAMGR_H #include #include diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index 65c23bc10..b55659c14 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -5,11 +5,11 @@ #include "Client/Input/Language.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/UserData/NormalItemSlots.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/InputFocus.h" #include "UI/Party/UIAdvenPartyBoardWnd.h" #include "UI/Party/UIApplyForPartyWnd.h" @@ -17,7 +17,7 @@ #include "UI/Buttons/UIBmpTextButton.h" #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/Buttons/UIJobSlotButton.h" +#include "UI/Party/UIJobSlotButton.h" #include "UI/Party/UIPartyInfoWnd.h" #include "UI/Party/UIRegisterPartyWnd.h" #include "UI/Text/UIStaticText.h" diff --git a/Source/UI/Party/UIApplyForPartyWnd.cpp b/Source/UI/Party/UIApplyForPartyWnd.cpp index a9ad29c17..c89ef4e7d 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.cpp +++ b/Source/UI/Party/UIApplyForPartyWnd.cpp @@ -1,10 +1,10 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "File/ShortcutFilename.h" #include "Render/Renderer.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Contents/Tables/MessageTable.h" #include "UI/Window/UIWindowMgr.h" #include "Contents/Party/AdventurerAgencyMgr.h" @@ -12,7 +12,7 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Text/TextFitting.h" #include "UI/Text/TextWrapping.h" #include "UI/Party/UIApplyForPartyWnd.h" diff --git a/Source/UI/Buttons/UIJobSlotButton.cpp b/Source/UI/Party/UIJobSlotButton.cpp similarity index 95% rename from Source/UI/Buttons/UIJobSlotButton.cpp rename to Source/UI/Party/UIJobSlotButton.cpp index 6da8cf0ad..128e377a1 100644 --- a/Source/UI/Buttons/UIJobSlotButton.cpp +++ b/Source/UI/Party/UIJobSlotButton.cpp @@ -1,4 +1,4 @@ -#include "UI/Buttons/UIJobSlotButton.h" +#include "UI/Party/UIJobSlotButton.h" // OFFSET: 0x007BAD70 // FUNCTION: fn_09276 diff --git a/Source/UI/Buttons/UIJobSlotButton.h b/Source/UI/Party/UIJobSlotButton.h similarity index 81% rename from Source/UI/Buttons/UIJobSlotButton.h rename to Source/UI/Party/UIJobSlotButton.h index 4af03f16d..f3c9d2768 100644 --- a/Source/UI/Buttons/UIJobSlotButton.h +++ b/Source/UI/Party/UIJobSlotButton.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIJOBSLOTBUTTON_H -#define RAGNAROK_SOURCE_UI_BUTTONS_UIJOBSLOTBUTTON_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_UIJOBSLOTBUTTON_H +#define RAGNAROK_SOURCE_UI_PARTY_UIJOBSLOTBUTTON_H #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Party/UIMiniPartyWnd.cpp b/Source/UI/Party/UIMiniPartyWnd.cpp index 43f290610..d37f2e158 100644 --- a/Source/UI/Party/UIMiniPartyWnd.cpp +++ b/Source/UI/Party/UIMiniPartyWnd.cpp @@ -13,15 +13,15 @@ #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "UI/Buttons/UITextButton.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Gauges/UIPcGage.h" -#include "UI/MiniPartyGrid.h" +#include "UI/Party/MiniPartyGrid.h" #include "UI/Layout/SnapMgr.h" -#include "UI/Window/MiniPartyWndAreaMgr.h" +#include "UI/Party/MiniPartyWndAreaMgr.h" #include "UI/Window/UIWindowMgr.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.cpp b/Source/UI/Party/UIPartyBookingHelpWnd.cpp similarity index 95% rename from Source/UI/Window/UIPartyBookingHelpWnd.cpp rename to Source/UI/Party/UIPartyBookingHelpWnd.cpp index b22a8c573..516bf5f1a 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.cpp +++ b/Source/UI/Party/UIPartyBookingHelpWnd.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "UI/Window/UIPartyBookingHelpWnd.h" -#include "Client/Session.h" +#include "UI/Party/UIPartyBookingHelpWnd.h" +#include "Client/Session/Session.h" #include "Client/Input/InputCharset.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.h b/Source/UI/Party/UIPartyBookingHelpWnd.h similarity index 78% rename from Source/UI/Window/UIPartyBookingHelpWnd.h rename to Source/UI/Party/UIPartyBookingHelpWnd.h index 24b31af08..8d15d60d6 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.h +++ b/Source/UI/Party/UIPartyBookingHelpWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIPARTYBOOKINGHELPWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIPARTYBOOKINGHELPWND_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_UIPARTYBOOKINGHELPWND_H +#define RAGNAROK_SOURCE_UI_PARTY_UIPARTYBOOKINGHELPWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Party/UIPartyInfoWnd.cpp b/Source/UI/Party/UIPartyInfoWnd.cpp index 3d7d52faf..403250062 100644 --- a/Source/UI/Party/UIPartyInfoWnd.cpp +++ b/Source/UI/Party/UIPartyInfoWnd.cpp @@ -1,11 +1,11 @@ #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "File/ShortcutFilename.h" #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Text/TextFitting.h" #include "UI/Party/UIPartyInfoWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index e373e6096..438921470 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -3,9 +3,9 @@ #include "UI/Window/UIEnums.h" #include "Client/Input/InputCharset.h" #include "Contents/Tables/MessageTable.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Contents/Party/AdventurerAgencyMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/ForbiddenWords.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Text/TextContext.h" @@ -18,7 +18,7 @@ #include "UI/Buttons/UIBitmapButton.h" #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Edit/UIEditCtrl.h" -#include "UI/Buttons/UIJobSlotButton.h" +#include "UI/Party/UIJobSlotButton.h" #include "UI/Party/UIRegisterPartyWnd.h" #include "UI/Text/UIStaticText.h" #include "Render/Renderer.h" diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp index 30a228f97..8dca0815f 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp +++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp @@ -4,12 +4,12 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Tables/MessageTable.h" #include "Client/Mode/ModeEvents.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Text/TextWrapping.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" @@ -18,7 +18,7 @@ #include "UI/Party/UIRequestJoinPartyWnd.h" #include "UI/Text/UIStaticText.h" #include "UI/Text/UITextViewer.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Party/UISeekPartyListWnd.cpp similarity index 99% rename from Source/UI/Window/UISeekPartyListWnd.cpp rename to Source/UI/Party/UISeekPartyListWnd.cpp index 2cebde1db..bae96c306 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Party/UISeekPartyListWnd.cpp @@ -1,7 +1,7 @@ -#include "UI/Window/UISeekPartyListWnd.h" +#include "UI/Party/UISeekPartyListWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Party/PartyBookingMgr.h" #include "Contents/Sound/SoundMgr.h" @@ -17,7 +17,7 @@ #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/UISeekPartyWnd.h" +#include "UI/Party/UISeekPartyWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UISeekPartyListWnd.h b/Source/UI/Party/UISeekPartyListWnd.h similarity index 96% rename from Source/UI/Window/UISeekPartyListWnd.h rename to Source/UI/Party/UISeekPartyListWnd.h index 3f8bc281e..8ea692665 100644 --- a/Source/UI/Window/UISeekPartyListWnd.h +++ b/Source/UI/Party/UISeekPartyListWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISEEKPARTYLISTWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISEEKPARTYLISTWND_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_UISEEKPARTYLISTWND_H +#define RAGNAROK_SOURCE_UI_PARTY_UISEEKPARTYLISTWND_H #include "Contents/Party/PartyBookingInfo.h" #include "Contents/Party/PartyBookingMgr.h" diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Party/UISeekPartyMBWnd.cpp similarity index 99% rename from Source/UI/Window/UISeekPartyMBWnd.cpp rename to Source/UI/Party/UISeekPartyMBWnd.cpp index 8078e730a..ad77c6cb9 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.cpp +++ b/Source/UI/Party/UISeekPartyMBWnd.cpp @@ -1,7 +1,7 @@ -#include "UI/Window/UISeekPartyMBWnd.h" +#include "UI/Party/UISeekPartyMBWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" @@ -13,7 +13,7 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/UISeekPartyWnd.h" +#include "UI/Party/UISeekPartyWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UISeekPartyMBWnd.h b/Source/UI/Party/UISeekPartyMBWnd.h similarity index 94% rename from Source/UI/Window/UISeekPartyMBWnd.h rename to Source/UI/Party/UISeekPartyMBWnd.h index c309f83af..9fc23ff8b 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.h +++ b/Source/UI/Party/UISeekPartyMBWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISEEKPARTYMBWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISEEKPARTYMBWND_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_UISEEKPARTYMBWND_H +#define RAGNAROK_SOURCE_UI_PARTY_UISEEKPARTYMBWND_H #include "Contents/Party/PartyBookingInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UISeekPartyWnd.cpp b/Source/UI/Party/UISeekPartyWnd.cpp similarity index 96% rename from Source/UI/Window/UISeekPartyWnd.cpp rename to Source/UI/Party/UISeekPartyWnd.cpp index 9eb997a3e..5648c31fa 100644 --- a/Source/UI/Window/UISeekPartyWnd.cpp +++ b/Source/UI/Party/UISeekPartyWnd.cpp @@ -1,10 +1,10 @@ -#include "UI/Window/UISeekPartyWnd.h" +#include "UI/Party/UISeekPartyWnd.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/UIJobListWnd.h" +#include "UI/Status/UIJobListWnd.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/UI/Window/UISeekPartyWnd.h b/Source/UI/Party/UISeekPartyWnd.h similarity index 91% rename from Source/UI/Window/UISeekPartyWnd.h rename to Source/UI/Party/UISeekPartyWnd.h index d07c351ea..28cfafef2 100644 --- a/Source/UI/Window/UISeekPartyWnd.h +++ b/Source/UI/Party/UISeekPartyWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISEEKPARTYWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISEEKPARTYWND_H +#ifndef RAGNAROK_SOURCE_UI_PARTY_UISEEKPARTYWND_H +#define RAGNAROK_SOURCE_UI_PARTY_UISEEKPARTYWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/PriceCommission.h b/Source/UI/PriceCommission.h deleted file mode 100644 index c685dc426..000000000 --- a/Source/UI/PriceCommission.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RAGNAROK_SOURCE_UI_PRICECOMMISSION_H -#define RAGNAROK_SOURCE_UI_PRICECOMMISSION_H - -#include - -int PriceCommission(std::int64_t price); - -#endif diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.h b/Source/UI/ProbabilityTable/UIProbabilityTable.h index 5612a165d..91302ec77 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.h +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_PROBABILITYTABLE_UIPROBABILITYTABLE_H #define RAGNAROK_SOURCE_UI_PROBABILITYTABLE_UIPROBABILITYTABLE_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Text/UITextViewerControl.h" diff --git a/Source/UI/Dialogs/UINotifyQuestWnd.h b/Source/UI/Quest/UINotifyQuestWnd.h similarity index 74% rename from Source/UI/Dialogs/UINotifyQuestWnd.h rename to Source/UI/Quest/UINotifyQuestWnd.h index aa0ef87ee..e96acb999 100644 --- a/Source/UI/Dialogs/UINotifyQuestWnd.h +++ b/Source/UI/Quest/UINotifyQuestWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UINOTIFYQUESTWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UINOTIFYQUESTWND_H +#ifndef RAGNAROK_SOURCE_UI_QUEST_UINOTIFYQUESTWND_H +#define RAGNAROK_SOURCE_UI_QUEST_UINOTIFYQUESTWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Quest/UIOngoingQuestInfo.h b/Source/UI/Quest/UIOngoingQuestInfo.h index 357e37dee..c33b79634 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.h +++ b/Source/UI/Quest/UIOngoingQuestInfo.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_QUEST_UIONGOINGQUESTINFO_H #define RAGNAROK_SOURCE_UI_QUEST_UIONGOINGQUESTINFO_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Window/UIControl.h" diff --git a/Source/UI/Quest/UIQuestDisplay.cpp b/Source/UI/Quest/UIQuestDisplay.cpp index cda6f3df4..7ea94cf92 100644 --- a/Source/UI/Quest/UIQuestDisplay.cpp +++ b/Source/UI/Quest/UIQuestDisplay.cpp @@ -13,7 +13,7 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "UI/Text/ColoredText.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextMarkup.h" #include "UI/Text/UITextViewer.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.h b/Source/UI/Quest/UIRecommendedQuestInfo.h index a41ebc196..4e667b28c 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.h +++ b/Source/UI/Quest/UIRecommendedQuestInfo.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_QUEST_UIRECOMMENDEDQUESTINFO_H #define RAGNAROK_SOURCE_UI_QUEST_UIRECOMMENDEDQUESTINFO_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Text/UITextViewerControl.h" #include "UI/Window/UIControl.h" diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index 11051a6fd..e4fc296a2 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -2,8 +2,8 @@ #include "UI/Window/UIEnums.h" #include "UI/Quest/UIRenewQuestUI.h" #include "UI/Window/UIEnums.h" -#include "Utility/EncryptedName.h" -#include "Client/Replay.h" +#include "Utility/Cipher/EncryptedName.h" +#include "Client/Replay/Replay.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Quest/RenewQuestMgr.h" #include "Network/Connection/Connection.h" @@ -11,7 +11,7 @@ #include "Network/TextEncoding.h" #include "Render/Renderer.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIRadioButton.h" #include "UI/Edit/UIEditBoxEx.h" #include "UI/Quest/UIOngoingQuestInfo.h" diff --git a/Source/UI/Quest/UIRenewQuestUI.h b/Source/UI/Quest/UIRenewQuestUI.h index f6e4ee214..22caf434f 100644 --- a/Source/UI/Quest/UIRenewQuestUI.h +++ b/Source/UI/Quest/UIRenewQuestUI.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_QUEST_UIRENEWQUESTUI_H #define RAGNAROK_SOURCE_UI_QUEST_UIRENEWQUESTUI_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Window/UIControl.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index e9ef2b243..e39b50399 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -6,7 +6,7 @@ #include "UI/Quest/UIRenewQuestWnd.h" #include "Client/Application/ApplicationWindow.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Tables/MessageTable.h" @@ -25,14 +25,14 @@ #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Text/UIStaticText.h" #include "UI/Text/UITagTextViewer.h" -#include "UI/UIStaticBitmap.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Buttons/UIStaticBitmap.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UITab.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Quest/UIRenewQuestWnd.h b/Source/UI/Quest/UIRenewQuestWnd.h index da06533f3..a28b09a1c 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.h +++ b/Source/UI/Quest/UIRenewQuestWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_QUEST_UIRENEWQUESTWND_H #include "UI/Lists/UIScrollBar.h" -#include "UI/UIScrollWnd.h" +#include "UI/Lists/UIScrollWnd.h" #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/Buttons/UIReplayButton.h b/Source/UI/Replay/UIReplayButton.h similarity index 61% rename from Source/UI/Buttons/UIReplayButton.h rename to Source/UI/Replay/UIReplayButton.h index 94749028d..f1779c186 100644 --- a/Source/UI/Buttons/UIReplayButton.h +++ b/Source/UI/Replay/UIReplayButton.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_BUTTONS_UIREPLAYBUTTON_H -#define RAGNAROK_SOURCE_UI_BUTTONS_UIREPLAYBUTTON_H +#ifndef RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYBUTTON_H +#define RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYBUTTON_H #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Window/UIReplayControlWnd.h b/Source/UI/Replay/UIReplayControlWnd.h similarity index 82% rename from Source/UI/Window/UIReplayControlWnd.h rename to Source/UI/Replay/UIReplayControlWnd.h index f2d4ca374..1ff0c2eaa 100644 --- a/Source/UI/Window/UIReplayControlWnd.h +++ b/Source/UI/Replay/UIReplayControlWnd.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIREPLAYCONTROLWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIREPLAYCONTROLWND_H +#ifndef RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYCONTROLWND_H +#define RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYCONTROLWND_H -#include "UI/Buttons/UIReplayButton.h" +#include "UI/Replay/UIReplayButton.h" #include "UI/Window/UIFrameWnd.h" class UIBarGraph4; diff --git a/Source/UI/Lists/UIReplayListBox.h b/Source/UI/Replay/UIReplayListBox.h similarity index 64% rename from Source/UI/Lists/UIReplayListBox.h rename to Source/UI/Replay/UIReplayListBox.h index 796bac4e5..8e98190fa 100644 --- a/Source/UI/Lists/UIReplayListBox.h +++ b/Source/UI/Replay/UIReplayListBox.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_LISTS_UIREPLAYLISTBOX_H -#define RAGNAROK_SOURCE_UI_LISTS_UIREPLAYLISTBOX_H +#ifndef RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYLISTBOX_H +#define RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYLISTBOX_H #include "UI/Lists/UIListBox.h" diff --git a/Source/UI/Window/UIReplayRECControlWnd.h b/Source/UI/Replay/UIReplayRECControlWnd.h similarity index 94% rename from Source/UI/Window/UIReplayRECControlWnd.h rename to Source/UI/Replay/UIReplayRECControlWnd.h index 2a7918753..737baa135 100644 --- a/Source/UI/Window/UIReplayRECControlWnd.h +++ b/Source/UI/Replay/UIReplayRECControlWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIREPLAYRECCONTROLWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIREPLAYRECCONTROLWND_H +#ifndef RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYRECCONTROLWND_H +#define RAGNAROK_SOURCE_UI_REPLAY_UIREPLAYRECCONTROLWND_H #include "Contents/UserData/NormalItemSlots.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UISelectReplayDataWnd.h b/Source/UI/Replay/UISelectReplayDataWnd.h similarity index 83% rename from Source/UI/Window/UISelectReplayDataWnd.h rename to Source/UI/Replay/UISelectReplayDataWnd.h index 4435c659e..14f2ae270 100644 --- a/Source/UI/Window/UISelectReplayDataWnd.h +++ b/Source/UI/Replay/UISelectReplayDataWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISELECTREPLAYDATAWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISELECTREPLAYDATAWND_H +#ifndef RAGNAROK_SOURCE_UI_REPLAY_UISELECTREPLAYDATAWND_H +#define RAGNAROK_SOURCE_UI_REPLAY_UISELECTREPLAYDATAWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIReputeWnd.cpp b/Source/UI/Repute/UIReputeWnd.cpp similarity index 99% rename from Source/UI/UIReputeWnd.cpp rename to Source/UI/Repute/UIReputeWnd.cpp index 46c881643..333b46b92 100644 --- a/Source/UI/UIReputeWnd.cpp +++ b/Source/UI/Repute/UIReputeWnd.cpp @@ -2,12 +2,12 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/UIReputeWnd.h" +#include "UI/Repute/UIReputeWnd.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Repute/ReputeMgr.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Edit/UIEditCtrl.h" @@ -15,7 +15,7 @@ #include "UI/Lists/UIComboBoxEx.h" #include "UI/Window/WindowBorder.h" #include "UI/Window/WindowManagerWindows.h" -#include "Utility/JsonCppLoader.h" +#include "Resource/Json/JsonCppLoader.h" #include "Utility/Text/FormatString.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/UIReputeWnd.h b/Source/UI/Repute/UIReputeWnd.h similarity index 90% rename from Source/UI/UIReputeWnd.h rename to Source/UI/Repute/UIReputeWnd.h index ba7ee7890..97f26e41a 100644 --- a/Source/UI/UIReputeWnd.h +++ b/Source/UI/Repute/UIReputeWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIREPUTEWND_H -#define RAGNAROK_SOURCE_UI_UIREPUTEWND_H +#ifndef RAGNAROK_SOURCE_UI_REPUTE_UIREPUTEWND_H +#define RAGNAROK_SOURCE_UI_REPUTE_UIREPUTEWND_H #include "UI/Window/UIFrameWnd.h" #include "Contents/Repute/ReputeMgr.h" diff --git a/Source/UI/Window/UIOpenMailBoxWnd.cpp b/Source/UI/Rodex/UIOpenMailBoxWnd.cpp similarity index 98% rename from Source/UI/Window/UIOpenMailBoxWnd.cpp rename to Source/UI/Rodex/UIOpenMailBoxWnd.cpp index beb1c6ae5..e4d9cacac 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.cpp +++ b/Source/UI/Rodex/UIOpenMailBoxWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIOpenMailBoxWnd.h" +#include "UI/Rodex/UIOpenMailBoxWnd.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Window/UIOpenMailBoxWnd.h b/Source/UI/Rodex/UIOpenMailBoxWnd.h similarity index 76% rename from Source/UI/Window/UIOpenMailBoxWnd.h rename to Source/UI/Rodex/UIOpenMailBoxWnd.h index 07ba93ed3..c4f86ba45 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.h +++ b/Source/UI/Rodex/UIOpenMailBoxWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIOPENMAILBOXWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIOPENMAILBOXWND_H +#ifndef RAGNAROK_SOURCE_UI_RODEX_UIOPENMAILBOXWND_H +#define RAGNAROK_SOURCE_UI_RODEX_UIOPENMAILBOXWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Rodex/UIRodexComposeWnd.cpp b/Source/UI/Rodex/UIRodexComposeWnd.cpp index f0f592d11..dd2e38eb2 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.cpp +++ b/Source/UI/Rodex/UIRodexComposeWnd.cpp @@ -9,7 +9,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "File/ShortcutFilename.h" #include "UI/Buttons/UIBmpTextButton.h" #include "UI/Edit/UIItemTagCtrl.h" @@ -18,7 +18,7 @@ #include "Contents/Items/ItemDescription.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Edit/UIEditCtrl_Currency.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" @@ -29,7 +29,7 @@ #include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Window/WindowBorder.h" #include "Utility/Text/GroupedInteger.h" @@ -37,7 +37,7 @@ #include "UI/Window/InputFocus.h" #include "Contents/Skin/SkinMgr.h" #include "Contents/Map/MapSkyMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Resource/MSGSTRINGID.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Rodex/UIRodexContentsWnd.cpp similarity index 98% rename from Source/UI/Window/UIRodexContentsWnd.cpp rename to Source/UI/Rodex/UIRodexContentsWnd.cpp index 711b00b1f..ce58398b8 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Rodex/UIRodexContentsWnd.cpp @@ -3,13 +3,13 @@ #include "Render/Text/FontCache.h" #include "UI/Window/UIEnums.h" #include "Render/Text/TextContext.h" -#include "UI/Window/UIRodexContentsWnd.h" +#include "UI/Rodex/UIRodexContentsWnd.h" #include "Client/Mode/CMode.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" @@ -22,14 +22,14 @@ #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Rodex/UIRodexComposeWnd.h" #include "UI/Shop/ItemDrawing.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UIRodexContentsWnd.h b/Source/UI/Rodex/UIRodexContentsWnd.h similarity index 93% rename from Source/UI/Window/UIRodexContentsWnd.h rename to Source/UI/Rodex/UIRodexContentsWnd.h index 8a1f89749..7123d083e 100644 --- a/Source/UI/Window/UIRodexContentsWnd.h +++ b/Source/UI/Rodex/UIRodexContentsWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIRODEXCONTENTSWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIRODEXCONTENTSWND_H +#ifndef RAGNAROK_SOURCE_UI_RODEX_UIRODEXCONTENTSWND_H +#define RAGNAROK_SOURCE_UI_RODEX_UIRODEXCONTENTSWND_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Rodex/UIRodexInboxWnd.cpp b/Source/UI/Rodex/UIRodexInboxWnd.cpp index 5b8dc18b6..224383212 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.cpp +++ b/Source/UI/Rodex/UIRodexInboxWnd.cpp @@ -13,14 +13,14 @@ #include "UI/Window/UIWindowMgr.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIBmpRadioBtn.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Buttons/UIRadioBtn.h" #include "UI/Buttons/UITextButton.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Edit/UIEditCtrl.h" #include "Contents/Map/MapSkyMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Rodex/UIRodexInboxWnd.h b/Source/UI/Rodex/UIRodexInboxWnd.h index 356e34a7c..3ff2f019e 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.h +++ b/Source/UI/Rodex/UIRodexInboxWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_RODEX_UIRODEXINBOXWND_H #include "Contents/Rodex/RodexMailStore.h" -#include "UI/Item/UIItemWnd.h" +#include "UI/Items/UIItemWnd.h" #include #include diff --git a/Source/UI/RuneSystem/UIRuneSystemWindows.h b/Source/UI/RuneSystem/UIRuneSystemWindows.h index 9f76d8140..2eba92156 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWindows.h +++ b/Source/UI/RuneSystem/UIRuneSystemWindows.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_RUNESYSTEM_UIRUNESYSTEMWINDOWS_H #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Effects/Core/EffectLists.h" #include "Contents/Items/ItemDescription.h" diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp index 64d40c205..d63ea0583 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp @@ -5,7 +5,7 @@ #include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/RuneSystem/UIRuneSystemWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.h b/Source/UI/RuneSystem/UIRuneSystemWnd.h index 7de61f8c6..bc82b7be7 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.h +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_RUNESYSTEM_UIRUNESYSTEMWND_H #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Effects/Core/EffectLists.h" #include "Contents/Items/ItemDescription.h" diff --git a/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h b/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h index 00057a7d4..3ca9c60c3 100644 --- a/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h +++ b/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SELECTPACKAGEITEMBOX_SELECTPACKAGEITEMBOX_H #include "Contents/Items/ItemInfo.h" -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include diff --git a/Source/UI/Lists/UIPackageBoxNameList.cpp b/Source/UI/SelectPackageItemBox/UIPackageBoxNameList.cpp similarity index 65% rename from Source/UI/Lists/UIPackageBoxNameList.cpp rename to Source/UI/SelectPackageItemBox/UIPackageBoxNameList.cpp index 7400c825b..b23082d9d 100644 --- a/Source/UI/Lists/UIPackageBoxNameList.cpp +++ b/Source/UI/SelectPackageItemBox/UIPackageBoxNameList.cpp @@ -1,4 +1,4 @@ -#include "UI/Lists/UIPackageBoxNameList.h" +#include "UI/SelectPackageItemBox/UIPackageBoxNameList.h" // OFFSET: 0x0086E0C0 // FUNCTION: fn_11064 diff --git a/Source/UI/Lists/UIPackageBoxNameList.h b/Source/UI/SelectPackageItemBox/UIPackageBoxNameList.h similarity index 54% rename from Source/UI/Lists/UIPackageBoxNameList.h rename to Source/UI/SelectPackageItemBox/UIPackageBoxNameList.h index ce55f5b69..2f61a146a 100644 --- a/Source/UI/Lists/UIPackageBoxNameList.h +++ b/Source/UI/SelectPackageItemBox/UIPackageBoxNameList.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_LISTS_UIPACKAGEBOXNAMELIST_H -#define RAGNAROK_SOURCE_UI_LISTS_UIPACKAGEBOXNAMELIST_H +#ifndef RAGNAROK_SOURCE_UI_SELECTPACKAGEITEMBOX_UIPACKAGEBOXNAMELIST_H +#define RAGNAROK_SOURCE_UI_SELECTPACKAGEITEMBOX_UIPACKAGEBOXNAMELIST_H #include "UI/Lists/UIListBox.h" diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index 906adacc7..eef7e562f 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -3,7 +3,7 @@ #include "UI/Window/WindowId.h" #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" diff --git a/Source/UI/Shop/ItemDrawing.cpp b/Source/UI/Shop/ItemDrawing.cpp index f0bda67e7..5726e66df 100644 --- a/Source/UI/Shop/ItemDrawing.cpp +++ b/Source/UI/Shop/ItemDrawing.cpp @@ -1,9 +1,9 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Shop/MerchantShopRefresh.cpp b/Source/UI/Shop/MerchantShopRefresh.cpp index 8a9892b8a..f253bf6f5 100644 --- a/Source/UI/Shop/MerchantShopRefresh.cpp +++ b/Source/UI/Shop/MerchantShopRefresh.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Store/MCStoreInfoBackup.h" #include "UI/Shop/PriceColor.h" #include "UI/Shop/UIMerchantShopMakeWnd.h" diff --git a/Source/UI/PriceCommission.cpp b/Source/UI/Shop/PriceCommission.cpp similarity index 100% rename from Source/UI/PriceCommission.cpp rename to Source/UI/Shop/PriceCommission.cpp diff --git a/Source/UI/Shop/PriceCommission.h b/Source/UI/Shop/PriceCommission.h new file mode 100644 index 000000000..af0f1b8f0 --- /dev/null +++ b/Source/UI/Shop/PriceCommission.h @@ -0,0 +1,8 @@ +#ifndef RAGNAROK_SOURCE_UI_SHOP_PRICECOMMISSION_H +#define RAGNAROK_SOURCE_UI_SHOP_PRICECOMMISSION_H + +#include + +int PriceCommission(std::int64_t price); + +#endif diff --git a/Source/UI/Window/UIBank_NewWnd.h b/Source/UI/Shop/UIBank_NewWnd.h similarity index 85% rename from Source/UI/Window/UIBank_NewWnd.h rename to Source/UI/Shop/UIBank_NewWnd.h index 8a16b9c16..42ebbeb86 100644 --- a/Source/UI/Window/UIBank_NewWnd.h +++ b/Source/UI/Shop/UIBank_NewWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIBANK_NEWWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIBANK_NEWWND_H +#ifndef RAGNAROK_SOURCE_UI_SHOP_UIBANK_NEWWND_H +#define RAGNAROK_SOURCE_UI_SHOP_UIBANK_NEWWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/UIBartermarketWnd.cpp b/Source/UI/Shop/UIBartermarketWnd.cpp similarity index 99% rename from Source/UI/UIBartermarketWnd.cpp rename to Source/UI/Shop/UIBartermarketWnd.cpp index ab8da87b5..809b277b1 100644 --- a/Source/UI/UIBartermarketWnd.cpp +++ b/Source/UI/Shop/UIBartermarketWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/UIBartermarketWnd.h" +#include "UI/Shop/UIBartermarketWnd.h" #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" @@ -8,7 +8,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Tables/MessageTable.h" @@ -16,8 +16,8 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Text/ColoredText.h" #include "UI/Window/UIResizer.h" diff --git a/Source/UI/UIBartermarketWnd.h b/Source/UI/Shop/UIBartermarketWnd.h similarity index 96% rename from Source/UI/UIBartermarketWnd.h rename to Source/UI/Shop/UIBartermarketWnd.h index c80d14075..90f48b679 100644 --- a/Source/UI/UIBartermarketWnd.h +++ b/Source/UI/Shop/UIBartermarketWnd.h @@ -1,10 +1,10 @@ -#ifndef RAGNAROK_SOURCE_UI_UIBARTERMARKETWND_H -#define RAGNAROK_SOURCE_UI_UIBARTERMARKETWND_H +#ifndef RAGNAROK_SOURCE_UI_SHOP_UIBARTERMARKETWND_H +#define RAGNAROK_SOURCE_UI_SHOP_UIBARTERMARKETWND_H #include "Contents/Items/BarterMarketItemMgr.h" #include "UI/Buttons/UIBitmapButton.h" -#include "UI/Item/UIItemPurchaseWnd.h" -#include "UI/Item/UIItemShopWnd.h" +#include "UI/Items/UIItemPurchaseWnd.h" +#include "UI/Items/UIItemShopWnd.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Shop/UIMerchantItemMyShopWnd.h b/Source/UI/Shop/UIMerchantItemMyShopWnd.h index 684469af3..fccbe2d9c 100644 --- a/Source/UI/Shop/UIMerchantItemMyShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemMyShopWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SHOP_UIMERCHANTITEMMYSHOPWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Shop/UIMerchantItemPurchaseWnd.h b/Source/UI/Shop/UIMerchantItemPurchaseWnd.h index c150b42c5..7188af09d 100644 --- a/Source/UI/Shop/UIMerchantItemPurchaseWnd.h +++ b/Source/UI/Shop/UIMerchantItemPurchaseWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SHOP_UIMERCHANTITEMPURCHASEWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Shop/UIMerchantItemShopWnd.h b/Source/UI/Shop/UIMerchantItemShopWnd.h index 318d35784..b51291e7f 100644 --- a/Source/UI/Shop/UIMerchantItemShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemShopWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SHOP_UIMERCHANTITEMSHOPWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Shop/UIMerchantItemWnd.h b/Source/UI/Shop/UIMerchantItemWnd.h index 5f738842b..db3b0a24e 100644 --- a/Source/UI/Shop/UIMerchantItemWnd.h +++ b/Source/UI/Shop/UIMerchantItemWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SHOP_UIMERCHANTITEMWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include diff --git a/Source/UI/Shop/UIMerchantMirrorItemWnd.h b/Source/UI/Shop/UIMerchantMirrorItemWnd.h index 9c6e948e1..29af0a7a5 100644 --- a/Source/UI/Shop/UIMerchantMirrorItemWnd.h +++ b/Source/UI/Shop/UIMerchantMirrorItemWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SHOP_UIMERCHANTMIRRORITEMWND_H #include "Contents/UserData/NormalItemSlots.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include #include diff --git a/Source/UI/Shop/UIMerchantShopTitle.cpp b/Source/UI/Shop/UIMerchantShopTitle.cpp index 4346441f4..9a387816d 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.cpp +++ b/Source/UI/Shop/UIMerchantShopTitle.cpp @@ -2,14 +2,14 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Tables/ForbiddenWords.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Shop/UIMerchantShopTitle.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "UI/Text/UIStaticText.h" diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Shop/UISerachStoreInfoWnd.cpp similarity index 99% rename from Source/UI/Window/UISerachStoreInfoWnd.cpp rename to Source/UI/Shop/UISerachStoreInfoWnd.cpp index b748fd7a3..87a2655de 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.cpp +++ b/Source/UI/Shop/UISerachStoreInfoWnd.cpp @@ -1,10 +1,10 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UISerachStoreInfoWnd.h" +#include "UI/Shop/UISerachStoreInfoWnd.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" diff --git a/Source/UI/Window/UISerachStoreInfoWnd.h b/Source/UI/Shop/UISerachStoreInfoWnd.h similarity index 90% rename from Source/UI/Window/UISerachStoreInfoWnd.h rename to Source/UI/Shop/UISerachStoreInfoWnd.h index 26a517ce1..d4955e195 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.h +++ b/Source/UI/Shop/UISerachStoreInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UISERACHSTOREINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UISERACHSTOREINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_SHOP_UISERACHSTOREINFOWND_H +#define RAGNAROK_SOURCE_UI_SHOP_UISERACHSTOREINFOWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Shop/UInCash_CallWnd.h b/Source/UI/Shop/UInCash_CallWnd.h index 9c4ffec28..09e5efd36 100644 --- a/Source/UI/Shop/UInCash_CallWnd.h +++ b/Source/UI/Shop/UInCash_CallWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_SHOP_UINCASH_CALLWND_H #include "Contents/Items/ItemInfo.h" -#include "UI/Item/UIItemBaseWnd.h" +#include "UI/Items/UIItemBaseWnd.h" #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/Shortcuts/NormalItemSlotLoad.cpp b/Source/UI/Shortcuts/NormalItemSlotLoad.cpp index 64dc877ef..6118dd51c 100644 --- a/Source/UI/Shortcuts/NormalItemSlotLoad.cpp +++ b/Source/UI/Shortcuts/NormalItemSlotLoad.cpp @@ -1,6 +1,6 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIWindowMgr.inl" diff --git a/Source/UI/Shortcuts/ShortcutActivation.cpp b/Source/UI/Shortcuts/ShortcutActivation.cpp index 35ef79c4a..6e8b08926 100644 --- a/Source/UI/Shortcuts/ShortcutActivation.cpp +++ b/Source/UI/Shortcuts/ShortcutActivation.cpp @@ -1,5 +1,5 @@ #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Skills/AutomaticSkills.h" #include "UI/Shortcuts/ShortcutActivation.h" #include "UI/Shortcuts/UIShortCutWnd.h" diff --git a/Source/UI/Shortcuts/ShortcutBindings.cpp b/Source/UI/Shortcuts/ShortcutBindings.cpp index 9b6e0a029..71cf61cd7 100644 --- a/Source/UI/Shortcuts/ShortcutBindings.cpp +++ b/Source/UI/Shortcuts/ShortcutBindings.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMessage.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Skills/SkillInfo.h" #include diff --git a/Source/UI/Shortcuts/ShortcutControls.cpp b/Source/UI/Shortcuts/ShortcutControls.cpp index 8e5137d19..1e7ec73c0 100644 --- a/Source/UI/Shortcuts/ShortcutControls.cpp +++ b/Source/UI/Shortcuts/ShortcutControls.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UIEnums.h" #include "Contents/Tables/MessageTable.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Shortcuts/UIShortCutWnd.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" diff --git a/Source/UI/Shortcuts/ShortcutCooldowns.cpp b/Source/UI/Shortcuts/ShortcutCooldowns.cpp index b927e6fc6..9c879517b 100644 --- a/Source/UI/Shortcuts/ShortcutCooldowns.cpp +++ b/Source/UI/Shortcuts/ShortcutCooldowns.cpp @@ -2,13 +2,13 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "Client/Session.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "Client/Session/Session.h" #include "Contents/UserData/NormalItemSlots.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Skills/AutomaticSkills.h" #include "Contents/Skills/ClientSkills.h" @@ -17,12 +17,12 @@ #include "UI/Shop/ItemDrawing.h" #include "UI/Shortcuts/UIQuickSlotWnd.h" #include "UI/Cooldowns/CooldownOwner.h" -#include "UI/Window/UIRebirthWnd.h" -#include "UI/Window/UISeekPartyMBWnd.h" -#include "UI/Window/UISeekPartyWnd.h" -#include "UI/Window/UISeekPartyListWnd.h" -#include "UI/Window/UIRoMapWnd.h" -#include "UI/Window/UIJobListWnd.h" +#include "UI/Status/UIRebirthWnd.h" +#include "UI/Party/UISeekPartyMBWnd.h" +#include "UI/Party/UISeekPartyWnd.h" +#include "UI/Party/UISeekPartyListWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" +#include "UI/Status/UIJobListWnd.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Window/UIWindowMgr.h" #include "Network/Connection/Connection.h" @@ -30,7 +30,7 @@ #include "Utility/Text/FormatString.h" #include "UI/Shortcuts/ShortcutCooldowns.h" #include "Client/Mode/CGameMode.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Party/PartyBookingMgr.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" @@ -42,12 +42,12 @@ #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/Texture.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "Script/LuaScript.h" -#include "UI/Window/UISelCharForUServerWnd.h" -#include "UI/Window/UISerachStoreInfoWnd.h" +#include "UI/Login/UISelCharForUServerWnd.h" +#include "UI/Shop/UISerachStoreInfoWnd.h" #include "UI/Window/WindowBorder.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Text/ColoredText.h" diff --git a/Source/UI/Shortcuts/ShortcutDetails.cpp b/Source/UI/Shortcuts/ShortcutDetails.cpp index dd1fb2822..26c589645 100644 --- a/Source/UI/Shortcuts/ShortcutDetails.cpp +++ b/Source/UI/Shortcuts/ShortcutDetails.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Shortcuts/UIShortCutWnd.h" diff --git a/Source/UI/Shortcuts/ShortcutDrop.cpp b/Source/UI/Shortcuts/ShortcutDrop.cpp index 65546eeb2..da29ad79d 100644 --- a/Source/UI/Shortcuts/ShortcutDrop.cpp +++ b/Source/UI/Shortcuts/ShortcutDrop.cpp @@ -5,11 +5,11 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeEvents.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Skills/ClientSkills.h" #include "UI/Shortcuts/UIQuickSlotWnd.h" #include "UI/Shortcuts/UIShortCutWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindow.h" #include #include diff --git a/Source/UI/Shortcuts/ShortcutPainting.cpp b/Source/UI/Shortcuts/ShortcutPainting.cpp index 98654ad44..325d45007 100644 --- a/Source/UI/Shortcuts/ShortcutPainting.cpp +++ b/Source/UI/Shortcuts/ShortcutPainting.cpp @@ -1,9 +1,9 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Shop/ItemDrawing.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Skills/PlayerSkillBundle.h" diff --git a/Source/UI/Shortcuts/ShortcutPress.cpp b/Source/UI/Shortcuts/ShortcutPress.cpp index f883e767f..a73d7b444 100644 --- a/Source/UI/Shortcuts/ShortcutPress.cpp +++ b/Source/UI/Shortcuts/ShortcutPress.cpp @@ -1,8 +1,8 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Resource/ResourceMgr.h" #include "UI/Shortcuts/UIShortCutWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Shortcuts/ShortcutTooltip.cpp b/Source/UI/Shortcuts/ShortcutTooltip.cpp index 94f7823bc..6c605154f 100644 --- a/Source/UI/Shortcuts/ShortcutTooltip.cpp +++ b/Source/UI/Shortcuts/ShortcutTooltip.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Skills/ClientSkills.h" diff --git a/Source/UI/Shortcuts/ShortcutVisibility.cpp b/Source/UI/Shortcuts/ShortcutVisibility.cpp index 79f2fe58e..b8493cdcf 100644 --- a/Source/UI/Shortcuts/ShortcutVisibility.cpp +++ b/Source/UI/Shortcuts/ShortcutVisibility.cpp @@ -1,5 +1,5 @@ #include "UI/Window/WindowId.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "UI/Window/WindowId.h" #include "Contents/Configuration/ServiceOptions.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp index 7d8095f1d..be6611cab 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp @@ -7,7 +7,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Map/MapSkyMgr.h" #include "Contents/Skills/ClientSkills.h" @@ -15,15 +15,15 @@ #include "Resource/ResourceMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "Client/Input/InputCharset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Actors/PlayerNameDictionary.h" -#include "UI/UIBasicCtrl.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Window/UIBasicCtrl.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index b47f7d75e..b263dea26 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -3,7 +3,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Input/Mouse.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeEvents.h" @@ -18,7 +18,7 @@ #include "UI/Chat/UINewChatWnd.h" #include "UI/Chat/UISubChatHisWnd.h" #include "UI/Chat/UISubChatMiniWnd.h" -#include "UI/Dialogs/UIMemorialDunWnd.h" +#include "UI/Navigation/UIMemorialDunWnd.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" @@ -28,10 +28,10 @@ #include "UI/Window/UIWindow.h" #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIWindowCallBtnWnd.h" -#include "UI/Window/UIRoMapWnd.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Buttons/UIWindowCallBtnWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "Contents/Navigation/NavigationManager.h" #include "Render/Text/FontCache.h" @@ -41,9 +41,9 @@ #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Client/Application/Launcher.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Navigation/NavigationManager.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "Utility/Text/FormatString.h" #include "UI/Text/ColoredText.h" #include "UI/Text/PixelTextWrapping.h" @@ -52,7 +52,7 @@ #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIResizer.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/CashEmotion/UICashEmotionMiniWnd.h" diff --git a/Source/UI/Window/UIDebuffRemoveWnd.cpp b/Source/UI/Skill/UIDebuffRemoveWnd.cpp similarity index 97% rename from Source/UI/Window/UIDebuffRemoveWnd.cpp rename to Source/UI/Skill/UIDebuffRemoveWnd.cpp index e288fb30c..44086d4b2 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.cpp +++ b/Source/UI/Skill/UIDebuffRemoveWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIDebuffRemoveWnd.h" +#include "UI/Skill/UIDebuffRemoveWnd.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Render/Text/FontCache.h" diff --git a/Source/UI/Window/UIDebuffRemoveWnd.h b/Source/UI/Skill/UIDebuffRemoveWnd.h similarity index 82% rename from Source/UI/Window/UIDebuffRemoveWnd.h rename to Source/UI/Skill/UIDebuffRemoveWnd.h index d637374f6..3dc4604f1 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.h +++ b/Source/UI/Skill/UIDebuffRemoveWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIDEBUFFREMOVEWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIDEBUFFREMOVEWND_H +#ifndef RAGNAROK_SOURCE_UI_SKILL_UIDEBUFFREMOVEWND_H +#define RAGNAROK_SOURCE_UI_SKILL_UIDEBUFFREMOVEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp b/Source/UI/Skill/UIGraffiStrboxWnd.cpp similarity index 96% rename from Source/UI/Dialogs/UIGraffiStrboxWnd.cpp rename to Source/UI/Skill/UIGraffiStrboxWnd.cpp index f0ec46986..1c92d2e80 100644 --- a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp +++ b/Source/UI/Skill/UIGraffiStrboxWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Dialogs/UIGraffiStrboxWnd.h" +#include "UI/Skill/UIGraffiStrboxWnd.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/InputFocus.h" diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.h b/Source/UI/Skill/UIGraffiStrboxWnd.h similarity index 78% rename from Source/UI/Dialogs/UIGraffiStrboxWnd.h rename to Source/UI/Skill/UIGraffiStrboxWnd.h index 9b61d5d06..758e59f1c 100644 --- a/Source/UI/Dialogs/UIGraffiStrboxWnd.h +++ b/Source/UI/Skill/UIGraffiStrboxWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIGRAFFISTRBOXWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIGRAFFISTRBOXWND_H +#ifndef RAGNAROK_SOURCE_UI_SKILL_UIGRAFFISTRBOXWND_H +#define RAGNAROK_SOURCE_UI_SKILL_UIGRAFFISTRBOXWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Skill/UINewSkillListWnd.cpp similarity index 99% rename from Source/UI/Window/UINewSkillListWnd.cpp rename to Source/UI/Skill/UINewSkillListWnd.cpp index 253a04a1f..f07006205 100644 --- a/Source/UI/Window/UINewSkillListWnd.cpp +++ b/Source/UI/Skill/UINewSkillListWnd.cpp @@ -4,11 +4,11 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Render/DeviceContext/DCSurface.h" -#include "UI/Window/UINewSkillListWnd.h" +#include "UI/Skill/UINewSkillListWnd.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobNames.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Skills/AutomaticSkills.h" @@ -18,8 +18,8 @@ #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Window/UIResizer.h" @@ -40,7 +40,7 @@ #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/SpritePixels.h" #include "Render/Textures/Texture.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "Client/Mode/CMode.h" diff --git a/Source/UI/Window/UINewSkillListWnd.h b/Source/UI/Skill/UINewSkillListWnd.h similarity index 96% rename from Source/UI/Window/UINewSkillListWnd.h rename to Source/UI/Skill/UINewSkillListWnd.h index 467cc0502..97f12654d 100644 --- a/Source/UI/Window/UINewSkillListWnd.h +++ b/Source/UI/Skill/UINewSkillListWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINEWSKILLLISTWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UINEWSKILLLISTWND_H +#ifndef RAGNAROK_SOURCE_UI_SKILL_UINEWSKILLLISTWND_H +#define RAGNAROK_SOURCE_UI_SKILL_UINEWSKILLLISTWND_H #include "Contents/Skills/SkillInfo.h" #include "UI/Text/ColoredText.h" diff --git a/Source/UI/Window/UINewSkillListWndHitTest.cpp b/Source/UI/Skill/UINewSkillListWndHitTest.cpp similarity index 86% rename from Source/UI/Window/UINewSkillListWndHitTest.cpp rename to Source/UI/Skill/UINewSkillListWndHitTest.cpp index 46c9cbe6d..7996289a5 100644 --- a/Source/UI/Window/UINewSkillListWndHitTest.cpp +++ b/Source/UI/Skill/UINewSkillListWndHitTest.cpp @@ -1,5 +1,5 @@ -#include "Client/Session.h" -#include "UI/Window/UINewSkillListWnd.h" +#include "Client/Session/Session.h" +#include "UI/Skill/UINewSkillListWnd.h" // OFFSET: 0x009B0240 // FUNCTION: fn_13804 diff --git a/Source/UI/SkillDelayInfo/SkillDelayInfo.h b/Source/UI/SkillDelayInfo/SkillDelayInfo.h index 3da6fc7f5..4dc7a1910 100644 --- a/Source/UI/SkillDelayInfo/SkillDelayInfo.h +++ b/Source/UI/SkillDelayInfo/SkillDelayInfo.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_SKILLDELAYINFO_SKILLDELAYINFO_H #define RAGNAROK_SOURCE_UI_SKILLDELAYINFO_SKILLDELAYINFO_H -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Lists/UIListBoxTemplate.h" #include "UI/Window/UIControl.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp index 9863f4efe..143bfc26e 100644 --- a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp +++ b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp @@ -1,10 +1,10 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "UI/SkillDelayInfo/SkillDelayInfo.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Script/LuaScript.h" #include "Utility/Text/StringUtil.h" #include "UI/Lists/UIVScrollBar.h" diff --git a/Source/UI/Window/UIBasicInfoWnd.cpp b/Source/UI/Status/UIBasicInfoWnd.cpp similarity index 99% rename from Source/UI/Window/UIBasicInfoWnd.cpp rename to Source/UI/Status/UIBasicInfoWnd.cpp index a0c13b751..7cb7c43c1 100644 --- a/Source/UI/Window/UIBasicInfoWnd.cpp +++ b/Source/UI/Status/UIBasicInfoWnd.cpp @@ -1,22 +1,22 @@ -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "UI/Window/UIBasicInfoWnd.h" +#include "UI/Status/UIBasicInfoWnd.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Jobs/JobId.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/SkinPalette.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" #include "UI/Text/UIStaticText.h" -#include "UI/UIBarGraph.h" +#include "UI/Gauges/UIBarGraph.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" #include "Contents/Tables/MessageTable.h" diff --git a/Source/UI/Window/UIBasicInfoWnd.h b/Source/UI/Status/UIBasicInfoWnd.h similarity index 93% rename from Source/UI/Window/UIBasicInfoWnd.h rename to Source/UI/Status/UIBasicInfoWnd.h index fdbb10b78..c18e60cc9 100644 --- a/Source/UI/Window/UIBasicInfoWnd.h +++ b/Source/UI/Status/UIBasicInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIBASICINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIBASICINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIBASICINFOWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIBASICINFOWND_H #include "Contents/UserData/NormalItemSlots.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIHomunInfoWnd.h b/Source/UI/Status/UIHomunInfoWnd.h similarity index 89% rename from Source/UI/Window/UIHomunInfoWnd.h rename to Source/UI/Status/UIHomunInfoWnd.h index 2d3920a99..9caf7b085 100644 --- a/Source/UI/Window/UIHomunInfoWnd.h +++ b/Source/UI/Status/UIHomunInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIHOMUNINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIHOMUNINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIHOMUNINFOWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIHOMUNINFOWND_H #include "UI/Window/UIFrameWnd.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Window/UIJobListWnd.cpp b/Source/UI/Status/UIJobListWnd.cpp similarity index 98% rename from Source/UI/Window/UIJobListWnd.cpp rename to Source/UI/Status/UIJobListWnd.cpp index a44c2b1af..b76498a0a 100644 --- a/Source/UI/Window/UIJobListWnd.cpp +++ b/Source/UI/Status/UIJobListWnd.cpp @@ -1,5 +1,5 @@ #include "UI/Window/WindowId.h" -#include "UI/Window/UIJobListWnd.h" +#include "UI/Status/UIJobListWnd.h" #include "UI/Window/UIEnums.h" #include "Contents/Tables/MessageTable.h" @@ -8,7 +8,7 @@ #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UICheckBox.h" diff --git a/Source/UI/Window/UIJobListWnd.h b/Source/UI/Status/UIJobListWnd.h similarity index 88% rename from Source/UI/Window/UIJobListWnd.h rename to Source/UI/Status/UIJobListWnd.h index 3b9e68361..d99ca1e85 100644 --- a/Source/UI/Window/UIJobListWnd.h +++ b/Source/UI/Status/UIJobListWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIJOBLISTWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIJOBLISTWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIJOBLISTWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIJOBLISTWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIMerInfoWnd.h b/Source/UI/Status/UIMerInfoWnd.h similarity index 86% rename from Source/UI/Window/UIMerInfoWnd.h rename to Source/UI/Status/UIMerInfoWnd.h index 489588786..c3410f8e9 100644 --- a/Source/UI/Window/UIMerInfoWnd.h +++ b/Source/UI/Status/UIMerInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIMERINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIMERINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIMERINFOWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIMERINFOWND_H #include "UI/Window/UIFrameWnd.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Window/UIPetEvolutionWnd.cpp b/Source/UI/Status/UIPetEvolutionWnd.cpp similarity index 98% rename from Source/UI/Window/UIPetEvolutionWnd.cpp rename to Source/UI/Status/UIPetEvolutionWnd.cpp index 03a6577f6..a5a9569ca 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.cpp +++ b/Source/UI/Status/UIPetEvolutionWnd.cpp @@ -1,8 +1,8 @@ -#include "UI/Window/UIPetEvolutionWnd.h" +#include "UI/Status/UIPetEvolutionWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Pet/PetEvolutionMgr.h" @@ -10,7 +10,7 @@ #include "Network/Packets/PacketId.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UITextButton.h" diff --git a/Source/UI/Window/UIPetEvolutionWnd.h b/Source/UI/Status/UIPetEvolutionWnd.h similarity index 85% rename from Source/UI/Window/UIPetEvolutionWnd.h rename to Source/UI/Status/UIPetEvolutionWnd.h index 7240d31c6..a4a8465ea 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.h +++ b/Source/UI/Status/UIPetEvolutionWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIPETEVOLUTIONWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIPETEVOLUTIONWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIPETEVOLUTIONWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIPETEVOLUTIONWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIPetInfoWnd.h b/Source/UI/Status/UIPetInfoWnd.h similarity index 90% rename from Source/UI/Window/UIPetInfoWnd.h rename to Source/UI/Status/UIPetInfoWnd.h index 669bc931f..edfb06ec9 100644 --- a/Source/UI/Window/UIPetInfoWnd.h +++ b/Source/UI/Status/UIPetInfoWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIPETINFOWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIPETINFOWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIPETINFOWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIPETINFOWND_H #include "UI/Window/UIFrameWnd.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h b/Source/UI/Status/UIPetTamingDeceiveWnd.h similarity index 84% rename from Source/UI/Dialogs/UIPetTamingDeceiveWnd.h rename to Source/UI/Status/UIPetTamingDeceiveWnd.h index de8100783..7c1887125 100644 --- a/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h +++ b/Source/UI/Status/UIPetTamingDeceiveWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIPETTAMINGDECEIVEWND_H -#define RAGNAROK_SOURCE_UI_DIALOGS_UIPETTAMINGDECEIVEWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIPETTAMINGDECEIVEWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIPETTAMINGDECEIVEWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Window/UIRebirthWnd.cpp b/Source/UI/Status/UIRebirthWnd.cpp similarity index 98% rename from Source/UI/Window/UIRebirthWnd.cpp rename to Source/UI/Status/UIRebirthWnd.cpp index 729c29e71..9b8b93379 100644 --- a/Source/UI/Window/UIRebirthWnd.cpp +++ b/Source/UI/Status/UIRebirthWnd.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIRebirthWnd.h" +#include "UI/Status/UIRebirthWnd.h" #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" diff --git a/Source/UI/Window/UIRebirthWnd.h b/Source/UI/Status/UIRebirthWnd.h similarity index 77% rename from Source/UI/Window/UIRebirthWnd.h rename to Source/UI/Status/UIRebirthWnd.h index 8a42b3584..34f96144b 100644 --- a/Source/UI/Window/UIRebirthWnd.h +++ b/Source/UI/Status/UIRebirthWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIREBIRTHWND_H -#define RAGNAROK_SOURCE_UI_WINDOW_UIREBIRTHWND_H +#ifndef RAGNAROK_SOURCE_UI_STATUS_UIREBIRTHWND_H +#define RAGNAROK_SOURCE_UI_STATUS_UIREBIRTHWND_H #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index 36caf12e0..78e6806f4 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -1,21 +1,21 @@ -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowPolicy.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Client/Mode/ModeMgr.h" #include "UI/StylingShop/UIStylingShopWnd.h" #include "Client/Mode/ModeEvents.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Jobs/JobId.h" #include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "Network/Connection/Connection.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Window/UIWindowMgr.h" #include @@ -1327,7 +1327,7 @@ UIStylingShopWnd::UIStylingShopWnd() } #include "Contents/Items/ItemInfo.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" // OFFSET: 0x0082CDA0 // FUNCTION: fn_10368 @@ -1495,7 +1495,7 @@ struct StyleChangePacket { #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" #include "UI/Text/UIStaticText.h" -#include "UI/Window/FuncDrawWNDChar.h" +#include "UI/Login/FuncDrawWNDChar.h" #include "Utility/Text/GroupedInteger.h" #include #include diff --git a/Source/UI/StylingShop/UIStylingShopWnd.h b/Source/UI/StylingShop/UIStylingShopWnd.h index 75e4ebf84..eb189fb36 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.h +++ b/Source/UI/StylingShop/UIStylingShopWnd.h @@ -3,7 +3,7 @@ #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" -#include "UI/UIScrollWnd.h" +#include "UI/Lists/UIScrollWnd.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Text/TextTagExtraction.cpp b/Source/UI/Text/TextTagExtraction.cpp new file mode 100644 index 000000000..021c4486e --- /dev/null +++ b/Source/UI/Text/TextTagExtraction.cpp @@ -0,0 +1 @@ +#include "UI/Text/TextTags.h" diff --git a/Source/UI/TextTagRegistry.cpp b/Source/UI/Text/TextTagRegistry.cpp similarity index 96% rename from Source/UI/TextTagRegistry.cpp rename to Source/UI/Text/TextTagRegistry.cpp index 0b9f149b7..a2eddae19 100644 --- a/Source/UI/TextTagRegistry.cpp +++ b/Source/UI/Text/TextTagRegistry.cpp @@ -1,4 +1,4 @@ -#include "UI/TextTags.h" +#include "UI/Text/TextTags.h" // GLOBAL: gl_24559 std::string navigationTagOpening = ""; diff --git a/Source/UI/TextTags.h b/Source/UI/Text/TextTags.h similarity index 95% rename from Source/UI/TextTags.h rename to Source/UI/Text/TextTags.h index 41cc43599..f75bb086a 100644 --- a/Source/UI/TextTags.h +++ b/Source/UI/Text/TextTags.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_TEXTTAGS_H -#define RAGNAROK_SOURCE_UI_TEXTTAGS_H +#ifndef RAGNAROK_SOURCE_UI_TEXT_TEXTTAGS_H +#define RAGNAROK_SOURCE_UI_TEXT_TEXTTAGS_H #include #include diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index bec8b5315..264da9d4f 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -5,9 +5,9 @@ #include "Contents/Tables/ForbiddenWords.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Text/TextContext.h" -#include "Resource/EmblemResource.h" +#include "Resource/Bitmap/EmblemResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Text/ColoredText.h" #include "UI/Text/TextWrapping.h" #include "UI/Text/UIBalloonText.h" diff --git a/Source/UI/UIBroadcastBalloon.cpp b/Source/UI/Text/UIBroadcastBalloon.cpp similarity index 97% rename from Source/UI/UIBroadcastBalloon.cpp rename to Source/UI/Text/UIBroadcastBalloon.cpp index 4ae7ada02..3652348d8 100644 --- a/Source/UI/UIBroadcastBalloon.cpp +++ b/Source/UI/Text/UIBroadcastBalloon.cpp @@ -1,7 +1,7 @@ -#include "UI/UIBroadcastBalloon.h" +#include "UI/Text/UIBroadcastBalloon.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "UI/Buttons/UIButton.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/UIBroadcastBalloon.h b/Source/UI/Text/UIBroadcastBalloon.h similarity index 92% rename from Source/UI/UIBroadcastBalloon.h rename to Source/UI/Text/UIBroadcastBalloon.h index 5b72c3f98..a3c213690 100644 --- a/Source/UI/UIBroadcastBalloon.h +++ b/Source/UI/Text/UIBroadcastBalloon.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIBROADCASTBALLOON_H -#define RAGNAROK_SOURCE_UI_UIBROADCASTBALLOON_H +#ifndef RAGNAROK_SOURCE_UI_TEXT_UIBROADCASTBALLOON_H +#define RAGNAROK_SOURCE_UI_TEXT_UIBROADCASTBALLOON_H #include "UI/Window/UIWindow.h" diff --git a/Source/UI/UIRoundBoxTooltipWnd.cpp b/Source/UI/Text/UIRoundBoxTooltipWnd.cpp similarity index 98% rename from Source/UI/UIRoundBoxTooltipWnd.cpp rename to Source/UI/Text/UIRoundBoxTooltipWnd.cpp index 681ce704b..ca665b5ca 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.cpp +++ b/Source/UI/Text/UIRoundBoxTooltipWnd.cpp @@ -1,13 +1,13 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "UI/UIRoundBoxTooltipWnd.h" +#include "UI/Text/UIRoundBoxTooltipWnd.h" #include "Client/Input/Mouse.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Tables/MessageTable.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Buttons/UITextButton.h" #include "UI/Text/ColoredText.h" #include "UI/Text/TextWrapping.h" diff --git a/Source/UI/UIRoundBoxTooltipWnd.h b/Source/UI/Text/UIRoundBoxTooltipWnd.h similarity index 88% rename from Source/UI/UIRoundBoxTooltipWnd.h rename to Source/UI/Text/UIRoundBoxTooltipWnd.h index 8ff4983d0..757e285d6 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.h +++ b/Source/UI/Text/UIRoundBoxTooltipWnd.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIROUNDBOXTOOLTIPWND_H -#define RAGNAROK_SOURCE_UI_UIROUNDBOXTOOLTIPWND_H +#ifndef RAGNAROK_SOURCE_UI_TEXT_UIROUNDBOXTOOLTIPWND_H +#define RAGNAROK_SOURCE_UI_TEXT_UIROUNDBOXTOOLTIPWND_H #include "UI/Lists/UIListBox.h" #include "UI/Window/UIFrameWnd.h" diff --git a/Source/UI/Text/UIStaticText.cpp b/Source/UI/Text/UIStaticText.cpp index 59e05030e..120ae2f1a 100644 --- a/Source/UI/Text/UIStaticText.cpp +++ b/Source/UI/Text/UIStaticText.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Render/DeviceContext/DeviceContext.h" #include "UI/Buttons/UIButton.h" #include "UI/Buttons/UIBmpTextButton.h" diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index bdb95e4dc..34a1826c0 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -3,7 +3,7 @@ #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Text/ColoredText.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Text/TextMarkup.h" @@ -15,7 +15,7 @@ #include "UI/Lists/UIScrollBar.h" #include "UI/Buttons/UITextButton.h" #include "UI/Text/UITextViewer.h" -#include "UI/Text/UIAchWnd.h" +#include "UI/Achievement/UIAchWnd.h" #include "UI/Window/UIWindowMgr.h" #include diff --git a/Source/UI/Text/UITextViewerLinks.cpp b/Source/UI/Text/UITextViewerLinks.cpp index 9f4615061..9e8b4077b 100644 --- a/Source/UI/Text/UITextViewerLinks.cpp +++ b/Source/UI/Text/UITextViewerLinks.cpp @@ -3,12 +3,12 @@ #include "Client/Input/InputCharset.h" #include "Contents/Items/ItemNaming.h" #include "Render/Text/TextContext.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/PixelTextWrapping.h" #include "UI/Text/TextMarkup.h" #include "UI/Text/TextWrapping.h" #include "UI/Lists/UIChatHisBox.h" -#include "UI/Lists/UIListBoxNavi.h" +#include "UI/Navigation/UIListBoxNavi.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Buttons/UITextButton.h" #include "UI/Text/UITextViewer.h" diff --git a/Source/UI/Text/UITextViewerMessages.cpp b/Source/UI/Text/UITextViewerMessages.cpp index da0403881..1c61351be 100644 --- a/Source/UI/Text/UITextViewerMessages.cpp +++ b/Source/UI/Text/UITextViewerMessages.cpp @@ -14,7 +14,7 @@ #include "UI/Window/WindowManagerWindows.h" #include "Contents/Items/ItemNaming.h" #include "UI/Lists/UIChatHisBox.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/PixelTextWrapping.h" #include "UI/Text/TextMarkup.h" #include "UI/Text/TextWrapping.h" diff --git a/Source/UI/TextTagExtraction.cpp b/Source/UI/TextTagExtraction.cpp deleted file mode 100644 index 6e37a80d1..000000000 --- a/Source/UI/TextTagExtraction.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "UI/TextTags.h" diff --git a/Source/UI/Window/FrameFocus.cpp b/Source/UI/Window/FrameFocus.cpp index a6008ce28..89f2f9fe6 100644 --- a/Source/UI/Window/FrameFocus.cpp +++ b/Source/UI/Window/FrameFocus.cpp @@ -6,7 +6,7 @@ #include "UI/Lists/UIDropDownBox.h" #include "UI/Party/UIMiniPartyWnd.h" #include -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" diff --git a/Source/UI/FrameSkin.cpp b/Source/UI/Window/FrameSkin.cpp similarity index 97% rename from Source/UI/FrameSkin.cpp rename to Source/UI/Window/FrameSkin.cpp index f061f7023..89c644002 100644 --- a/Source/UI/FrameSkin.cpp +++ b/Source/UI/Window/FrameSkin.cpp @@ -1,6 +1,6 @@ -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIRegisterMgr.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/FrameSkin.h b/Source/UI/Window/FrameSkin.h similarity index 88% rename from Source/UI/FrameSkin.h rename to Source/UI/Window/FrameSkin.h index ecbdc9b14..c752b8c86 100644 --- a/Source/UI/FrameSkin.h +++ b/Source/UI/Window/FrameSkin.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UI_FRAMESKIN_H -#define RAGNAROK_SOURCE_UI_FRAMESKIN_H +#ifndef RAGNAROK_SOURCE_UI_WINDOW_FRAMESKIN_H +#define RAGNAROK_SOURCE_UI_WINDOW_FRAMESKIN_H -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Window/UIFrameWnd.h" #include diff --git a/Source/UI/UIBasicCtrl.cpp b/Source/UI/Window/UIBasicCtrl.cpp similarity index 89% rename from Source/UI/UIBasicCtrl.cpp rename to Source/UI/Window/UIBasicCtrl.cpp index e89ff2c12..774c7d4c6 100644 --- a/Source/UI/UIBasicCtrl.cpp +++ b/Source/UI/Window/UIBasicCtrl.cpp @@ -1,4 +1,4 @@ -#include "UI/UIBasicCtrl.h" +#include "UI/Window/UIBasicCtrl.h" // OFFSET: 0x0086C410 // FUNCTION: fn_11026 diff --git a/Source/UI/UIBasicCtrl.h b/Source/UI/Window/UIBasicCtrl.h similarity index 92% rename from Source/UI/UIBasicCtrl.h rename to Source/UI/Window/UIBasicCtrl.h index 64be3327c..10651e7a3 100644 --- a/Source/UI/UIBasicCtrl.h +++ b/Source/UI/Window/UIBasicCtrl.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UI_UIBASICCTRL_H -#define RAGNAROK_SOURCE_UI_UIBASICCTRL_H +#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIBASICCTRL_H +#define RAGNAROK_SOURCE_UI_WINDOW_UIBASICCTRL_H #include "Contents/Items/ItemInfo.h" #include "UI/Window/UIWindow.h" diff --git a/Source/UI/Window/UIBitmapTab.cpp b/Source/UI/Window/UIBitmapTab.cpp index 16c2b70e2..a95ae0627 100644 --- a/Source/UI/Window/UIBitmapTab.cpp +++ b/Source/UI/Window/UIBitmapTab.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIEnums.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIBitmapTab.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index 693337932..205f97f6c 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -1,5 +1,5 @@ #include "Client/Mode/CMode.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "UI/Window/UIControl.h" #include "UI/Buttons/UIRadioButton.h" #include "UI/Buttons/UITextButton.h" @@ -9,8 +9,8 @@ #include "Client/Mode/ModeMgr.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "Resource/Bitmap/TextureNames.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIPadding.h" #include "UI/Text/UIStaticTextControl.h" @@ -28,7 +28,7 @@ #include "Utility/Threading/NSyncObject.h" #include "Render/Renderer.h" #include "UI/AdventureGuide/UIAdventureGuide.h" -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Text/CreateLineInfo.h" #include diff --git a/Source/UI/Window/UIControl.h b/Source/UI/Window/UIControl.h index 8ba2e4aaf..24e00b95f 100644 --- a/Source/UI/Window/UIControl.h +++ b/Source/UI/Window/UIControl.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_WINDOW_UICONTROL_H #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "UI/Window/UIWindow.h" #include diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 5b7357d6e..7ac18923d 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -3,34 +3,34 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "UI/Window/UIWindowMgr.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Window/InputFocus.h" -#include "UI/Window/UIBank_NewWnd.h" +#include "UI/Shop/UIBank_NewWnd.h" #include "Render/DX7/RenderSystemDX7.h" #include "UI/Layout/SnapMgr.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" -#include "UI/Buttons/UIReplayButton.h" +#include "UI/Replay/UIReplayButton.h" #include "UI/Acceptance/UIJoinPartyAcceptWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Text/UIStaticText.h" #include "UI/Text/UITextViewer.h" -#include "UI/Window/UIChatRoomWnd.h" -#include "UI/Window/UICntWnd.h" -#include "UI/Window/UIHomunInfoWnd.h" -#include "UI/Window/UILoginOTPWnd.h" -#include "UI/Window/UILoginWnd.h" -#include "UI/Window/UIMonsterInfoWnd.h" +#include "UI/Chat/UIChatRoomWnd.h" +#include "UI/Dialogs/UICntWnd.h" +#include "UI/Status/UIHomunInfoWnd.h" +#include "UI/Login/UILoginOTPWnd.h" +#include "UI/Login/UILoginWnd.h" +#include "UI/Monster/UIMonsterInfoWnd.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeEvents.h" #include "Client/Input/InputCharset.h" #include "Client/Input/Mouse.h" -#include "UI/Lists/UIReplayListBox.h" -#include "UI/Window/UINoticeWnd.h" +#include "UI/Replay/UIReplayListBox.h" +#include "UI/Dialogs/UINoticeWnd.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Window/WindowManagerWindows.h" #include "Contents/Configuration/ServiceConfiguration.h" @@ -45,10 +45,10 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Edit/UIItemTagCtrl.h" #include "UI/Lists/UIMemberListBox.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextWrapping.h" #include "UI/Window/UIResizer.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/UI/Window/UIResizer.cpp b/Source/UI/Window/UIResizer.cpp index 2e46eb114..a0d1c54dc 100644 --- a/Source/UI/Window/UIResizer.cpp +++ b/Source/UI/Window/UIResizer.cpp @@ -3,8 +3,8 @@ #include "Client/Mode/ModeMgr.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "Resource/Bitmap/TextureNames.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIResizer.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/UITab.cpp b/Source/UI/Window/UITab.cpp index bc00fb4f0..9b3a250ff 100644 --- a/Source/UI/Window/UITab.cpp +++ b/Source/UI/Window/UITab.cpp @@ -1,7 +1,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "UI/Window/UIEnums.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UITab.h" #include diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index bdf6c2d62..df5217120 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -7,20 +7,20 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/CMode.h" #include "Render/DeviceContext/DCSurface.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include "File/FileEnumeration.h" #include "Contents/World/World.h" #include "Contents/Actors/Pc.h" #include "Client/Mode/ModeMgr.h" #include "Client/Input/Language.h" #include "Client/Mode/CGameMode.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Tables/MessageTable.h" #include "Contents/Navigation/NavigationManager.h" #include "Contents/Sprites/SpriteRidingOffset.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeEvents.h" #include "Network/TextEncoding.h" #include "Render/DeviceContext/DCBitmap.h" @@ -32,9 +32,9 @@ #include "Render/Textures/Texture.h" #include "Resource/Bitmap/BitmapImage.h" #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/PaletteResource.h" +#include "Resource/Bitmap/PaletteResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" #include "UI/Buttons/UIBasicButton.h" @@ -46,22 +46,22 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Lists/UIComboBox.h" #include "UI/Lists/UIComboBoxDefWnd.h" -#include "UI/Lists/UIListBoxNaviSearch.h" +#include "UI/Navigation/UIListBoxNaviSearch.h" #include "UI/Lists/UIScrollBar.h" -#include "UI/Lists/UIScrollBarNavi.h" +#include "UI/Navigation/UIScrollBarNavi.h" #include "UI/Text/ColoredText.h" #include "Render/Textures/TextureCache.h" #include "UI/Text/TextWrapping.h" #include "UI/Window/WindowBorder.h" -#include "UI/Text/NavigationLink.h" +#include "UI/Navigation/NavigationLink.h" #include "UI/Text/TextMarkup.h" #include "UI/Text/UITextViewer.h" -#include "UI/UIStaticBitmap.h" +#include "UI/Buttons/UIStaticBitmap.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "UI/Navigation/UIPrivateAirplaneWnd.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/InputFocus.h" -#include "UI/Window/UINavigationWnd.h" +#include "UI/Navigation/UINavigationWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Window/UIWindowFactory.cpp b/Source/UI/Window/UIWindowFactory.cpp index f5a308cad..3ba6cec0a 100644 --- a/Source/UI/Window/UIWindowFactory.cpp +++ b/Source/UI/Window/UIWindowFactory.cpp @@ -1,13 +1,13 @@ #include "UI/Window/UIWindowFactory.h" #include "UI/Window/UIEnums.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Render/Renderer.h" #include "Script/LuaScript.h" #include "UI/EntryQueue/UIEntryQueueWnd.h" #include "UI/Shortcuts/UIQuickSlotWnd.h" -#include "UI/Window/UIHotKeyWnd.h" -#include "UI/Window/UISerachStoreInfoWnd.h" +#include "UI/GameSettings/UIHotKeyWnd.h" +#include "UI/Shop/UISerachStoreInfoWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowId.h" diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index ea1d9bc5f..a5ac79a3d 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -9,25 +9,25 @@ #include "Client/Browser/WebBrowser.h" #include "Client/Input/Mouse.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" -#include "UI/Dialogs/UIMemorialDunWnd.h" +#include "UI/Navigation/UIMemorialDunWnd.h" #include "UI/Layout/SnapMgr.h" #include "UI/Lists/UIDropDownBox.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Lists/UITabControl.h" -#include "UI/Window/MiniPartyWndAreaMgr.h" +#include "UI/Party/MiniPartyWndAreaMgr.h" #include "UI/Window/InputFocus.h" -#include "UI/Window/UINavigationWnd.h" -#include "UI/Window/UIRoMapWnd.h" +#include "UI/Navigation/UINavigationWnd.h" +#include "UI/Navigation/UIRoMapWnd.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "Client/Mode/CLoginMode.h" #include "Contents/Tables/MessageTable.h" @@ -37,7 +37,7 @@ #include "File/ShortcutFilename.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/Skills/AutomaticSkills.h" -#include "UI/Window/UIHotKeyWnd.h" +#include "UI/GameSettings/UIHotKeyWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include "Client/Mode/CMode.h" @@ -45,11 +45,11 @@ #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" #include "Contents/Events/RouletteMgr.h" -#include "UI/Item/UIItemStoreWnd.h" -#include "UI/Item/UIItemWnd.h" +#include "UI/Items/UIItemStoreWnd.h" +#include "UI/Items/UIItemWnd.h" #include "UI/Lists/UIComboBox.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "Render/DeviceContext/DCSurface.h" #include #include @@ -59,15 +59,15 @@ #include #include #include "Render/Textures/Surface.h" -#include "UI/FrameSkin.h" +#include "UI/Window/FrameSkin.h" #include "UI/Window/UIRegisterMgr.h" #include "Contents/Clan/ClanInfo.h" #include "Contents/Guild/GuildMgr.h" #include "Contents/Hotkeys/EmotionHotkeys.h" #include "UI/Text/TextMarkup.h" -#include "UI/Dialogs/UIWaitDBSaveWnd.h" +#include "UI/Login/UIWaitDBSaveWnd.h" #include "UI/Text/UITextViewer.h" -#include "UI/Window/UIMessageBox.h" +#include "UI/Dialogs/UIMessageBox.h" #include "Render/Primitives/AlphaRectangle.h" #include "UI/Cooldowns/CooldownOwner.h" #include "UI/Text/UITransBalloonText.h" @@ -75,13 +75,13 @@ #include "UI/Chat/UIWhisperWnd.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Lists/UITabControl.h" -#include "UI/Window/UIChatRoomWnd.h" +#include "UI/Chat/UIChatRoomWnd.h" #include "Contents/Guild/GuildInfo.h" #include "Contents/Configuration/GameSettingsMgr.h" #include "Contents/Sound/SoundMaker.h" #include "UI/GameSettings/GameSettingsUI.h" -#include "Client/ReplayRecordOption.h" +#include "Client/Replay/ReplayRecordOption.h" #include "Contents/RuneSystem/RuneSystem.h" #include "Contents/Map/MapPropertyMgr.h" #include "Contents/Map/MapSkyMgr.h" @@ -89,7 +89,7 @@ #include "Contents/Skills/ClientSkills.h" #include "Contents/UserData/NormalItemSlots.h" #include "Resource/Bitmap/BitmapResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "Script/LuaScript.h" #include "UI/Acceptance/UIAutoMessageWnd.h" #include "UI/Acceptance/UIJoinPartyAcceptWnd.h" @@ -100,28 +100,28 @@ #include "UI/Chat/UISubChatMiniWnd.h" #include "UI/Clan/UIClanWnd.h" #include "UI/Dialogs/UIBookWnd.h" -#include "UI/Dialogs/UIChooseWarpWnd.h" +#include "UI/Navigation/UIChooseWarpWnd.h" #include "UI/Dialogs/UIChooseWnd.h" #include "UI/Dialogs/UIDisconnectedServerMsgWnd.h" #include "UI/Dialogs/UIEditctrlWnd.h" -#include "UI/Dialogs/UIGraffiStrboxWnd.h" +#include "UI/Skill/UIGraffiStrboxWnd.h" #include "UI/Dialogs/UILoadingWnd.h" #include "UI/Dialogs/UIMenuWnd.h" -#include "UI/Dialogs/UIMiniMapWnd.h" -#include "UI/Dialogs/UIMinimapZoomWnd.h" +#include "UI/Navigation/UIMiniMapWnd.h" +#include "UI/Navigation/UIMinimapZoomWnd.h" #include "UI/Dialogs/UINoticeConfirmWnd.h" #include "UI/Dialogs/UINotifyJobLevelUpWnd.h" #include "UI/Dialogs/UINotifyLevelUpWnd.h" -#include "UI/Dialogs/UINotifyQuestWnd.h" +#include "UI/Quest/UINotifyQuestWnd.h" #include "UI/Dialogs/UINpcEditDialogWnd.h" -#include "UI/Dialogs/UIPasswordWnd.h" -#include "UI/Dialogs/UIPetTamingDeceiveWnd.h" +#include "UI/Login/UIPasswordWnd.h" +#include "UI/Status/UIPetTamingDeceiveWnd.h" #include "UI/Dialogs/UIProhibitListWnd.h" #include "UI/Dialogs/UIQuitWnd.h" #include "UI/Dialogs/UIRestartWnd.h" #include "UI/Dialogs/UISayDialogWnd.h" -#include "UI/Dialogs/UISecondPasswordEditWnd.h" -#include "UI/Dialogs/UISelectCartWnd.h" +#include "UI/Login/UISecondPasswordEditWnd.h" +#include "UI/Items/UISelectCartWnd.h" #include "UI/Dialogs/UITipOfTheDayWnd.h" #include "UI/Dialogs/UITipboxWnd.h" #include "UI/Dialogs/UIToolTipWnd.h" @@ -132,15 +132,15 @@ #include "UI/Guild/UIGuildHelperWnd.h" #include "UI/Guild/UIGuildWnd.h" #include "UI/Guild/UIGuild_Storage_Log.h" -#include "UI/Item/UIItemPurchaseWnd.h" -#include "UI/Item/UIItemSellWnd.h" -#include "UI/Item/UIItemSellWnd2.h" -#include "UI/Item/UIItemShopWnd.h" -#include "UI/Item/UIItemShopWnd2.h" -#include "UI/Item/UIItemStoreFindWnd.h" -#include "UI/Item/UIItemStoreSubWnd.h" -#include "UI/Item/UIMerchantItemLogWnd.h" -#include "UI/Item/UIParaItemShopWnd.h" +#include "UI/Items/UIItemPurchaseWnd.h" +#include "UI/Items/UIItemSellWnd.h" +#include "UI/Items/UIItemSellWnd2.h" +#include "UI/Items/UIItemShopWnd.h" +#include "UI/Items/UIItemShopWnd2.h" +#include "UI/Items/UIItemStoreFindWnd.h" +#include "UI/Items/UIItemStoreSubWnd.h" +#include "UI/Items/UIMerchantItemLogWnd.h" +#include "UI/Items/UIParaItemShopWnd.h" #include "UI/Items/MergeItemWnd.h" #include "UI/Items/UICardItemIllustWnd.h" #include "UI/Items/UIEquipWnd.h" @@ -181,72 +181,72 @@ #include "UI/Skill/UISkillNameChangeWnd.h" #include "UI/Status/UIStatusWnd.h" #include "UI/StylingShop/UIStylingShopWnd.h" -#include "UI/Text/UIAchWnd.h" -#include "UI/UIBartermarketWnd.h" -#include "UI/UICaptchaPreviewWnd.h" -#include "UI/UICaptchaRegisterWnd.h" -#include "UI/UIChangeMaterialWnd.h" -#include "UI/UICheckAttendanceWnd.h" -#include "UI/UIGradeEnchantWnd.h" -#include "UI/UIHotkeyGuideWnd.h" -#include "UI/UIItemReformWnd.h" -#include "UI/UILapineScrollBar.h" -#include "UI/UILapineUpgradeBoxWnd.h" -#include "UI/UIMacroBlackListCheckWnd.h" -#include "UI/UIMacroDetectorWnd.h" -#include "UI/UIMacroUserInfoWnd.h" -#include "UI/UIPreviewEquipWnd.h" -#include "UI/UIRefiningWnd.h" -#include "UI/UIReputeWnd.h" -#include "UI/UIRoundBoxTooltipWnd.h" -#include "UI/Window/UIAccountLimitedToolWnd.h" -#include "UI/Window/UIBalloonOpenBtn.h" -#include "UI/Window/UIBank_NewWnd.h" -#include "UI/Window/UIBasicInfoWnd.h" -#include "UI/Window/UIBattleMsgOptionWnd.h" -#include "UI/Window/UIChangeNameWnd.h" -#include "UI/Window/UICollectionSystemWnd.h" -#include "UI/Window/UIDebuffRemoveWnd.h" -#include "UI/Window/UIEscOptionWnd.h" +#include "UI/Achievement/UIAchWnd.h" +#include "UI/Shop/UIBartermarketWnd.h" +#include "UI/Macro/UICaptchaPreviewWnd.h" +#include "UI/Macro/UICaptchaRegisterWnd.h" +#include "UI/Items/UIChangeMaterialWnd.h" +#include "UI/Events/UICheckAttendanceWnd.h" +#include "UI/Items/UIGradeEnchantWnd.h" +#include "UI/GameSettings/UIHotkeyGuideWnd.h" +#include "UI/Items/UIItemReformWnd.h" +#include "UI/Items/UILapineScrollBar.h" +#include "UI/Items/UILapineUpgradeBoxWnd.h" +#include "UI/Macro/UIMacroBlackListCheckWnd.h" +#include "UI/Macro/UIMacroDetectorWnd.h" +#include "UI/Macro/UIMacroUserInfoWnd.h" +#include "UI/Items/UIPreviewEquipWnd.h" +#include "UI/Items/UIRefiningWnd.h" +#include "UI/Repute/UIReputeWnd.h" +#include "UI/Text/UIRoundBoxTooltipWnd.h" +#include "UI/Dialogs/UIAccountLimitedToolWnd.h" +#include "UI/Buttons/UIBalloonOpenBtn.h" +#include "UI/Shop/UIBank_NewWnd.h" +#include "UI/Status/UIBasicInfoWnd.h" +#include "UI/GameSettings/UIBattleMsgOptionWnd.h" +#include "UI/Login/UIChangeNameWnd.h" +#include "UI/Items/UICollectionSystemWnd.h" +#include "UI/Skill/UIDebuffRemoveWnd.h" +#include "UI/GameSettings/UIEscOptionWnd.h" #include "UI/Window/UIFrameWnd.h" -#include "UI/Window/UIHomunInfoWnd.h" -#include "UI/Window/UIJobListWnd.h" -#include "UI/Window/UILoginOTPWnd.h" -#include "UI/Window/UILoginWnd.h" -#include "UI/Window/UIMakeCharWnd.h" -#include "UI/Window/UIMerInfoWnd.h" -#include "UI/Window/UIMileageWnd.h" -#include "UI/Window/UIMonsterDisplayWnd.h" -#include "UI/Window/UIMonsterInfoWnd.h" -#include "UI/Window/UINavigationHelpWnd.h" -#include "UI/Window/UINewMakeCharWnd.h" -#include "UI/Window/UINewSkillListWnd.h" -#include "UI/Window/UINoteWnd.h" -#include "UI/Window/UINoticeWnd.h" -#include "UI/Window/UIOpenMailBoxWnd.h" -#include "UI/Window/UIOpenRoulletteWnd.h" -#include "UI/Window/UIPartyBookingHelpWnd.h" -#include "UI/Window/UIPetEvolutionWnd.h" -#include "UI/Window/UIPetInfoWnd.h" -#include "UI/Window/UIRPImageWnd.h" -#include "UI/Window/UIRPImageWnd2.h" -#include "UI/Window/UIRebirthWnd.h" -#include "UI/Window/UIReplayControlWnd.h" -#include "UI/Window/UIReplayRECControlWnd.h" -#include "UI/Window/UIRodexContentsWnd.h" -#include "UI/Window/UISecondCostumeWnd.h" -#include "UI/Window/UISeekPartyListWnd.h" -#include "UI/Window/UISeekPartyMBWnd.h" -#include "UI/Window/UISeekPartyWnd.h" -#include "UI/Window/UISelCharForUServerWnd.h" -#include "UI/Window/UISelectReplayDataWnd.h" -#include "UI/Window/UISelectServerWnd.h" -#include "UI/Window/UIShowWarpWnd.h" -#include "UI/Window/UITalkboxTrapInputWnd.h" -#include "UI/Window/UITransMenuWnd.h" -#include "UI/Window/UIVideoWnd.h" -#include "UI/Window/UIViewCameraInfoWnd.h" -#include "Utility/JsonCppLoader.h" +#include "UI/Status/UIHomunInfoWnd.h" +#include "UI/Status/UIJobListWnd.h" +#include "UI/Login/UILoginOTPWnd.h" +#include "UI/Login/UILoginWnd.h" +#include "UI/Login/UIMakeCharWnd.h" +#include "UI/Status/UIMerInfoWnd.h" +#include "UI/CashShop/UIMileageWnd.h" +#include "UI/Monster/UIMonsterDisplayWnd.h" +#include "UI/Monster/UIMonsterInfoWnd.h" +#include "UI/Navigation/UINavigationHelpWnd.h" +#include "UI/Login/UINewMakeCharWnd.h" +#include "UI/Skill/UINewSkillListWnd.h" +#include "UI/Dialogs/UINoteWnd.h" +#include "UI/Dialogs/UINoticeWnd.h" +#include "UI/Rodex/UIOpenMailBoxWnd.h" +#include "UI/Events/UIOpenRoulletteWnd.h" +#include "UI/Party/UIPartyBookingHelpWnd.h" +#include "UI/Status/UIPetEvolutionWnd.h" +#include "UI/Status/UIPetInfoWnd.h" +#include "UI/Dialogs/UIRPImageWnd.h" +#include "UI/Dialogs/UIRPImageWnd2.h" +#include "UI/Status/UIRebirthWnd.h" +#include "UI/Replay/UIReplayControlWnd.h" +#include "UI/Replay/UIReplayRECControlWnd.h" +#include "UI/Rodex/UIRodexContentsWnd.h" +#include "UI/Items/UISecondCostumeWnd.h" +#include "UI/Party/UISeekPartyListWnd.h" +#include "UI/Party/UISeekPartyMBWnd.h" +#include "UI/Party/UISeekPartyWnd.h" +#include "UI/Login/UISelCharForUServerWnd.h" +#include "UI/Replay/UISelectReplayDataWnd.h" +#include "UI/Login/UISelectServerWnd.h" +#include "UI/Navigation/UIShowWarpWnd.h" +#include "UI/Dialogs/UITalkboxTrapInputWnd.h" +#include "UI/Dialogs/UITransMenuWnd.h" +#include "UI/Dialogs/UIVideoWnd.h" +#include "UI/GameSettings/UIViewCameraInfoWnd.h" +#include "Resource/Json/JsonCppLoader.h" #include "Resource/MSGSTRINGID.h" #include diff --git a/Source/UI/Window/UIWindowMgr.inl b/Source/UI/Window/UIWindowMgr.inl index 83e87608d..6c2f928ce 100644 --- a/Source/UI/Window/UIWindowMgr.inl +++ b/Source/UI/Window/UIWindowMgr.inl @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_WINDOW_UIWINDOWMGR_INL #define RAGNAROK_SOURCE_UI_WINDOW_UIWINDOWMGR_INL -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Configuration/ServiceOptions.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/WindowAncestry.cpp b/Source/UI/Window/WindowAncestry.cpp index c9423bc2f..7726c3356 100644 --- a/Source/UI/Window/WindowAncestry.cpp +++ b/Source/UI/Window/WindowAncestry.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UIEnums.h" -#include "Client/Replay.h" -#include "Client/ReplayRecordOption.h" +#include "Client/Replay/Replay.h" +#include "Client/Replay/ReplayRecordOption.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/WindowBackground.cpp b/Source/UI/Window/WindowBackground.cpp similarity index 97% rename from Source/UI/WindowBackground.cpp rename to Source/UI/Window/WindowBackground.cpp index d0ef0920a..46b39d2c2 100644 --- a/Source/UI/WindowBackground.cpp +++ b/Source/UI/Window/WindowBackground.cpp @@ -1,4 +1,4 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Skills/ClientSkills.h" #include "Render/DeviceContext/DCSurface.h" @@ -9,10 +9,10 @@ #include "Render/Textures/Texture.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/SkinPalette.h" +#include "Resource/Bitmap/SkinPalette.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIWindow.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/Window/WindowBorder.cpp b/Source/UI/Window/WindowBorder.cpp index 3be15a0d0..bc714de0a 100644 --- a/Source/UI/Window/WindowBorder.cpp +++ b/Source/UI/Window/WindowBorder.cpp @@ -1,7 +1,7 @@ #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIWindow.h" #include "UI/Window/WindowBorder.h" diff --git a/Source/UI/Window/WindowDialogs.cpp b/Source/UI/Window/WindowDialogs.cpp index d20639062..d31446c36 100644 --- a/Source/UI/Window/WindowDialogs.cpp +++ b/Source/UI/Window/WindowDialogs.cpp @@ -3,9 +3,9 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/CLoginMode.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Session.h" -#include "UI/Window/UIMessageBox.h" -#include "UI/Window/UINewSelectCharWnd.h" +#include "Client/Session/Session.h" +#include "UI/Dialogs/UIMessageBox.h" +#include "UI/Login/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/WindowLowerBorder.cpp b/Source/UI/Window/WindowLowerBorder.cpp similarity index 98% rename from Source/UI/WindowLowerBorder.cpp rename to Source/UI/Window/WindowLowerBorder.cpp index c312f7ee8..51e035d38 100644 --- a/Source/UI/WindowLowerBorder.cpp +++ b/Source/UI/Window/WindowLowerBorder.cpp @@ -1,6 +1,6 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIWindow.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp index 98ededd41..e7ea0229a 100644 --- a/Source/UI/Window/WindowMgrState.cpp +++ b/Source/UI/Window/WindowMgrState.cpp @@ -5,9 +5,9 @@ #include "Client/Mode/CLoginMode.h" #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" -#include "Client/Registry.h" -#include "Client/Replay.h" -#include "Client/Session.h" +#include "Client/Application/Registry.h" +#include "Client/Replay/Replay.h" +#include "Client/Session/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Messenger/ClientMessenger.h" @@ -19,17 +19,17 @@ #include "Render/Renderer.h" #include "Render/Textures/Surface.h" #include "Resource/Bitmap/BitmapResource.h" -#include "UI/Dialogs/UIEmailAddressWnd.h" -#include "UI/Dialogs/UIMemorialDunWnd.h" +#include "UI/Login/UIEmailAddressWnd.h" +#include "UI/Navigation/UIMemorialDunWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/GameSettings/GameSettingsUI.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "UI/Party/UIMiniPartyWnd.h" -#include "UI/Window/MiniPartyWndAreaMgr.h" -#include "UI/Window/UIMessageBox.h" -#include "UI/Window/UINavigationWnd.h" -#include "UI/Window/UINewSelectCharWnd.h" -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Party/MiniPartyWndAreaMgr.h" +#include "UI/Dialogs/UIMessageBox.h" +#include "UI/Navigation/UINavigationWnd.h" +#include "UI/Login/UINewSelectCharWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" #include diff --git a/Source/UI/Window/WindowMouseHit.cpp b/Source/UI/Window/WindowMouseHit.cpp index 1112dcb4e..075c31a7e 100644 --- a/Source/UI/Window/WindowMouseHit.cpp +++ b/Source/UI/Window/WindowMouseHit.cpp @@ -1,9 +1,9 @@ #include "UI/Window/WindowId.h" -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Client/Mode/ModeMgr.h" #include "Client/Browser/WebBrowser.h" #include "Client/Input/Mouse.h" -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "Contents/Messenger/MessengerMember.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Edit/UIEditCtrl.h" diff --git a/Source/UI/Window/WindowOrdering.cpp b/Source/UI/Window/WindowOrdering.cpp index 836982ed8..8ba88945d 100644 --- a/Source/UI/Window/WindowOrdering.cpp +++ b/Source/UI/Window/WindowOrdering.cpp @@ -1,4 +1,4 @@ -#include "UI/Window/UIRoulletteWnd.h" +#include "UI/Events/UIRoulletteWnd.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Contents/Configuration/ServiceOptions.h" diff --git a/Source/UI/WindowOverlay.cpp b/Source/UI/Window/WindowOverlay.cpp similarity index 98% rename from Source/UI/WindowOverlay.cpp rename to Source/UI/Window/WindowOverlay.cpp index aeec952ae..c09921997 100644 --- a/Source/UI/WindowOverlay.cpp +++ b/Source/UI/Window/WindowOverlay.cpp @@ -1,12 +1,12 @@ -#include "Client/Session.h" +#include "Client/Session/Session.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" -#include "Render/TextureQuad.h" +#include "Render/Primitives/TextureQuad.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Chat/UIWhisperWnd.h" #include "UI/Items/UIEquipWnd.h" #include "UI/Skill/UISkillDescribeWnd.h" diff --git a/Source/UI/Window/WindowPolicy.cpp b/Source/UI/Window/WindowPolicy.cpp index 43f90a9d0..c5595f9e1 100644 --- a/Source/UI/Window/WindowPolicy.cpp +++ b/Source/UI/Window/WindowPolicy.cpp @@ -1,4 +1,4 @@ -#include "Client/Replay.h" +#include "Client/Replay/Replay.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowPolicy.h" diff --git a/Source/UI/WindowSprite.cpp b/Source/UI/Window/WindowSprite.cpp similarity index 100% rename from Source/UI/WindowSprite.cpp rename to Source/UI/Window/WindowSprite.cpp diff --git a/Source/UI/WindowTitlebar.cpp b/Source/UI/Window/WindowTitlebar.cpp similarity index 98% rename from Source/UI/WindowTitlebar.cpp rename to Source/UI/Window/WindowTitlebar.cpp index 64b8dc244..e57656261 100644 --- a/Source/UI/WindowTitlebar.cpp +++ b/Source/UI/Window/WindowTitlebar.cpp @@ -1,6 +1,6 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" -#include "Resource/TextureNames.h" +#include "Resource/Bitmap/TextureNames.h" #include "UI/Window/UIWindow.h" // OFFSET: 0x008D2CE0 diff --git a/Source/Interface/BoolStubs.cpp b/Source/Utility/BoolStubs.cpp similarity index 100% rename from Source/Interface/BoolStubs.cpp rename to Source/Utility/BoolStubs.cpp diff --git a/Source/Utility/EncryptedName.h b/Source/Utility/Cipher/EncryptedName.h similarity index 93% rename from Source/Utility/EncryptedName.h rename to Source/Utility/Cipher/EncryptedName.h index f4a88001a..533d9da71 100644 --- a/Source/Utility/EncryptedName.h +++ b/Source/Utility/Cipher/EncryptedName.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_ENCRYPTEDNAME_H -#define RAGNAROK_SOURCE_UTILITY_ENCRYPTEDNAME_H +#ifndef RAGNAROK_SOURCE_UTILITY_CIPHER_ENCRYPTEDNAME_H +#define RAGNAROK_SOURCE_UTILITY_CIPHER_ENCRYPTEDNAME_H #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Utility/CRC32.cpp b/Source/Utility/Hash/CRC32.cpp similarity index 99% rename from Source/Utility/CRC32.cpp rename to Source/Utility/Hash/CRC32.cpp index 769a05f49..f456610e5 100644 --- a/Source/Utility/CRC32.cpp +++ b/Source/Utility/Hash/CRC32.cpp @@ -1,4 +1,4 @@ -#include "Utility/CRC32.h" +#include "Utility/Hash/CRC32.h" #include #include diff --git a/Source/Utility/CRC32.h b/Source/Utility/Hash/CRC32.h similarity index 90% rename from Source/Utility/CRC32.h rename to Source/Utility/Hash/CRC32.h index b144771f3..21b4c6349 100644 --- a/Source/Utility/CRC32.h +++ b/Source/Utility/Hash/CRC32.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_CRC32_H -#define RAGNAROK_SOURCE_UTILITY_CRC32_H +#ifndef RAGNAROK_SOURCE_UTILITY_HASH_CRC32_H +#define RAGNAROK_SOURCE_UTILITY_HASH_CRC32_H #include #include diff --git a/Source/Utility/GGHash.cpp b/Source/Utility/Hash/GGHash.cpp similarity index 96% rename from Source/Utility/GGHash.cpp rename to Source/Utility/Hash/GGHash.cpp index dc8bb9a39..ec49866ed 100644 --- a/Source/Utility/GGHash.cpp +++ b/Source/Utility/Hash/GGHash.cpp @@ -1,6 +1,6 @@ -#include "Utility/GGHash.h" +#include "Utility/Hash/GGHash.h" -#include "Utility/FileSignatureVerifier.h" +#include "Security/FileSignatureVerifier.h" #include "Utility/Hash/MD5.h" #include diff --git a/Source/Utility/GGHash.h b/Source/Utility/Hash/GGHash.h similarity index 91% rename from Source/Utility/GGHash.h rename to Source/Utility/Hash/GGHash.h index 4a6c24f35..6511e357b 100644 --- a/Source/Utility/GGHash.h +++ b/Source/Utility/Hash/GGHash.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_GGHASH_H -#define RAGNAROK_SOURCE_UTILITY_GGHASH_H +#ifndef RAGNAROK_SOURCE_UTILITY_HASH_GGHASH_H +#define RAGNAROK_SOURCE_UTILITY_HASH_GGHASH_H #include #include diff --git a/Source/Utility/GGHashMgr.cpp b/Source/Utility/Hash/GGHashMgr.cpp similarity index 97% rename from Source/Utility/GGHashMgr.cpp rename to Source/Utility/Hash/GGHashMgr.cpp index 6a52e0391..84f510bd6 100644 --- a/Source/Utility/GGHashMgr.cpp +++ b/Source/Utility/Hash/GGHashMgr.cpp @@ -1,4 +1,4 @@ -#include "Utility/GGHashMgr.h" +#include "Utility/Hash/GGHashMgr.h" #include #include diff --git a/Source/Utility/GGHashMgr.h b/Source/Utility/Hash/GGHashMgr.h similarity index 81% rename from Source/Utility/GGHashMgr.h rename to Source/Utility/Hash/GGHashMgr.h index 9941519a9..d1d20df1f 100644 --- a/Source/Utility/GGHashMgr.h +++ b/Source/Utility/Hash/GGHashMgr.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_GGHASHMGR_H -#define RAGNAROK_SOURCE_UTILITY_GGHASHMGR_H +#ifndef RAGNAROK_SOURCE_UTILITY_HASH_GGHASHMGR_H +#define RAGNAROK_SOURCE_UTILITY_HASH_GGHASHMGR_H -#include "Utility/GGHash.h" +#include "Utility/Hash/GGHash.h" #include diff --git a/Source/Utility/Md5State.cpp b/Source/Utility/Hash/Md5State.cpp similarity index 99% rename from Source/Utility/Md5State.cpp rename to Source/Utility/Hash/Md5State.cpp index 18a0782ee..c68addf33 100644 --- a/Source/Utility/Md5State.cpp +++ b/Source/Utility/Hash/Md5State.cpp @@ -1,4 +1,4 @@ -#include "Utility/Md5State.h" +#include "Utility/Hash/Md5State.h" #include diff --git a/Source/Utility/Md5State.h b/Source/Utility/Hash/Md5State.h similarity index 84% rename from Source/Utility/Md5State.h rename to Source/Utility/Hash/Md5State.h index eef2491af..d3be5716e 100644 --- a/Source/Utility/Md5State.h +++ b/Source/Utility/Hash/Md5State.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_MD5STATE_H -#define RAGNAROK_SOURCE_UTILITY_MD5STATE_H +#ifndef RAGNAROK_SOURCE_UTILITY_HASH_MD5STATE_H +#define RAGNAROK_SOURCE_UTILITY_HASH_MD5STATE_H #include #include diff --git a/Source/Utility/SHA3.cpp b/Source/Utility/Hash/SHA3.cpp similarity index 99% rename from Source/Utility/SHA3.cpp rename to Source/Utility/Hash/SHA3.cpp index 6a1bf8fab..1a0a24742 100644 --- a/Source/Utility/SHA3.cpp +++ b/Source/Utility/Hash/SHA3.cpp @@ -1,4 +1,4 @@ -#include "Utility/SHA3.h" +#include "Utility/Hash/SHA3.h" #include #include diff --git a/Source/Utility/SHA3.h b/Source/Utility/Hash/SHA3.h similarity index 88% rename from Source/Utility/SHA3.h rename to Source/Utility/Hash/SHA3.h index 397a52a27..f087de19d 100644 --- a/Source/Utility/SHA3.h +++ b/Source/Utility/Hash/SHA3.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_SHA3_H -#define RAGNAROK_SOURCE_UTILITY_SHA3_H +#ifndef RAGNAROK_SOURCE_UTILITY_HASH_SHA3_H +#define RAGNAROK_SOURCE_UTILITY_HASH_SHA3_H #include #include diff --git a/Source/Utility/XxHash3.cpp b/Source/Utility/Hash/XxHash3.cpp similarity index 99% rename from Source/Utility/XxHash3.cpp rename to Source/Utility/Hash/XxHash3.cpp index dc4bd1ff6..2bf0769df 100644 --- a/Source/Utility/XxHash3.cpp +++ b/Source/Utility/Hash/XxHash3.cpp @@ -1,4 +1,4 @@ -#include "Utility/XxHash3.h" +#include "Utility/Hash/XxHash3.h" #include #include diff --git a/Source/Utility/XxHash3.h b/Source/Utility/Hash/XxHash3.h similarity index 97% rename from Source/Utility/XxHash3.h rename to Source/Utility/Hash/XxHash3.h index 8ab348548..a58706ea3 100644 --- a/Source/Utility/XxHash3.h +++ b/Source/Utility/Hash/XxHash3.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_XXHASH3_H -#define RAGNAROK_SOURCE_UTILITY_XXHASH3_H +#ifndef RAGNAROK_SOURCE_UTILITY_HASH_XXHASH3_H +#define RAGNAROK_SOURCE_UTILITY_HASH_XXHASH3_H #include #include diff --git a/Source/LexiconTrie.cpp b/Source/Utility/Lexicon/LexiconTrie.cpp similarity index 100% rename from Source/LexiconTrie.cpp rename to Source/Utility/Lexicon/LexiconTrie.cpp diff --git a/Source/Utility/GuidParse.cpp b/Source/Utility/Text/GuidParse.cpp similarity index 97% rename from Source/Utility/GuidParse.cpp rename to Source/Utility/Text/GuidParse.cpp index fae97eaed..2d5774492 100644 --- a/Source/Utility/GuidParse.cpp +++ b/Source/Utility/Text/GuidParse.cpp @@ -1,4 +1,4 @@ -#include "Utility/GuidParse.h" +#include "Utility/Text/GuidParse.h" #include "Utility/Text/FormatString.h" #include diff --git a/Source/Utility/GuidParse.h b/Source/Utility/Text/GuidParse.h similarity index 67% rename from Source/Utility/GuidParse.h rename to Source/Utility/Text/GuidParse.h index b7707f727..b894a0157 100644 --- a/Source/Utility/GuidParse.h +++ b/Source/Utility/Text/GuidParse.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_GUIDPARSE_H -#define RAGNAROK_SOURCE_UTILITY_GUIDPARSE_H +#ifndef RAGNAROK_SOURCE_UTILITY_TEXT_GUIDPARSE_H +#define RAGNAROK_SOURCE_UTILITY_TEXT_GUIDPARSE_H #include #include diff --git a/Source/Utility/Text/StringUtil.cpp b/Source/Utility/Text/StringUtil.cpp index c28dc5593..79b36c7b8 100644 --- a/Source/Utility/Text/StringUtil.cpp +++ b/Source/Utility/Text/StringUtil.cpp @@ -2,7 +2,7 @@ #include "Archive/GPak.h" #include "Archive/PakCipher.h" #include "Utility/Threading/NSyncObject.h" -#include "Utility/Compression/Zlib.h" +#include "Utility/Zlib.h" #include #include diff --git a/Source/Utility/Tokenizer.cpp b/Source/Utility/Text/Tokenizer.cpp similarity index 98% rename from Source/Utility/Tokenizer.cpp rename to Source/Utility/Text/Tokenizer.cpp index edb9bb94d..b5b74f7f6 100644 --- a/Source/Utility/Tokenizer.cpp +++ b/Source/Utility/Text/Tokenizer.cpp @@ -1,4 +1,4 @@ -#include "Utility/Tokenizer.h" +#include "Utility/Text/Tokenizer.h" #include "Client/Application/ErrorDialog.h" #include "Render/DeviceContext/DCSurface.h" diff --git a/Source/Utility/Tokenizer.h b/Source/Utility/Text/Tokenizer.h similarity index 77% rename from Source/Utility/Tokenizer.h rename to Source/Utility/Text/Tokenizer.h index 939e57a05..532be9d83 100644 --- a/Source/Utility/Tokenizer.h +++ b/Source/Utility/Text/Tokenizer.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_TOKENIZER_H -#define RAGNAROK_SOURCE_UTILITY_TOKENIZER_H +#ifndef RAGNAROK_SOURCE_UTILITY_TEXT_TOKENIZER_H +#define RAGNAROK_SOURCE_UTILITY_TEXT_TOKENIZER_H #include #include diff --git a/Source/Utility/Compression/Zlib.h b/Source/Utility/Zlib.h similarity index 61% rename from Source/Utility/Compression/Zlib.h rename to Source/Utility/Zlib.h index c75beafb9..7b0708289 100644 --- a/Source/Utility/Compression/Zlib.h +++ b/Source/Utility/Zlib.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_UTILITY_COMPRESSION_ZLIB_H -#define RAGNAROK_SOURCE_UTILITY_COMPRESSION_ZLIB_H +#ifndef RAGNAROK_SOURCE_UTILITY_ZLIB_H +#define RAGNAROK_SOURCE_UTILITY_ZLIB_H extern "C" int __cdecl uncompress(unsigned char* destination, unsigned long* destinationLength, const unsigned char* source, unsigned long sourceLength); diff --git a/data/compile.json b/data/compile.json index 078856f1f..09614bf3d 100644 --- a/data/compile.json +++ b/data/compile.json @@ -260,7 +260,6 @@ ] ], "units": { - "Source/ActorPickNode.cpp": 4, "Source/Archive/GPak.cpp": 1, "Source/Archive/MemMapPakFile.cpp": 1, "Source/Archive/PakCipher.cpp": 1, @@ -268,14 +267,17 @@ "Source/Archive/PakFile.cpp": 1, "Source/Archive/PakName.cpp": 1, "Source/Archive/PakRegistry.cpp": 1, - "Source/Archive/UnknownA68.cpp": 1, "Source/Client/Application/ApplicationActivation.cpp": 4, "Source/Client/Application/ApplicationMessages.cpp": 4, "Source/Client/Application/ApplicationWindow.cpp": 0, "Source/Client/Application/ClientInfo.cpp": 0, + "Source/Client/Application/ClientOptions.cpp": 0, "Source/Client/Application/ErrorDialog.cpp": 0, "Source/Client/Application/LaunchInfo.cpp": 0, "Source/Client/Application/Launcher.cpp": 0, + "Source/Client/Application/Registry.cpp": 0, + "Source/Client/Application/RegistryKey.cpp": 0, + "Source/Client/Application/Timer.cpp": 0, "Source/Client/Application/UnhandledExceptionHandler.cpp": 0, "Source/Client/Browser/BrowserAddressBar.cpp": 0, "Source/Client/Browser/BrowserAddressEdit.cpp": 0, @@ -298,7 +300,6 @@ "Source/Client/Browser/BrowserWindowSizing.cpp": 0, "Source/Client/Browser/WebBrowser.cpp": 4, "Source/Client/Browser/WebEventReceiver.cpp": 4, - "Source/Client/ClientOptions.cpp": 0, "Source/Client/Input/ImeHelper.cpp": 0, "Source/Client/Input/ImeInput.cpp": 0, "Source/Client/Input/InputCharset.cpp": 0, @@ -306,6 +307,7 @@ "Source/Client/Input/LanguageTC.cpp": 0, "Source/Client/Input/Mouse.cpp": 0, "Source/Client/Input/VietnameseInput.cpp": 0, + "Source/Client/Mode/EntityInit.cpp": 4, "Source/Client/Mode/GameMode.cpp": 0, "Source/Client/Mode/GameModeActorEffects.cpp": 0, "Source/Client/Mode/GameModeEquipWindow.cpp": 0, @@ -320,34 +322,33 @@ "Source/Client/Mode/GameModeSounds.cpp": 0, "Source/Client/Mode/LoginMode.cpp": 0, "Source/Client/Mode/LoginModeNotices.cpp": 0, + "Source/Client/Mode/ModeBaseEvents.cpp": 0, "Source/Client/Mode/ModeCursor.cpp": 0, + "Source/Client/Mode/ModeCursorDrawing.cpp": 0, "Source/Client/Mode/ModeDragState.cpp": 2, + "Source/Client/Mode/ModeFade.cpp": 0, + "Source/Client/Mode/ModeFadeOut.cpp": 0, "Source/Client/Mode/ModeLifetime.cpp": 0, "Source/Client/Mode/ModeMgr.cpp": 0, + "Source/Client/Mode/ModeScreenshot.cpp": 0, "Source/Client/Mode/ModeTooltip.cpp": 2, - "Source/Client/ModeBaseEvents.cpp": 0, - "Source/Client/ModeCursorDrawing.cpp": 0, - "Source/Client/ModeFade.cpp": 0, - "Source/Client/ModeFadeOut.cpp": 0, - "Source/Client/ModeScreenshot.cpp": 0, - "Source/Client/ModeTransitions.cpp": 0, - "Source/Client/Registry.cpp": 0, - "Source/Client/Replay.cpp": 0, - "Source/Client/ReplayControl.cpp": 0, - "Source/Client/ReplayPacketRecorder.cpp": 2, - "Source/Client/Session.cpp": 0, - "Source/Client/SessionAchievements.cpp": 0, - "Source/Client/SessionParty.cpp": 0, - "Source/Client/SessionPredicates.cpp": 0, - "Source/Client/SessionState.cpp": 0, + "Source/Client/Mode/ModeTransitions.cpp": 0, + "Source/Client/Replay/Replay.cpp": 0, + "Source/Client/Replay/ReplayControl.cpp": 0, + "Source/Client/Replay/ReplayPacketRecorder.cpp": 2, + "Source/Client/Session/Session.cpp": 0, + "Source/Client/Session/SessionAchievements.cpp": 0, + "Source/Client/Session/SessionParty.cpp": 0, + "Source/Client/Session/SessionPredicates.cpp": 0, + "Source/Client/Session/SessionState.cpp": 0, "Source/Client/Stove/StoveMgr.cpp": 0, - "Source/Client/Timer.cpp": 0, "Source/Contents/Achievement/AchievementMgr.cpp": 4, "Source/Contents/Actors/ActorGeometry.cpp": 4, "Source/Contents/Actors/ActorNameCache.cpp": 4, "Source/Contents/Actors/ActorNameCard.cpp": 4, "Source/Contents/Actors/ActorNameDirectory.cpp": 4, "Source/Contents/Actors/ActorNameRequests.cpp": 4, + "Source/Contents/Actors/ActorPickNode.cpp": 4, "Source/Contents/Actors/ActorStateFlags.cpp": 4, "Source/Contents/Actors/AttackMotion.cpp": 4, "Source/Contents/Actors/CharacterRender.cpp": 4, @@ -714,46 +715,42 @@ "Source/Contents/World/WorldTerrainPicking.cpp": 4, "Source/Contents/World/WorldViewData.cpp": 4, "Source/Contents/World/WorldViewSpatial.cpp": 3, - "Source/EntityInit.cpp": 4, "Source/File/CommonObject.cpp": 1, "Source/File/DirectoryRemoval.cpp": 1, "Source/File/File.cpp": 1, "Source/File/FileCreation.cpp": 1, "Source/File/FileEnumeration.cpp": 1, "Source/File/MapName.cpp": 1, + "Source/File/NFileLog.cpp": 0, "Source/File/ResourcePath.cpp": 1, "Source/File/ShortcutFilename.cpp": 1, - "Source/Interface/BoolStubs.cpp": 4, - "Source/LexiconTrie.cpp": 4, - "Source/Network/ActorNamePacket.cpp": 0, - "Source/Network/ClientKeepalive.cpp": 0, - "Source/Network/ClientOptionPacket.cpp": 0, "Source/Network/Connection/Connection.cpp": 0, "Source/Network/Connection/ConnectionRuntime.cpp": 0, "Source/Network/Connection/PacketQueue.cpp": 0, - "Source/Network/ExecutableDigestPacket.cpp": 0, - "Source/Network/GameTickPacket.cpp": 0, "Source/Network/Http/CURLMgr.cpp": 0, "Source/Network/Http/CURLPostHander.cpp": 0, + "Source/Network/NIPAddr.cpp": 0, + "Source/Network/Packets/ActorNamePacket.cpp": 0, + "Source/Network/Packets/ClientKeepalive.cpp": 0, + "Source/Network/Packets/ClientOptionPacket.cpp": 0, + "Source/Network/Packets/ExecutableDigestPacket.cpp": 0, + "Source/Network/Packets/GameTickPacket.cpp": 0, "Source/Network/Packets/PacketLengths.cpp": 0, "Source/Network/Packets/PartyJoinRequest.cpp": 2, "Source/Network/Packets/SkillUpdatePacket.cpp": 4, "Source/Network/TextEncoding.cpp": 0, - "Source/Render/ActionSpriteDrawing.cpp": 0, - "Source/Render/AlphaQueuesDX7.cpp": 0, - "Source/Render/AlphaRectangle.cpp": 0, - "Source/Render/AuxiliaryQueuesDX7.cpp": 0, - "Source/Render/AuxiliarySubmission.cpp": 0, - "Source/Render/BitmapDrawing.cpp": 0, - "Source/Render/BlendColor.cpp": 0, + "Source/Render/DX7/AlphaQueuesDX7.cpp": 0, + "Source/Render/DX7/AuxiliaryQueuesDX7.cpp": 0, "Source/Render/DX7/BackBufferDX7.cpp": 0, "Source/Render/DX7/DeviceCapabilitiesDX7.cpp": 0, "Source/Render/DX7/DeviceOwnerDX7.cpp": 0, "Source/Render/DX7/DirectDrawEnumeration.cpp": 0, "Source/Render/DX7/DisplayModeDX7.cpp": 0, + "Source/Render/DX7/OpaqueQueuesDX7.cpp": 0, "Source/Render/DX7/RenderAdapterDX7.cpp": 0, "Source/Render/DX7/RenderSystemDX7.cpp": 0, "Source/Render/DX7/RenderToTextureDX7.cpp": 0, + "Source/Render/DX7/RendererDX7.cpp": 0, "Source/Render/DX7/RendererDX7Operations.cpp": 0, "Source/Render/DX7/RendererFogDX7.cpp": 0, "Source/Render/DX7/RendererPresentationDX7.cpp": 0, @@ -765,6 +762,7 @@ "Source/Render/DX7/TextureModesDX7.cpp": 0, "Source/Render/DX9/AlphaQueuesDX9.cpp": 0, "Source/Render/DX9/BackBufferDX9.cpp": 0, + "Source/Render/DX9/DeviceCapabilitiesDX9.cpp": 0, "Source/Render/DX9/DeviceOwnerDX9.cpp": 0, "Source/Render/DX9/DeviceRecoveryDX9.cpp": 0, "Source/Render/DX9/DeviceStateDX9.cpp": 0, @@ -782,14 +780,20 @@ "Source/Render/DX9/SurfaceDX9.cpp": 0, "Source/Render/DX9/TextureDX9.cpp": 0, "Source/Render/DX9/TextureModesDX9.cpp": 0, - "Source/Render/DeviceCapabilitiesDX9.cpp": 0, + "Source/Render/Device/DeviceSelection.cpp": 0, + "Source/Render/Device/Direct3DErrors.cpp": 0, + "Source/Render/Device/DisplayMode.cpp": 0, + "Source/Render/Device/RenderAdapter.cpp": 0, + "Source/Render/Device/RenderBackends.cpp": 0, "Source/Render/DeviceContext/DCBitmap.cpp": 0, "Source/Render/DeviceContext/DCSurface.cpp": 0, "Source/Render/DeviceContext/DeviceContext.cpp": 0, - "Source/Render/DeviceSelection.cpp": 0, - "Source/Render/Direct3DErrors.cpp": 0, - "Source/Render/DisplayMode.cpp": 0, - "Source/Render/OpaqueQueuesDX7.cpp": 0, + "Source/Render/Drawing/ActionSpriteDrawing.cpp": 0, + "Source/Render/Drawing/BitmapDrawing.cpp": 0, + "Source/Render/Drawing/BlendColor.cpp": 0, + "Source/Render/Drawing/SpriteGeometry.cpp": 0, + "Source/Render/Primitives/AlphaRectangle.cpp": 0, + "Source/Render/Primitives/AuxiliarySubmission.cpp": 0, "Source/Render/Primitives/DepthAlpha.cpp": 0, "Source/Render/Primitives/LightmappedPrimitive.cpp": 0, "Source/Render/Primitives/RenderCommandPool.cpp": 0, @@ -798,46 +802,44 @@ "Source/Render/Primitives/RenderQueues.cpp": 0, "Source/Render/Primitives/RenderVertexPool.cpp": 0, "Source/Render/Primitives/ScreenLine.cpp": 0, + "Source/Render/Primitives/SpriteQuad.cpp": 0, + "Source/Render/Primitives/TextureQuad.cpp": 0, "Source/Render/Primitives/UIRPData.cpp": 0, + "Source/Render/Primitives/UIRPDataDrawing.cpp": 0, "Source/Render/Projection/RenderProjection.cpp": 0, "Source/Render/Projection/RenderRay.cpp": 0, "Source/Render/Projection/RendererViewport.cpp": 0, - "Source/Render/RenderAdapter.cpp": 0, - "Source/Render/RenderBackends.cpp": 0, + "Source/Render/Projection/ScreenGeometry.cpp": 0, + "Source/Render/Projection/ScreenRectangle.cpp": 0, + "Source/Render/Projection/ViewportProjection.cpp": 0, "Source/Render/Renderer.cpp": 0, - "Source/Render/RendererDX7.cpp": 0, - "Source/Render/ScreenGeometry.cpp": 0, - "Source/Render/ScreenRectangle.cpp": 0, - "Source/Render/SpriteGeometry.cpp": 0, - "Source/Render/SpriteQuad.cpp": 0, "Source/Render/Text/EmbedFont.cpp": 0, "Source/Render/Text/FontCache.cpp": 0, "Source/Render/Text/TextContext.cpp": 0, - "Source/Render/TextureQuad.cpp": 0, "Source/Render/Textures/BitmapPixels.cpp": 0, "Source/Render/Textures/BitmapTextureCache.cpp": 0, "Source/Render/Textures/SpriteAtlas.cpp": 0, "Source/Render/Textures/Surface.cpp": 0, "Source/Render/Textures/Texture.cpp": 0, "Source/Render/Textures/TextureCache.cpp": 3, - "Source/Render/UIRPDataDrawing.cpp": 0, - "Source/Render/ViewportProjection.cpp": 0, "Source/Resource/Audio/WaveResource.cpp": 3, "Source/Resource/Bitmap/BitmapImage.cpp": 3, "Source/Resource/Bitmap/BitmapImageJpeg.cpp": 3, "Source/Resource/Bitmap/BitmapImagePng.cpp": 3, "Source/Resource/Bitmap/BitmapResource.cpp": 3, - "Source/Resource/EZeffectResource.cpp": 3, - "Source/Resource/EmblemResource.cpp": 3, - "Source/Resource/GifLzw.cpp": 3, - "Source/Resource/GifResource.cpp": 3, - "Source/Resource/ImfLayerIndex.cpp": 3, - "Source/Resource/ImfResource.cpp": 3, + "Source/Resource/Bitmap/EmblemResource.cpp": 3, + "Source/Resource/Bitmap/GifLzw.cpp": 3, + "Source/Resource/Bitmap/GifResource.cpp": 3, + "Source/Resource/Bitmap/PaletteResource.cpp": 3, + "Source/Resource/Bitmap/SkinPalette.cpp": 3, + "Source/Resource/Bitmap/TextureNames.cpp": 3, + "Source/Resource/Effects/EZeffectResource.cpp": 3, + "Source/Resource/Json/JsonCppLoader.cpp": 0, "Source/Resource/Models/AnimatedModelResource.cpp": 3, "Source/Resource/Models/ModelMesh.cpp": 3, "Source/Resource/Models/ModelResource.cpp": 3, "Source/Resource/Models/ModelResourceV2.cpp": 3, - "Source/Resource/PaletteResource.cpp": 3, + "Source/Resource/Models/RmaResource.cpp": 3, "Source/Resource/Resource.cpp": 3, "Source/Resource/ResourceAliases.cpp": 3, "Source/Resource/ResourceFailures.cpp": 3, @@ -845,29 +847,33 @@ "Source/Resource/ResourcePreload.cpp": 3, "Source/Resource/ResourcePresence.cpp": 3, "Source/Resource/ResourceTransient.cpp": 3, - "Source/Resource/RmaResource.cpp": 3, - "Source/Resource/SkinPalette.cpp": 3, "Source/Resource/Sprites/ActionResource.cpp": 3, + "Source/Resource/Sprites/ImfLayerIndex.cpp": 3, + "Source/Resource/Sprites/ImfResource.cpp": 3, "Source/Resource/Sprites/SpriteEncoding.cpp": 3, "Source/Resource/Sprites/SpriteResource.cpp": 3, - "Source/Resource/TextureNames.cpp": 3, "Source/Resource/World/GroundResource.cpp": 3, "Source/Resource/World/TerrainResource.cpp": 3, "Source/Resource/World/WorldResource.cpp": 3, - "Source/Resource/XmlNode.cpp": 3, - "Source/Resource/XmlParsing.cpp": 3, + "Source/Resource/Xml/XmlNode.cpp": 3, + "Source/Resource/Xml/XmlParsing.cpp": 3, "Source/Script/LuaFileOperations.cpp": 5, "Source/Script/LuaInstance.cpp": 5, "Source/Script/LuaScript.cpp": 5, "Source/Script/NLuaState.cpp": 5, + "Source/Security/FileSignatureVerifier.cpp": 10, "Source/Security/NProtectGameGuardMgr.cpp": 4, + "Source/Security/ProcessSecurity.cpp": 0, "Source/Security/ReassemblyPacketMgr.cpp": 4, "Source/Security/SecondPwdRandom.cpp": 4, "Source/Security/ThemidaMgr.cpp": 4, + "Source/Security/UnknownA68.cpp": 1, "Source/UI/Acceptance/UIChooseSellBuyWnd.cpp": 2, "Source/UI/Acceptance/UIExchangeAcceptWnd.cpp": 2, "Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp": 2, + "Source/UI/Achievement/UIAchWnd.cpp": 2, "Source/UI/AdventureGuide/UIAdventureGuide.cpp": 2, + "Source/UI/Buttons/UIBalloonOpenBtn.cpp": 2, "Source/UI/Buttons/UIBasicButton.cpp": 2, "Source/UI/Buttons/UIBitmapButton.cpp": 2, "Source/UI/Buttons/UIBmpRadioBtn.cpp": 2, @@ -876,34 +882,43 @@ "Source/UI/Buttons/UIButton.cpp": 2, "Source/UI/Buttons/UICheckBox.cpp": 2, "Source/UI/Buttons/UIColorButton.cpp": 2, - "Source/UI/Buttons/UIDescriptRace.cpp": 2, - "Source/UI/Buttons/UIItemMoveInfo.cpp": 2, - "Source/UI/Buttons/UIJobSlotButton.cpp": 2, + "Source/UI/Buttons/UIMiniBtnWnd.cpp": 2, "Source/UI/Buttons/UINaviLinkButton.cpp": 2, "Source/UI/Buttons/UINoneVisibleButton.cpp": 2, "Source/UI/Buttons/UIRadioBtn.cpp": 2, + "Source/UI/Buttons/UISlotBitmap.cpp": 2, "Source/UI/Buttons/UISlotBmpButton.cpp": 2, + "Source/UI/Buttons/UIStaticBitmap.cpp": 2, + "Source/UI/Buttons/UIStaticItem.cpp": 2, "Source/UI/Buttons/UITagButton.cpp": 2, "Source/UI/Buttons/UITextButton.cpp": 2, "Source/UI/Buttons/UITextureButton.cpp": 2, "Source/UI/CashShop/UICashShopWnd.cpp": 2, + "Source/UI/CashShop/UIMileageWnd.cpp": 2, "Source/UI/Chat/ChatSuggestions.cpp": 2, "Source/UI/Chat/UIChatRoomMakeWnd.cpp": 2, "Source/UI/Chat/UIChatRoomTitle.cpp": 2, "Source/UI/Chat/UINewChatWnd.cpp": 2, "Source/UI/Chat/UISubChatHisWnd.cpp": 2, "Source/UI/Chat/UIWhisperWnd.cpp": 2, + "Source/UI/Chat/UIZeroChatWnd.cpp": 2, "Source/UI/Clan/UIClanWnd.cpp": 2, "Source/UI/Cooldowns/CooldownDrawing.cpp": 2, "Source/UI/Cooldowns/CooldownOwner.cpp": 2, "Source/UI/Cooldowns/CooldownState.cpp": 2, + "Source/UI/Dialogs/UIAccountLimitedToolWnd.cpp": 2, "Source/UI/Dialogs/UIChooseWnd.cpp": 2, "Source/UI/Dialogs/UIEditctrlWnd.cpp": 2, - "Source/UI/Dialogs/UIEmailAddressWnd.cpp": 2, - "Source/UI/Dialogs/UIGraffiStrboxWnd.cpp": 2, - "Source/UI/Dialogs/UIMinimapZoomWnd.cpp": 2, - "Source/UI/Dialogs/UIPasswordWnd.cpp": 2, - "Source/UI/Dialogs/UIWaitDBSaveWnd.cpp": 2, + "Source/UI/Dialogs/UILocaleTextWnd.cpp": 2, + "Source/UI/Dialogs/UIMessageBox.cpp": 2, + "Source/UI/Dialogs/UINormalMB.cpp": 2, + "Source/UI/Dialogs/UINoteWnd.cpp": 2, + "Source/UI/Dialogs/UINoticeWnd.cpp": 2, + "Source/UI/Dialogs/UIRPImageWnd.cpp": 2, + "Source/UI/Dialogs/UIRPImageWnd2.cpp": 2, + "Source/UI/Dialogs/UITransMenuWnd.cpp": 2, + "Source/UI/Dialogs/UIVideoWnd.cpp": 2, + "Source/UI/Dialogs/UIWordDisplayWnd.cpp": 2, "Source/UI/Edit/EditTextState.cpp": 2, "Source/UI/Edit/EditViewport.cpp": 2, "Source/UI/Edit/ItemTagRetirement.cpp": 2, @@ -919,26 +934,47 @@ "Source/UI/Emotion/UIEmotionWnd.cpp": 2, "Source/UI/Enchant/UIEnchantUI.cpp": 2, "Source/UI/EntryQueue/UIEntryQueueWnd.cpp": 2, + "Source/UI/Events/UICheckAttendanceWnd.cpp": 2, + "Source/UI/Events/UIOpenRoulletteWnd.cpp": 2, + "Source/UI/Events/UIRoulletteWnd.cpp": 2, "Source/UI/Exchange/UIExchangeUI.cpp": 2, - "Source/UI/FrameSkin.cpp": 2, "Source/UI/GameSettings/GameSettingsUI.cpp": 2, + "Source/UI/GameSettings/UIBattleMsgOptionWnd.cpp": 2, + "Source/UI/GameSettings/UIEscOptionWnd.cpp": 2, + "Source/UI/GameSettings/UIHotKeyWnd.cpp": 2, + "Source/UI/GameSettings/UIHotkeyGuideWnd.cpp": 2, + "Source/UI/GameSettings/UIViewCameraInfoWnd.cpp": 2, + "Source/UI/Gauges/UIBarGraph.cpp": 2, "Source/UI/Gauges/UIPetInfoBarGraph.cpp": 2, "Source/UI/Gauges/UIPlayerGage.cpp": 2, "Source/UI/Guild/UIAgitWnd.cpp": 2, + "Source/UI/Guild/UIEmblemWnd.cpp": 2, "Source/UI/Guild/UIGuildHelperWnd.cpp": 2, "Source/UI/Guild/UIGuildWnd.cpp": 2, "Source/UI/Guild/UIGuild_Storage_Log.cpp": 2, - "Source/UI/Item/UIEquipmentPropertiesWnd.cpp": 2, - "Source/UI/Item/UIItemStoreWnd.cpp": 2, - "Source/UI/Item/UIMerchantItemLogWnd.cpp": 2, - "Source/UI/Item/UIParaItemShopWnd.cpp": 2, "Source/UI/Items/MergeItemWnd.cpp": 2, + "Source/UI/Items/UIChangeMaterialWnd.cpp": 2, + "Source/UI/Items/UICollectionSystemWnd.cpp": 2, + "Source/UI/Items/UIEquipmentPropertiesWnd.cpp": 2, "Source/UI/Items/UIGameItem.cpp": 2, + "Source/UI/Items/UIGradeEnchantWnd.cpp": 2, "Source/UI/Items/UIIllustWnd.cpp": 2, + "Source/UI/Items/UIItemMoveInfo.cpp": 2, "Source/UI/Items/UIItemParamChangeDisplayWnd.cpp": 2, + "Source/UI/Items/UIItemReformWnd.cpp": 2, "Source/UI/Items/UIItemRepairWnd.cpp": 2, + "Source/UI/Items/UIItemStoreComboBox.cpp": 2, + "Source/UI/Items/UIItemStoreWnd.cpp": 2, + "Source/UI/Items/UILapineBoxWnd.cpp": 2, + "Source/UI/Items/UILapineScrollBar.cpp": 2, + "Source/UI/Items/UILapineUpgradeBoxWnd.cpp": 2, "Source/UI/Items/UIMakeTargetListWnd.cpp": 2, "Source/UI/Items/UIMakeTargetProcessWnd.cpp": 2, + "Source/UI/Items/UIMerchantItemLogWnd.cpp": 2, + "Source/UI/Items/UIParaItemShopWnd.cpp": 2, + "Source/UI/Items/UIPreviewEquipWnd.cpp": 2, + "Source/UI/Items/UIRefiningWnd.cpp": 2, + "Source/UI/Items/UISecondCostumeWnd.cpp": 2, "Source/UI/Items/UISwapEquipmentWnd.cpp": 2, "Source/UI/Items/UIWeaponRefineWnd.cpp": 2, "Source/UI/Layout/SnapMgr.cpp": 2, @@ -953,31 +989,56 @@ "Source/UI/Lists/UIComboBoxEx.cpp": 2, "Source/UI/Lists/UIComboBoxV2Wnd.cpp": 2, "Source/UI/Lists/UIDropDownBox.cpp": 2, - "Source/UI/Lists/UIItemStoreComboBox.cpp": 2, "Source/UI/Lists/UIListBox.cpp": 2, "Source/UI/Lists/UIListBoxEx.cpp": 2, "Source/UI/Lists/UIListBoxID.cpp": 2, - "Source/UI/Lists/UIListBoxNavi.cpp": 2, "Source/UI/Lists/UINewComboBoxCtrl.cpp": 2, - "Source/UI/Lists/UIPackageBoxNameList.cpp": 2, "Source/UI/Lists/UIScrollBar.cpp": 2, - "Source/UI/Lists/UIScrollBarNavi.cpp": 2, + "Source/UI/Lists/UIScrollWnd.cpp": 2, "Source/UI/Lists/UITagListBox.cpp": 2, "Source/UI/Lists/UITreeView.cpp": 2, + "Source/UI/Login/FuncDrawWNDChar.cpp": 2, + "Source/UI/Login/UIChangeNameWnd.cpp": 2, + "Source/UI/Login/UIDescriptRace.cpp": 2, + "Source/UI/Login/UIEmailAddressWnd.cpp": 2, + "Source/UI/Login/UILoginWnd.cpp": 2, + "Source/UI/Login/UINewMakeCharWnd.cpp": 2, + "Source/UI/Login/UINewSelectCharWnd.cpp": 2, + "Source/UI/Login/UIPasswordWnd.cpp": 2, + "Source/UI/Login/UISelCharForUServerWnd.cpp": 2, + "Source/UI/Login/UIWaitDBSaveWnd.cpp": 2, + "Source/UI/Macro/UICaptchaPreviewWnd.cpp": 2, + "Source/UI/Macro/UICaptchaRegisterWnd.cpp": 2, + "Source/UI/Macro/UIMacroBlackListCheckWnd.cpp": 2, + "Source/UI/Macro/UIMacroDetectorWnd.cpp": 2, + "Source/UI/Macro/UIMacroReport.cpp": 2, + "Source/UI/Macro/UIMacroUserInfoWnd.cpp": 2, "Source/UI/Menu/UIMenuIconWnd.cpp": 2, - "Source/UI/MiniPartyGrid.cpp": 2, - "Source/UI/MiniPartyManager.cpp": 2, - "Source/UI/MiniPartyPlacement.cpp": 2, - "Source/UI/MiniPartyUsableArea.cpp": 2, + "Source/UI/Navigation/NavigationLink.cpp": 2, + "Source/UI/Navigation/UIListBoxNavi.cpp": 2, + "Source/UI/Navigation/UIMinimapZoomWnd.cpp": 2, + "Source/UI/Navigation/UINavigationHelpWnd.cpp": 2, "Source/UI/Navigation/UINavigationV4Wnd.cpp": 2, + "Source/UI/Navigation/UINavigationWnd.cpp": 2, + "Source/UI/Navigation/UIRoMapWnd.cpp": 2, + "Source/UI/Navigation/UIScrollBarNavi.cpp": 2, + "Source/UI/Navigation/UIShowWarpWnd.cpp": 2, + "Source/UI/Party/MiniPartyGrid.cpp": 2, + "Source/UI/Party/MiniPartyManager.cpp": 2, + "Source/UI/Party/MiniPartyPlacement.cpp": 2, + "Source/UI/Party/MiniPartyUsableArea.cpp": 2, "Source/UI/Party/UIAdvenPartyBoardWnd.cpp": 2, "Source/UI/Party/UIApplyForPartyWnd.cpp": 2, + "Source/UI/Party/UIJobSlotButton.cpp": 2, "Source/UI/Party/UIMiniPartyWnd.cpp": 2, + "Source/UI/Party/UIPartyBookingHelpWnd.cpp": 2, "Source/UI/Party/UIPartyInfoWnd.cpp": 2, "Source/UI/Party/UIRegisterPartyWnd.cpp": 2, "Source/UI/Party/UIRequestJoinPartyMgr.cpp": 2, "Source/UI/Party/UIRequestJoinPartyWnd.cpp": 2, - "Source/UI/PriceCommission.cpp": 2, + "Source/UI/Party/UISeekPartyListWnd.cpp": 2, + "Source/UI/Party/UISeekPartyMBWnd.cpp": 2, + "Source/UI/Party/UISeekPartyWnd.cpp": 2, "Source/UI/ProbabilityTable/UIProbabilityTable.cpp": 2, "Source/UI/ProbabilityTable/UIProbabilityTableEvents.cpp": 2, "Source/UI/Quest/UIOngoingQuestInfo.cpp": 2, @@ -985,14 +1046,21 @@ "Source/UI/Quest/UIRecommendedQuestInfo.cpp": 2, "Source/UI/Quest/UIRenewQuestUI.cpp": 2, "Source/UI/Quest/UIRenewQuestWnd.cpp": 2, + "Source/UI/Repute/UIReputeWnd.cpp": 2, + "Source/UI/Rodex/UIOpenMailBoxWnd.cpp": 2, "Source/UI/Rodex/UIRodexComposeWnd.cpp": 2, + "Source/UI/Rodex/UIRodexContentsWnd.cpp": 2, "Source/UI/Rodex/UIRodexInboxWnd.cpp": 2, "Source/UI/RuneSystem/UIRuneSystemWnd.cpp": 2, + "Source/UI/SelectPackageItemBox/UIPackageBoxNameList.cpp": 2, "Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp": 2, "Source/UI/Shop/ItemDrawing.cpp": 2, "Source/UI/Shop/MerchantShopRefresh.cpp": 2, "Source/UI/Shop/PriceColor.cpp": 2, + "Source/UI/Shop/PriceCommission.cpp": 2, + "Source/UI/Shop/UIBartermarketWnd.cpp": 2, "Source/UI/Shop/UIMerchantShopTitle.cpp": 2, + "Source/UI/Shop/UISerachStoreInfoWnd.cpp": 2, "Source/UI/Shortcuts/NormalItemSlotLoad.cpp": 2, "Source/UI/Shortcuts/ShortcutActivation.cpp": 2, "Source/UI/Shortcuts/ShortcutBindings.cpp": 2, @@ -1007,18 +1075,28 @@ "Source/UI/Shortcuts/ShortcutVisibility.cpp": 2, "Source/UI/Shortcuts/UIQuickSlotWnd.cpp": 2, "Source/UI/Shortcuts/UIShortCutWnd.cpp": 2, + "Source/UI/Skill/UIDebuffRemoveWnd.cpp": 2, + "Source/UI/Skill/UIGraffiStrboxWnd.cpp": 2, + "Source/UI/Skill/UINewSkillListWnd.cpp": 2, + "Source/UI/Skill/UINewSkillListWndHitTest.cpp": 2, "Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp": 2, + "Source/UI/Status/UIBasicInfoWnd.cpp": 2, + "Source/UI/Status/UIJobListWnd.cpp": 2, + "Source/UI/Status/UIPetEvolutionWnd.cpp": 2, + "Source/UI/Status/UIRebirthWnd.cpp": 2, "Source/UI/StylingShop/UIStylingShopWnd.cpp": 2, "Source/UI/Text/ColoredText.cpp": 2, "Source/UI/Text/ItemLinkDisplay.cpp": 2, - "Source/UI/Text/NavigationLink.cpp": 2, "Source/UI/Text/PixelTextWrapping.cpp": 2, "Source/UI/Text/TextFitting.cpp": 2, "Source/UI/Text/TextMarkup.cpp": 2, + "Source/UI/Text/TextTagExtraction.cpp": 2, + "Source/UI/Text/TextTagRegistry.cpp": 2, "Source/UI/Text/TextWrapping.cpp": 2, - "Source/UI/Text/UIAchWnd.cpp": 2, "Source/UI/Text/UIBalloonText.cpp": 2, + "Source/UI/Text/UIBroadcastBalloon.cpp": 2, "Source/UI/Text/UICharInfoBalloonText.cpp": 2, + "Source/UI/Text/UIRoundBoxTooltipWnd.cpp": 2, "Source/UI/Text/UIStaticText.cpp": 2, "Source/UI/Text/UIStaticText_LF.cpp": 2, "Source/UI/Text/UITagTextViewer.cpp": 2, @@ -1026,109 +1104,35 @@ "Source/UI/Text/UITextViewerLinks.cpp": 2, "Source/UI/Text/UITextViewerMessages.cpp": 2, "Source/UI/Text/UITransBalloonText.cpp": 2, - "Source/UI/TextTagExtraction.cpp": 2, - "Source/UI/TextTagRegistry.cpp": 2, - "Source/UI/UIBarGraph.cpp": 2, - "Source/UI/UIBartermarketWnd.cpp": 2, - "Source/UI/UIBasicCtrl.cpp": 2, - "Source/UI/UIBroadcastBalloon.cpp": 2, - "Source/UI/UICaptchaPreviewWnd.cpp": 2, - "Source/UI/UICaptchaRegisterWnd.cpp": 2, - "Source/UI/UIChangeMaterialWnd.cpp": 2, - "Source/UI/UICheckAttendanceWnd.cpp": 2, - "Source/UI/UIGradeEnchantWnd.cpp": 2, - "Source/UI/UIHotkeyGuideWnd.cpp": 2, - "Source/UI/UIItemReformWnd.cpp": 2, - "Source/UI/UILapineBoxWnd.cpp": 2, - "Source/UI/UILapineScrollBar.cpp": 2, - "Source/UI/UILapineUpgradeBoxWnd.cpp": 2, - "Source/UI/UIMacroBlackListCheckWnd.cpp": 2, - "Source/UI/UIMacroDetectorWnd.cpp": 2, - "Source/UI/UIMacroReport.cpp": 2, - "Source/UI/UIMacroUserInfoWnd.cpp": 2, - "Source/UI/UIPreviewEquipWnd.cpp": 2, - "Source/UI/UIRefiningWnd.cpp": 2, - "Source/UI/UIReputeWnd.cpp": 2, - "Source/UI/UIRoundBoxTooltipWnd.cpp": 2, - "Source/UI/UIScrollWnd.cpp": 2, - "Source/UI/UISlotBitmap.cpp": 2, - "Source/UI/UIStaticBitmap.cpp": 2, - "Source/UI/UIStaticItem.cpp": 2, "Source/UI/Window/FrameFocus.cpp": 2, + "Source/UI/Window/FrameSkin.cpp": 2, "Source/UI/Window/FrameTextCache.cpp": 2, - "Source/UI/Window/FuncDrawWNDChar.cpp": 2, "Source/UI/Window/InputFocus.cpp": 2, - "Source/UI/Window/UIAccountLimitedToolWnd.cpp": 2, - "Source/UI/Window/UIBalloonOpenBtn.cpp": 2, - "Source/UI/Window/UIBasicInfoWnd.cpp": 2, - "Source/UI/Window/UIBattleMsgOptionWnd.cpp": 2, + "Source/UI/Window/UIBasicCtrl.cpp": 2, "Source/UI/Window/UIBitmapTab.cpp": 2, - "Source/UI/Window/UIChangeNameWnd.cpp": 2, - "Source/UI/Window/UICollectionSystemWnd.cpp": 2, "Source/UI/Window/UIControl.cpp": 2, - "Source/UI/Window/UIDebuffRemoveWnd.cpp": 2, - "Source/UI/Window/UIEmblemWnd.cpp": 2, - "Source/UI/Window/UIEscOptionWnd.cpp": 2, "Source/UI/Window/UIFrameWnd.cpp": 2, - "Source/UI/Window/UIHotKeyWnd.cpp": 2, - "Source/UI/Window/UIJobListWnd.cpp": 2, - "Source/UI/Window/UILocaleTextWnd.cpp": 2, - "Source/UI/Window/UILoginWnd.cpp": 2, - "Source/UI/Window/UIMessageBox.cpp": 2, - "Source/UI/Window/UIMileageWnd.cpp": 2, - "Source/UI/Window/UIMiniBtnWnd.cpp": 2, - "Source/UI/Window/UINavigationHelpWnd.cpp": 2, - "Source/UI/Window/UINavigationWnd.cpp": 2, - "Source/UI/Window/UINewMakeCharWnd.cpp": 2, - "Source/UI/Window/UINewSelectCharWnd.cpp": 2, - "Source/UI/Window/UINewSkillListWnd.cpp": 2, - "Source/UI/Window/UINewSkillListWndHitTest.cpp": 2, - "Source/UI/Window/UINormalMB.cpp": 2, - "Source/UI/Window/UINoteWnd.cpp": 2, - "Source/UI/Window/UINoticeWnd.cpp": 2, - "Source/UI/Window/UIOpenMailBoxWnd.cpp": 2, - "Source/UI/Window/UIOpenRoulletteWnd.cpp": 2, - "Source/UI/Window/UIPartyBookingHelpWnd.cpp": 2, - "Source/UI/Window/UIPetEvolutionWnd.cpp": 2, - "Source/UI/Window/UIRPImageWnd.cpp": 2, - "Source/UI/Window/UIRPImageWnd2.cpp": 2, - "Source/UI/Window/UIRebirthWnd.cpp": 2, "Source/UI/Window/UIRegisterMgr.cpp": 2, "Source/UI/Window/UIResizer.cpp": 2, - "Source/UI/Window/UIRoMapWnd.cpp": 2, - "Source/UI/Window/UIRodexContentsWnd.cpp": 2, - "Source/UI/Window/UIRoulletteWnd.cpp": 2, - "Source/UI/Window/UISecondCostumeWnd.cpp": 2, - "Source/UI/Window/UISeekPartyListWnd.cpp": 2, - "Source/UI/Window/UISeekPartyMBWnd.cpp": 2, - "Source/UI/Window/UISeekPartyWnd.cpp": 2, - "Source/UI/Window/UISelCharForUServerWnd.cpp": 2, - "Source/UI/Window/UISerachStoreInfoWnd.cpp": 2, - "Source/UI/Window/UIShowWarpWnd.cpp": 2, "Source/UI/Window/UITab.cpp": 2, - "Source/UI/Window/UITransMenuWnd.cpp": 2, - "Source/UI/Window/UIVideoWnd.cpp": 2, - "Source/UI/Window/UIViewCameraInfoWnd.cpp": 2, "Source/UI/Window/UIWindow.cpp": 2, "Source/UI/Window/UIWindowFactory.cpp": 2, "Source/UI/Window/UIWindowMgr.cpp": 2, - "Source/UI/Window/UIWordDisplayWnd.cpp": 2, - "Source/UI/Window/UIZeroChatWnd.cpp": 2, "Source/UI/Window/WindowAncestry.cpp": 2, + "Source/UI/Window/WindowBackground.cpp": 2, "Source/UI/Window/WindowBorder.cpp": 2, "Source/UI/Window/WindowDialogs.cpp": 2, "Source/UI/Window/WindowFrameUpdate.cpp": 2, + "Source/UI/Window/WindowLowerBorder.cpp": 2, "Source/UI/Window/WindowMgrState.cpp": 2, "Source/UI/Window/WindowMouseHit.cpp": 2, "Source/UI/Window/WindowOrdering.cpp": 2, + "Source/UI/Window/WindowOverlay.cpp": 2, "Source/UI/Window/WindowPolicy.cpp": 2, "Source/UI/Window/WindowRegistration.cpp": 2, "Source/UI/Window/WindowRetirement.cpp": 2, - "Source/UI/WindowBackground.cpp": 2, - "Source/UI/WindowLowerBorder.cpp": 2, - "Source/UI/WindowOverlay.cpp": 2, - "Source/UI/WindowSprite.cpp": 2, - "Source/UI/WindowTitlebar.cpp": 2, + "Source/UI/Window/WindowSprite.cpp": 2, + "Source/UI/Window/WindowTitlebar.cpp": 2, "Source/Utility/AES.cpp": 0, "Source/Utility/Async/AsyncDiagnostic.cpp": 0, "Source/Utility/Async/NAsyncWork.cpp": 0, @@ -1139,48 +1143,44 @@ "Source/Utility/Async/NMessageQueue.cpp": 0, "Source/Utility/Async/NObject.cpp": 0, "Source/Utility/Async/NRecycleObjectPoolMgr.cpp": 0, - "Source/Utility/CRC32.cpp": 10, + "Source/Utility/BoolStubs.cpp": 4, "Source/Utility/Cipher/AES.cpp": 0, "Source/Utility/Cipher/CipherPrimitives.cpp": 0, "Source/Utility/Cipher/Rijndael.cpp": 0, "Source/Utility/Cipher/Tiger.cpp": 0, "Source/Utility/Cipher/XorBytes.cpp": 0, - "Source/Utility/FileSignatureVerifier.cpp": 10, - "Source/Utility/GGHash.cpp": 10, - "Source/Utility/GGHashMgr.cpp": 0, - "Source/Utility/GuidParse.cpp": 0, + "Source/Utility/Hash/CRC32.cpp": 10, + "Source/Utility/Hash/GGHash.cpp": 10, + "Source/Utility/Hash/GGHashMgr.cpp": 0, "Source/Utility/Hash/MD5.cpp": 10, + "Source/Utility/Hash/Md5State.cpp": 0, + "Source/Utility/Hash/SHA3.cpp": 0, + "Source/Utility/Hash/XxHash3.cpp": 0, "Source/Utility/Hash/XxHash32.cpp": 0, - "Source/Utility/JsonCppLoader.cpp": 0, "Source/Utility/Lexicon/LexiconBoundary.cpp": 0, "Source/Utility/Lexicon/LexiconMatcher.cpp": 0, "Source/Utility/Lexicon/LexiconSerializer.cpp": 0, + "Source/Utility/Lexicon/LexiconTrie.cpp": 4, "Source/Utility/Math/AffineLookAt.cpp": 0, "Source/Utility/Math/AffineMatrix.cpp": 0, "Source/Utility/Math/ClientAngles.cpp": 0, "Source/Utility/Math/Int64Math.cpp": 0, "Source/Utility/Math/RadialGrid.cpp": 0, "Source/Utility/Math/RayTriangle.cpp": 0, - "Source/Utility/Md5State.cpp": 0, - "Source/Utility/NFileLog.cpp": 0, - "Source/Utility/NIPAddr.cpp": 0, - "Source/Utility/ProcessSecurity.cpp": 0, "Source/Utility/Random/RandomBytes.cpp": 0, - "Source/Utility/RegistryKey.cpp": 0, - "Source/Utility/SHA3.cpp": 0, "Source/Utility/Text/Base64.cpp": 0, "Source/Utility/Text/FormatString.cpp": 0, "Source/Utility/Text/GroupedInteger.cpp": 0, + "Source/Utility/Text/GuidParse.cpp": 0, "Source/Utility/Text/HexString.cpp": 0, "Source/Utility/Text/LanguageCharset.cpp": 0, "Source/Utility/Text/StringUtil.cpp": 0, "Source/Utility/Text/TextEscapes.cpp": 0, "Source/Utility/Text/TextTokens.cpp": 0, + "Source/Utility/Text/Tokenizer.cpp": 0, "Source/Utility/Threading/NSyncObject.cpp": 0, "Source/Utility/Threading/NThread.cpp": 0, "Source/Utility/Timestamp.cpp": 0, - "Source/Utility/Tokenizer.cpp": 0, - "Source/Utility/XxHash3.cpp": 0, "ThirdParty/BasicExcel/BasicExcel.cpp": 11, "ThirdParty/jsoncpp/src/lib_json/json_reader.cpp": 8, "ThirdParty/jsoncpp/src/lib_json/json_value.cpp": 8,