From 20ae1c861d4f1d19463e6e45e26457eb0bf5b024 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Tue, 10 Nov 2026 23:40:35 +0000 Subject: [PATCH] Maintenance: Source reorganisation, part 1 of 3: Source/Contents into feature folders (375 units/headers moved). Path-only; includes Batch #16619 by ragnarok-clanker: forced by an admin (1 lower score(s), 13 changed function(s)); checked with 460 compiled unit(s), including every includer of Source/Client/Mode/CGameMode.h, Source/Contents/Achievement/AchievementMgr.h, Source/Contents/Actors/ActorNameCard.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GndRiser.h, Source/Contents/Actors/GroundScope.h, Source/Contents/Actors/Item.h, Source/Contents/Actors/PlayerNameDictionary.h, Source/Contents/Actors/Resources/EquipmentResourceMgr.h, Source/Contents/AdventureGuide/AdventureGuideMgr.h, Source/Contents/CashEmotion/CashEmotionMgr.h, Source/Contents/Clan/ClanInfo.h, Source/Contents/CombatTypes.h, Source/Contents/Configuration/ConfigMgr.h, Source/Contents/Effects/Core/CellRangeEffect.h, Source/Contents/Effects/Core/ChangeSizeEffect.h, Source/Contents/Effects/Core/DummyEffectLauncher.h, Source/Contents/Effects/Core/Effect.h, Source/Contents/Effects/Core/EffectActor.h, Source/Contents/Effects/Core/EffectLists.h, Source/Contents/Effects/Core/EffectMaker.h, Source/Contents/Effects/Core/EffectMemoryMgr.h, Source/Contents/Effects/Core/EffectMessageId.h, Source/Contents/Effects/Core/EffectPoint.h, Source/Contents/Effects/Core/EffectPrimId.h, Source/Contents/Effects/Core/EffectTypes.h, Source/Contents/Effects/Core/MsgEffect.h, Source/Contents/Effects/Core/RagEffect.h, Source/Contents/Effects/Core/RagEffectState.h, Source/Contents/Effects/Core/ShowEffect.h, Source/Contents/Effects/Core/SquareRangeEffect.h, Source/Contents/Effects/EffectResourceSwitcher.h, Source/Contents/Effects/Particles/AnimatedEmitterEffect.h, Source/Contents/Effects/Particles/CharacterParticleBundle.h, Source/Contents/Effects/Particles/EZ2STREffect.h, Source/Contents/Effects/Particles/EZ2STREffectEx.h, Source/Contents/Effects/Particles/EffectEmitter.h, Source/Contents/Effects/Particles/EmitterEffect.h, Source/Contents/Effects/Particles/Particle.h, Source/Contents/Effects/Particles/ParticlePool.h, Source/Contents/Effects/Particles/SpriteEffect.h, Source/Contents/Effects/Particles/SpriteParticle.h, Source/Contents/Effects/Primitives/EffectPrim.h, Source/Contents/Effects/Primitives/EffectPrimitiveMotion.h, Source/Contents/Effects/Primitives/EffectPrimitiveState.h, Source/Contents/Effects/RDamageVar.h, Source/Contents/Effects/Skills/AMachineEffect.h, Source/Contents/Effects/Skills/AcidifiedThrow.h, Source/Contents/Effects/Skills/ArrowEffect.h, Source/Contents/Effects/Skills/AstralStrikeEffect.h, Source/Contents/Effects/Skills/AxeBoomerang.h, Source/Contents/Effects/Skills/Bash.h, Source/Contents/Effects/Skills/BezierArcThrowEffect.h, Source/Contents/Effects/Skills/BindTrapEffect.h, Source/Contents/Effects/Skills/BlastForge.h, Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.h, Source/Contents/Effects/Skills/CartCannon.h, Source/Contents/Effects/Skills/ChargingPierceEffect.h, Source/Contents/Effects/Skills/CherryBlossomEffect.h, Source/Contents/Effects/Skills/ClimaxEffect.h, Source/Contents/Effects/Skills/CloudEffect.h, Source/Contents/Effects/Skills/CloudKillEffect.h, Source/Contents/Effects/Skills/CommonFloorEffect.h, Source/Contents/Effects/Skills/Competentia.h, Source/Contents/Effects/Skills/CresciveBolt.h, Source/Contents/Effects/Skills/ElectricEffect.h, Source/Contents/Effects/Skills/EnergyOrbEffect.h, Source/Contents/Effects/Skills/EvilLandEffect.h, Source/Contents/Effects/Skills/EvilsPawEffect.h, Source/Contents/Effects/Skills/FlowerCastingEffect.h, Source/Contents/Effects/Skills/FortuneKissEffect.h, Source/Contents/Effects/Skills/FriggSongEffect.h, Source/Contents/Effects/Skills/FuumaShouakuEffect.h, Source/Contents/Effects/Skills/GlassWallEffect.h, Source/Contents/Effects/Skills/GravityControlEffect.h, Source/Contents/Effects/Skills/HealEffect.h, Source/Contents/Effects/Skills/HealSpEffect.h, Source/Contents/Effects/Skills/HitLineEffect.h, Source/Contents/Effects/Skills/JupitelThunderStormEffect.h, Source/Contents/Effects/Skills/Level150Effect.h, Source/Contents/Effects/Skills/Level99Effect.h, Source/Contents/Effects/Skills/Level99Orb1Effect.h, Source/Contents/Effects/Skills/Level99Orb2Effect.h, Source/Contents/Effects/Skills/LightSphereEffect.h, Source/Contents/Effects/Skills/MagicFloorEffect.h, Source/Contents/Effects/Skills/MagnumBreak.h, Source/Contents/Effects/Skills/MandraAttackEffect.h, Source/Contents/Effects/Skills/MapChainEffect.h, Source/Contents/Effects/Skills/MapMagicZoneEffect.h, Source/Contents/Effects/Skills/MappillarEffect.h, Source/Contents/Effects/Skills/MonsterSkillEffects.h, Source/Contents/Effects/Skills/NyanggrassEffect.h, Source/Contents/Effects/Skills/PartyMemberEffects.h, Source/Contents/Effects/Skills/PokJukEffect.h, Source/Contents/Effects/Skills/PowderingEffect.h, Source/Contents/Effects/Skills/RainbowEffect.h, Source/Contents/Effects/Skills/RectUpEffect.h, Source/Contents/Effects/Skills/RedLineEffect.h, Source/Contents/Effects/Skills/RichManKim.h, Source/Contents/Effects/Skills/RotateBgEffect.h, Source/Contents/Effects/Skills/RotateItemEffect.h, Source/Contents/Effects/Skills/RotateLineEffect.h, Source/Contents/Effects/Skills/SaintCastingEffect.h, Source/Contents/Effects/Skills/ScatterEffect.h, Source/Contents/Effects/Skills/ShadowExceedEffect.h, Source/Contents/Effects/Skills/SkillEffects.h, Source/Contents/Effects/Skills/SmokeEffect.h, Source/Contents/Effects/Skills/SoulCollectEffect.h, Source/Contents/Effects/Skills/SoulUnityEffect.h, Source/Contents/Effects/Skills/SphereWind2Effect.h, Source/Contents/Effects/Skills/SphereWindEffect.h, Source/Contents/Effects/Skills/StarEffect.h, Source/Contents/Effects/Skills/StarEmperorEffect.h, Source/Contents/Effects/Skills/StealEffect.h, Source/Contents/Effects/Skills/StormCannonEffect.h, Source/Contents/Effects/Skills/StormGustEffect.h, Source/Contents/Effects/Skills/StormKickEffect.h, Source/Contents/Effects/Skills/SunStanceEffect.h, Source/Contents/Effects/Skills/TalismanMarkEffect.h, Source/Contents/Effects/Skills/TetraBallEffect.h, Source/Contents/Effects/Skills/ThrowEffects.h, Source/Contents/Effects/Skills/TriangleShotArrow.h, Source/Contents/Effects/Skills/ViolentQuakeEffect.h, Source/Contents/Effects/Skills/WhirlwindEffect.h, Source/Contents/Effects/Skills/WindEffect.h, Source/Contents/EntryQueue/EntryQueueMgr.h, Source/Contents/Events/CheckAttendanceMgr.h, Source/Contents/Events/RouletteMgr.h, Source/Contents/Events/ShowRankingScheduler.h, Source/Contents/Events/SpecialPopupMgr.h, Source/Contents/Guild/GuildInfo.h, Source/Contents/Guild/GuildMgr.h, Source/Contents/Guild/GuildTip.h, Source/Contents/Items/ClientItemLists.h, Source/Contents/Items/EnchantMgr.h, Source/Contents/Items/ItemDBToIDMgr.h, Source/Contents/Items/JobCodeForItem.h, Source/Contents/Map/FlyingShipRouteInfo.h, Source/Contents/Map/MapInfoMgr.h, Source/Contents/Map/MapPropertyMgr.h, Source/Contents/Map/MapSkyMgr.h, Source/Contents/Map/PrivateAirplaneMgr.h, Source/Contents/Map/TownInfoMgr.h, Source/Contents/Monster/ChampionMonsterMgr.h, Source/Contents/Movement/MovementRouteInterpolation.h, Source/Contents/Movement/TerrainPathSearch.h, Source/Contents/Navigation/NavigationManager.h, Source/Contents/Pet/PetEnums.h, Source/Contents/Pet/PetEvolutionMgr.h, Source/Contents/Quest/RenewQuestMgr.h, Source/Contents/Repute/ReputeMgr.h, Source/Contents/Repute/ReputeRecords.h, Source/Contents/Rodex/RodexMailStore.h, Source/Contents/RuneSystem/RuneSystem.h, Source/Contents/Skills/GraffiSkill.h, Source/Contents/Skin/SkinMgr.h, Source/Contents/Sprites/SpriteLayerDrawing.h, Source/Contents/Sprites/SpriteLayerOrder.h, Source/Contents/Sprites/SpriteRidingOffset.h, Source/Contents/Sprites/SpriteRidingPolicy.h, Source/Contents/Tables/ForbiddenWords.h, Source/Contents/Tables/MessageTable.h, Source/Contents/Tables/SimpleStringMgr.h, Source/Contents/Tables/TableMng.h, Source/Contents/Tables/TipBoxTitles.h, Source/Contents/Tables/TipOfTheDay.h, Source/Contents/Time/ServerTimeManager.h, Source/Contents/World/WorldViewData.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Lists/UIScrollBarVariants.h, Source/UI/Rodex/UIRodexInboxWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Text/UIAchWnd.h, Source/UI/UIReputeWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UIRoMapWnd.h, Source/Utility/JsonCppLoader.h, Source/Contents/AchievementMgr.h, Source/Contents/ActorNameCard.h, Source/Contents/Actors/GraffiSkill.h, Source/Contents/Actors/PetEnums.h, Source/Contents/AdventureGuideMgr.h, Source/Contents/CashEmotionMgr.h, Source/Contents/ChampionMonsterMgr.h, Source/Contents/CheckAttendanceMgr.h, Source/Contents/ClanInfo.h, Source/Contents/ClientItemLists.h, Source/Contents/Combat/CombatTypes.h, Source/Contents/ConfigMgr.h, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AMachineEffect.h, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/AnimatedEmitterEffect.h, Source/Contents/Effects/ArrowEffect.h, Source/Contents/Effects/AstralStrikeEffect.h, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/Bash.h, Source/Contents/Effects/BezierArcThrowEffect.h, Source/Contents/Effects/BindTrapEffect.h, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CaneOfEvilEyeEffect.h, Source/Contents/Effects/CartCannon.h, Source/Contents/Effects/CellRangeEffect.h, Source/Contents/Effects/ChangeSizeEffect.h, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/ChargingPierceEffect.h, Source/Contents/Effects/CherryBlossomEffect.h, Source/Contents/Effects/ClimaxEffect.h, Source/Contents/Effects/CloudEffect.h, Source/Contents/Effects/CloudKillEffect.h, Source/Contents/Effects/CommonFloorEffect.h, Source/Contents/Effects/Competentia.h, Source/Contents/Effects/CresciveBolt.h, Source/Contents/Effects/DummyEffectLauncher.h, Source/Contents/Effects/EZ2STREffect.h, Source/Contents/Effects/EZ2STREffectEx.h, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectLists.h, Source/Contents/Effects/EffectMaker.h, Source/Contents/Effects/EffectMemoryMgr.h, Source/Contents/Effects/EffectMessageId.h, Source/Contents/Effects/EffectPoint.h, Source/Contents/Effects/EffectPrim.h, Source/Contents/Effects/EffectPrimId.h, Source/Contents/Effects/EffectPrimitiveMotion.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/EffectTypes.h, Source/Contents/Effects/ElectricEffect.h, Source/Contents/Effects/EmitterEffect.h, Source/Contents/Effects/EnergyOrbEffect.h, Source/Contents/Effects/EvilLandEffect.h, Source/Contents/Effects/EvilsPawEffect.h, Source/Contents/Effects/FlowerCastingEffect.h, Source/Contents/Effects/FortuneKissEffect.h, Source/Contents/Effects/FriggSongEffect.h, Source/Contents/Effects/FuumaShouakuEffect.h, Source/Contents/Effects/GlassWallEffect.h, Source/Contents/Effects/GravityControlEffect.h, Source/Contents/Effects/HealEffect.h, Source/Contents/Effects/HealSpEffect.h, Source/Contents/Effects/HitLineEffect.h, Source/Contents/Effects/JupitelThunderStormEffect.h, Source/Contents/Effects/Level150Effect.h, Source/Contents/Effects/Level99Effect.h, Source/Contents/Effects/Level99Orb1Effect.h, Source/Contents/Effects/Level99Orb2Effect.h, Source/Contents/Effects/LightSphereEffect.h, Source/Contents/Effects/MagicFloorEffect.h, Source/Contents/Effects/MagnumBreak.h, Source/Contents/Effects/MandraAttackEffect.h, Source/Contents/Effects/MapChainEffect.h, Source/Contents/Effects/MapMagicZoneEffect.h, Source/Contents/Effects/MappillarEffect.h, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/NyanggrassEffect.h, Source/Contents/Effects/Particle.h, Source/Contents/Effects/ParticlePool.h, Source/Contents/Effects/PartyMemberEffects.h, Source/Contents/Effects/PokJukEffect.h, Source/Contents/Effects/PowderingEffect.h, Source/Contents/Effects/RagEffect.h, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RainbowEffect.h, Source/Contents/Effects/RectUpEffect.h, Source/Contents/Effects/RedLineEffect.h, Source/Contents/Effects/RichManKim.h, Source/Contents/Effects/RotateBgEffect.h, Source/Contents/Effects/RotateItemEffect.h, Source/Contents/Effects/RotateLineEffect.h, Source/Contents/Effects/SaintCastingEffect.h, Source/Contents/Effects/ScatterEffect.h, Source/Contents/Effects/ShadowExceedEffect.h, Source/Contents/Effects/ShowEffect.h, Source/Contents/Effects/SkillEffects.h, Source/Contents/Effects/SmokeEffect.h, Source/Contents/Effects/SoulCollectEffect.h, Source/Contents/Effects/SoulUnityEffect.h, Source/Contents/Effects/SphereWind2Effect.h, Source/Contents/Effects/SphereWindEffect.h, Source/Contents/Effects/SpriteEffect.h, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/SquareRangeEffect.h, Source/Contents/Effects/StarEffect.h, Source/Contents/Effects/StarEmperorEffect.h, Source/Contents/Effects/StealEffect.h, Source/Contents/Effects/StormCannonEffect.h, Source/Contents/Effects/StormGustEffect.h, Source/Contents/Effects/StormKickEffect.h, Source/Contents/Effects/SunStanceEffect.h, Source/Contents/Effects/TalismanMarkEffect.h, Source/Contents/Effects/TetraBallEffect.h, Source/Contents/Effects/ThrowEffects.h, Source/Contents/Effects/TriangleShotArrow.h, Source/Contents/Effects/ViolentQuakeEffect.h, Source/Contents/Effects/WhirlwindEffect.h, Source/Contents/Effects/WindEffect.h, Source/Contents/EnchantMgr.h, Source/Contents/EntryQueueMgr.h, Source/Contents/EquipmentResourceMgr.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/ForbiddenWords.h, Source/Contents/GuildInfo.h, Source/Contents/GuildMgr.h, Source/Contents/GuildTip.h, Source/Contents/ItemDBToIDMgr.h, Source/Contents/Items/RuneSystem.h, Source/Contents/JobCodeForItem.h, Source/Contents/MapInfoMgr.h, Source/Contents/MapPropertyMgr.h, Source/Contents/MapSkyMgr.h, Source/Contents/MessageTable.h, Source/Contents/MovementRouteInterpolation.h, Source/Contents/NavigationManager.h, Source/Contents/PetEvolutionMgr.h, Source/Contents/PlayerNameDictionary.h, Source/Contents/PrivateAirplaneMgr.h, Source/Contents/RDamageVar.h, Source/Contents/RenewQuestMgr.h, Source/Contents/ReputeMgr.h, Source/Contents/ReputeRecords.h, Source/Contents/RodexMailStore.h, Source/Contents/RouletteMgr.h, Source/Contents/ServerTimeManager.h, Source/Contents/ShowRankingScheduler.h, Source/Contents/SimpleStringMgr.h, Source/Contents/SkinMgr.h, Source/Contents/SpecialPopupMgr.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/SpriteLayerOrder.h, Source/Contents/SpriteRidingOffset.h, Source/Contents/SpriteRidingPolicy.h, Source/Contents/TableMng.h, Source/Contents/TerrainPathSearch.h, Source/Contents/TipBoxTitles.h, Source/Contents/TipOfTheDay.h, Source/Contents/TownInfoMgr.h, Source/Contents/WorldView/WorldViewData.h. Adds to the build: Source/Contents/Achievement/AchievementMgr.cpp, Source/Contents/Actors/ActorGeometry.cpp, Source/Contents/Actors/ActorNameCache.cpp, Source/Contents/Actors/ActorNameCard.cpp, Source/Contents/Actors/ActorNameDirectory.cpp, Source/Contents/Actors/ActorNameRequests.cpp, Source/Contents/Actors/PlayerNameDictionary.cpp, Source/Contents/Actors/Resources/BodyResources.cpp, Source/Contents/Actors/Resources/EquipmentResources.cpp, Source/Contents/Actors/Resources/HeadResources.cpp, Source/Contents/Actors/Resources/MonsterResources.cpp, Source/Contents/Actors/Resources/RobeResources.cpp, Source/Contents/Actors/Resources/StatusIconImages.cpp, Source/Contents/AdventureGuide/AdventureGuideMgr.cpp, Source/Contents/CashEmotion/CashEmotionMgr.cpp, Source/Contents/Clan/ClanInfo.cpp, Source/Contents/Configuration/ConfigMgr.cpp, Source/Contents/Effects/Core/CellRangeEffect.cpp, Source/Contents/Effects/Core/ChangeSizeEffect.cpp, Source/Contents/Effects/Core/DummyEffectLauncher.cpp, Source/Contents/Effects/Core/Effect.cpp, Source/Contents/Effects/Core/EffectActor.cpp, Source/Contents/Effects/Core/EffectAttachments.cpp, Source/Contents/Effects/Core/EffectForceRender.cpp, Source/Contents/Effects/Core/EffectLists.cpp, Source/Contents/Effects/Core/EffectMaker.cpp, Source/Contents/Effects/Core/EffectMemoryMgr.cpp, Source/Contents/Effects/Core/EffectTypes.cpp, Source/Contents/Effects/Core/EffectVisibility.cpp, Source/Contents/Effects/Core/MsgEffect.cpp, Source/Contents/Effects/Core/RagEffect.cpp, Source/Contents/Effects/Core/RagEffectInitialization.cpp, Source/Contents/Effects/Core/ShowEffect.cpp, Source/Contents/Effects/Core/SquareRangeEffect.cpp, Source/Contents/Effects/EffectResourceSwitcher.cpp, Source/Contents/Effects/Particles/AnimatedEmitterEffect.cpp, Source/Contents/Effects/Particles/CharacterParticleBundle.cpp, Source/Contents/Effects/Particles/EZ2STREffect.cpp, Source/Contents/Effects/Particles/EZ2STREffectEx.cpp, Source/Contents/Effects/Particles/EmitterEffect.cpp, Source/Contents/Effects/Particles/Particle.cpp, Source/Contents/Effects/Particles/ParticlePool.cpp, Source/Contents/Effects/Particles/SpriteEffect.cpp, Source/Contents/Effects/Particles/SpriteParticle.cpp, Source/Contents/Effects/Primitives/EffectPrim.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveColor.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveGlowSquares.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp, Source/Contents/Effects/Primitives/EffectPrimitivePanels.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveRecords.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveState.cpp, Source/Contents/Effects/Primitives/EffectPrimitiveSweeps.cpp, Source/Contents/Effects/RDamageVar.cpp, Source/Contents/Effects/Skills/AMachineEffect.cpp, Source/Contents/Effects/Skills/AcidifiedThrow.cpp, Source/Contents/Effects/Skills/ArrowEffect.cpp, Source/Contents/Effects/Skills/AstralStrikeEffect.cpp, Source/Contents/Effects/Skills/AxeBoomerang.cpp, Source/Contents/Effects/Skills/Bash.cpp, Source/Contents/Effects/Skills/BezierArcThrowEffect.cpp, Source/Contents/Effects/Skills/BindTrapEffect.cpp, Source/Contents/Effects/Skills/BlastForge.cpp, Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.cpp, Source/Contents/Effects/Skills/CartCannon.cpp, Source/Contents/Effects/Skills/ChargingPierceEffect.cpp, Source/Contents/Effects/Skills/CherryBlossomEffect.cpp, Source/Contents/Effects/Skills/ClimaxEffect.cpp, Source/Contents/Effects/Skills/CloudEffect.cpp, Source/Contents/Effects/Skills/CloudKillEffect.cpp, Source/Contents/Effects/Skills/CommonFloorEffect.cpp, Source/Contents/Effects/Skills/Competentia.cpp, Source/Contents/Effects/Skills/CresciveBolt.cpp, Source/Contents/Effects/Skills/ElectricEffect.cpp, Source/Contents/Effects/Skills/EnergyOrbEffect.cpp, Source/Contents/Effects/Skills/EvilLandEffect.cpp, Source/Contents/Effects/Skills/EvilsPawEffect.cpp, Source/Contents/Effects/Skills/FlowerCastingEffect.cpp, Source/Contents/Effects/Skills/FortuneKissEffect.cpp, Source/Contents/Effects/Skills/FriggSongEffect.cpp, Source/Contents/Effects/Skills/FuumaShouakuEffect.cpp, Source/Contents/Effects/Skills/GlassWallEffect.cpp, Source/Contents/Effects/Skills/HealEffect.cpp, Source/Contents/Effects/Skills/HealSpEffect.cpp, Source/Contents/Effects/Skills/HitLineEffect.cpp, Source/Contents/Effects/Skills/JupitelThunderStormEffect.cpp, Source/Contents/Effects/Skills/Level150Effect.cpp, Source/Contents/Effects/Skills/Level99Effect.cpp, Source/Contents/Effects/Skills/Level99Orb1Effect.cpp, Source/Contents/Effects/Skills/Level99Orb2Effect.cpp, Source/Contents/Effects/Skills/LightSphereEffect.cpp, Source/Contents/Effects/Skills/MagicFloorEffect.cpp, Source/Contents/Effects/Skills/MagnumBreak.cpp, Source/Contents/Effects/Skills/MandraAttackEffect.cpp, Source/Contents/Effects/Skills/MapChainEffect.cpp, Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp, Source/Contents/Effects/Skills/MappillarEffect.cpp, Source/Contents/Effects/Skills/MeteorEffect.cpp, Source/Contents/Effects/Skills/MonsterSkillEffects.cpp, Source/Contents/Effects/Skills/NyanggrassEffect.cpp, Source/Contents/Effects/Skills/PartyMemberEffects.cpp, Source/Contents/Effects/Skills/PokJukEffect.cpp, Source/Contents/Effects/Skills/PowderingEffect.cpp, Source/Contents/Effects/Skills/RainbowEffect.cpp, Source/Contents/Effects/Skills/RectUpEffect.cpp, Source/Contents/Effects/Skills/RedLineEffect.cpp, Source/Contents/Effects/Skills/RichManKim.cpp, Source/Contents/Effects/Skills/RotateBgEffect.cpp, Source/Contents/Effects/Skills/RotateItemEffect.cpp, Source/Contents/Effects/Skills/RotateLineEffect.cpp, Source/Contents/Effects/Skills/SaintCastingEffect.cpp, Source/Contents/Effects/Skills/ScatterEffect.cpp, Source/Contents/Effects/Skills/ShadowExceedEffect.cpp, Source/Contents/Effects/Skills/ShadowExceedNewEffect.cpp, Source/Contents/Effects/Skills/SmokeEffect.cpp, Source/Contents/Effects/Skills/SoulCollectEffect.cpp, Source/Contents/Effects/Skills/SoulUnityEffect.cpp, Source/Contents/Effects/Skills/SphereWind2Effect.cpp, Source/Contents/Effects/Skills/SphereWindEffect.cpp, Source/Contents/Effects/Skills/StarEffect.cpp, Source/Contents/Effects/Skills/StarEmperorEffect.cpp, Source/Contents/Effects/Skills/StealEffect.cpp, Source/Contents/Effects/Skills/StormCannonEffect.cpp, Source/Contents/Effects/Skills/StormGustEffect.cpp, Source/Contents/Effects/Skills/StormKickEffect.cpp, Source/Contents/Effects/Skills/SunStanceEffect.cpp, Source/Contents/Effects/Skills/TalismanMarkEffect.cpp, Source/Contents/Effects/Skills/TetraBallEffect.cpp, Source/Contents/Effects/Skills/ThrowEffects.cpp, Source/Contents/Effects/Skills/TriangleShotArrow.cpp, Source/Contents/Effects/Skills/ViolentQuakeEffect.cpp, Source/Contents/Effects/Skills/WindEffect.cpp, Source/Contents/Emblems/EmblemCacheRaw.cpp, Source/Contents/Emblems/GuildEmblemLookup.cpp, Source/Contents/Emblems/GuildEmblemState.cpp, Source/Contents/EntryQueue/EntryQueueMgr.cpp, Source/Contents/Events/CheckAttendanceMgr.cpp, Source/Contents/Events/RouletteMgr.cpp, Source/Contents/Events/ShowRankingScheduler.cpp, Source/Contents/Events/SpecialPopupMgr.cpp, Source/Contents/Guild/GuildInfo.cpp, Source/Contents/Guild/GuildMgr.cpp, Source/Contents/Guild/GuildTip.cpp, Source/Contents/Items/ClientItemLists.cpp, Source/Contents/Items/EnchantMgr.cpp, Source/Contents/Items/ItemDBToIDMgr.cpp, Source/Contents/Items/JobCodeForItem.cpp, Source/Contents/Map/FlyingShipRouteInfo.cpp, Source/Contents/Map/MapInfoMgr.cpp, Source/Contents/Map/MapNameTable.cpp, Source/Contents/Map/MapPropertyMgr.cpp, Source/Contents/Map/MapSkyMgr.cpp, Source/Contents/Map/PrivateAirplaneMgr.cpp, Source/Contents/Map/TownInfoMgr.cpp, Source/Contents/Models/ModelKeyframes.cpp, Source/Contents/Monster/ChampionMonsterMgr.cpp, Source/Contents/Monster/EnemyMonsterTalk.cpp, Source/Contents/Monster/MonsterSpeech.cpp, Source/Contents/Monster/MonsterXmlActions.cpp, Source/Contents/Movement/ActorMovementRoute.cpp, Source/Contents/Movement/MovementRoute.cpp, Source/Contents/Movement/MovementRouteInterpolation.cpp, Source/Contents/Movement/MovementTraversal.cpp, Source/Contents/Movement/Pathfinding.cpp, Source/Contents/Movement/TerrainPathSearch.cpp, Source/Contents/Navigation/NavigationCandidates.cpp, Source/Contents/Navigation/NavigationDestinations.cpp, Source/Contents/Navigation/NavigationGraph.cpp, Source/Contents/Navigation/NavigationLink.cpp, Source/Contents/Navigation/NavigationRequest.cpp, Source/Contents/Navigation/NavigationRoute.cpp, Source/Contents/Navigation/NavigationSource.cpp, Source/Contents/Navigation/NpcLocationRadius.cpp, Source/Contents/Navigation/WorldNavigation.cpp, Source/Contents/Pet/PetEvolutionMgr.cpp, Source/Contents/Pet/PetStatus.cpp, Source/Contents/Pet/PetStrings.cpp, Source/Contents/Pet/PetTalk.cpp, Source/Contents/Pet/PetTalkNames.cpp, Source/Contents/Quest/RenewQuestMgr.cpp, Source/Contents/Repute/ReputeMgr.cpp, Source/Contents/Rodex/RodexMailStore.cpp, Source/Contents/RuneSystem/RuneSystem.cpp, Source/Contents/Skills/GraffiSkill.cpp, Source/Contents/Skin/SkinCatalog.cpp, Source/Contents/Skin/SkinInfo.cpp, Source/Contents/Skin/SkinMgr.cpp, Source/Contents/Sound/HitSounds.cpp, Source/Contents/Sprites/RobeOpacity.cpp, Source/Contents/Sprites/RobeTopLayer.cpp, Source/Contents/Sprites/SpriteFrameSynchronization.cpp, Source/Contents/Sprites/SpriteJob.cpp, Source/Contents/Sprites/SpriteLayerDepth.cpp, Source/Contents/Sprites/SpriteLayerDrawing.cpp, Source/Contents/Sprites/SpriteLayerOrder.cpp, Source/Contents/Sprites/SpriteRidingOffset.cpp, Source/Contents/Sprites/SpriteRidingPolicy.cpp, Source/Contents/Sprites/SpriteRobe.cpp, Source/Contents/Sprites/SpriteRobeCommands.cpp, Source/Contents/Sprites/SpriteShadow.cpp, Source/Contents/Tables/ClientXmlTables.cpp, Source/Contents/Tables/ForbiddenWords.cpp, Source/Contents/Tables/MessageTable.cpp, Source/Contents/Tables/SimpleStringMgr.cpp, Source/Contents/Tables/TableMng.cpp, Source/Contents/Tables/TipBoxTitles.cpp, Source/Contents/Tables/TipOfTheDay.cpp, Source/Contents/Time/ClientTiming.cpp, Source/Contents/Time/ServerTimeManager.cpp, Source/Contents/World/WorldViewData.cpp Deletes: Source/Contents/AchievementMgr.cpp, Source/Contents/AchievementMgr.h, Source/Contents/ActorGeometry.cpp, Source/Contents/ActorMovementRoute.cpp, Source/Contents/ActorNameCache.cpp, Source/Contents/ActorNameCard.cpp, Source/Contents/ActorNameCard.h, Source/Contents/ActorNameDirectory.cpp, Source/Contents/ActorNameRequests.cpp, Source/Contents/Actors/GraffiSkill.cpp, Source/Contents/Actors/GraffiSkill.h, Source/Contents/Actors/PetEnums.h, Source/Contents/AdventureGuideMgr.cpp, Source/Contents/AdventureGuideMgr.h, Source/Contents/BodyResources.cpp, Source/Contents/CashEmotionMgr.cpp, Source/Contents/CashEmotionMgr.h, Source/Contents/ChampionMonsterMgr.cpp, Source/Contents/ChampionMonsterMgr.h, Source/Contents/CheckAttendanceMgr.cpp, Source/Contents/CheckAttendanceMgr.h, Source/Contents/ClanInfo.cpp, Source/Contents/ClanInfo.h, Source/Contents/ClientItemLists.cpp, Source/Contents/ClientItemLists.h, Source/Contents/ClientTiming.cpp, Source/Contents/ClientXmlTables.cpp, Source/Contents/Combat/CombatTypes.h, Source/Contents/ConfigMgr.cpp, Source/Contents/ConfigMgr.h, Source/Contents/EffectResourceSwitcher.cpp, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AMachineEffect.cpp, Source/Contents/Effects/AMachineEffect.h, Source/Contents/Effects/AcidifiedThrow.cpp, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/AnimatedEmitterEffect.cpp, Source/Contents/Effects/AnimatedEmitterEffect.h, Source/Contents/Effects/ArrowEffect.cpp, Source/Contents/Effects/ArrowEffect.h, Source/Contents/Effects/AstralStrikeEffect.cpp, Source/Contents/Effects/AstralStrikeEffect.h, Source/Contents/Effects/AxeBoomerang.cpp, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/Bash.cpp, Source/Contents/Effects/Bash.h, Source/Contents/Effects/BezierArcThrowEffect.cpp, Source/Contents/Effects/BezierArcThrowEffect.h, Source/Contents/Effects/BindTrapEffect.cpp, Source/Contents/Effects/BindTrapEffect.h, Source/Contents/Effects/BlastForge.cpp, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CaneOfEvilEyeEffect.cpp, Source/Contents/Effects/CaneOfEvilEyeEffect.h, Source/Contents/Effects/CartCannon.cpp, Source/Contents/Effects/CartCannon.h, Source/Contents/Effects/CellRangeEffect.cpp, Source/Contents/Effects/CellRangeEffect.h, Source/Contents/Effects/ChangeSizeEffect.cpp, Source/Contents/Effects/ChangeSizeEffect.h, Source/Contents/Effects/CharacterParticleBundle.cpp, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/ChargingPierceEffect.cpp, Source/Contents/Effects/ChargingPierceEffect.h, Source/Contents/Effects/CherryBlossomEffect.cpp, Source/Contents/Effects/CherryBlossomEffect.h, Source/Contents/Effects/ClimaxEffect.cpp, Source/Contents/Effects/ClimaxEffect.h, Source/Contents/Effects/CloudEffect.cpp, Source/Contents/Effects/CloudEffect.h, Source/Contents/Effects/CloudKillEffect.cpp, Source/Contents/Effects/CloudKillEffect.h, Source/Contents/Effects/CommonFloorEffect.cpp, Source/Contents/Effects/CommonFloorEffect.h, Source/Contents/Effects/Competentia.cpp, Source/Contents/Effects/Competentia.h, Source/Contents/Effects/CresciveBolt.cpp, Source/Contents/Effects/CresciveBolt.h, Source/Contents/Effects/DummyEffectLauncher.cpp, Source/Contents/Effects/DummyEffectLauncher.h, Source/Contents/Effects/EZ2STREffect.cpp, Source/Contents/Effects/EZ2STREffect.h, Source/Contents/Effects/EZ2STREffectEx.cpp, Source/Contents/Effects/EZ2STREffectEx.h, Source/Contents/Effects/Effect.cpp, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.cpp, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectAttachments.cpp, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectForceRender.cpp, Source/Contents/Effects/EffectLists.cpp, Source/Contents/Effects/EffectLists.h, Source/Contents/Effects/EffectMaker.cpp, Source/Contents/Effects/EffectMaker.h, Source/Contents/Effects/EffectMemoryMgr.cpp, Source/Contents/Effects/EffectMemoryMgr.h, Source/Contents/Effects/EffectMessageId.h, Source/Contents/Effects/EffectPoint.h, Source/Contents/Effects/EffectPrim.cpp, Source/Contents/Effects/EffectPrim.h, Source/Contents/Effects/EffectPrimId.h, Source/Contents/Effects/EffectPrimitiveArcs.cpp, Source/Contents/Effects/EffectPrimitiveColor.cpp, Source/Contents/Effects/EffectPrimitiveGlowSquares.cpp, Source/Contents/Effects/EffectPrimitiveMotion.cpp, Source/Contents/Effects/EffectPrimitiveMotion.h, Source/Contents/Effects/EffectPrimitivePanels.cpp, Source/Contents/Effects/EffectPrimitiveRecords.cpp, Source/Contents/Effects/EffectPrimitiveRendering.cpp, Source/Contents/Effects/EffectPrimitiveSprites.cpp, Source/Contents/Effects/EffectPrimitiveState.cpp, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/EffectPrimitiveSweeps.cpp, Source/Contents/Effects/EffectTypes.cpp, Source/Contents/Effects/EffectTypes.h, Source/Contents/Effects/EffectVisibility.cpp, Source/Contents/Effects/ElectricEffect.cpp, Source/Contents/Effects/ElectricEffect.h, Source/Contents/Effects/EmitterEffect.cpp, Source/Contents/Effects/EmitterEffect.h, Source/Contents/Effects/EnergyOrbEffect.cpp, Source/Contents/Effects/EnergyOrbEffect.h, Source/Contents/Effects/EvilLandEffect.cpp, Source/Contents/Effects/EvilLandEffect.h, Source/Contents/Effects/EvilsPawEffect.cpp, Source/Contents/Effects/EvilsPawEffect.h, Source/Contents/Effects/FlowerCastingEffect.cpp, Source/Contents/Effects/FlowerCastingEffect.h, Source/Contents/Effects/FortuneKissEffect.cpp, Source/Contents/Effects/FortuneKissEffect.h, Source/Contents/Effects/FriggSongEffect.cpp, Source/Contents/Effects/FriggSongEffect.h, Source/Contents/Effects/FuumaShouakuEffect.cpp, Source/Contents/Effects/FuumaShouakuEffect.h, Source/Contents/Effects/GlassWallEffect.cpp, Source/Contents/Effects/GlassWallEffect.h, Source/Contents/Effects/GravityControlEffect.h, Source/Contents/Effects/HealEffect.cpp, Source/Contents/Effects/HealEffect.h, Source/Contents/Effects/HealSpEffect.cpp, Source/Contents/Effects/HealSpEffect.h, Source/Contents/Effects/HitLineEffect.cpp, Source/Contents/Effects/HitLineEffect.h, Source/Contents/Effects/JupitelThunderStormEffect.cpp, Source/Contents/Effects/JupitelThunderStormEffect.h, Source/Contents/Effects/Level150Effect.cpp, Source/Contents/Effects/Level150Effect.h, Source/Contents/Effects/Level99Effect.cpp, Source/Contents/Effects/Level99Effect.h, Source/Contents/Effects/Level99Orb1Effect.cpp, Source/Contents/Effects/Level99Orb1Effect.h, Source/Contents/Effects/Level99Orb2Effect.cpp, Source/Contents/Effects/Level99Orb2Effect.h, Source/Contents/Effects/LightSphereEffect.cpp, Source/Contents/Effects/LightSphereEffect.h, Source/Contents/Effects/MagicFloorEffect.cpp, Source/Contents/Effects/MagicFloorEffect.h, Source/Contents/Effects/MagnumBreak.cpp, Source/Contents/Effects/MagnumBreak.h, Source/Contents/Effects/MandraAttackEffect.cpp, Source/Contents/Effects/MandraAttackEffect.h, Source/Contents/Effects/MapChainEffect.cpp, Source/Contents/Effects/MapChainEffect.h, Source/Contents/Effects/MapMagicZoneEffect.cpp, Source/Contents/Effects/MapMagicZoneEffect.h, Source/Contents/Effects/MappillarEffect.cpp, Source/Contents/Effects/MappillarEffect.h, Source/Contents/Effects/MeteorEffect.cpp, Source/Contents/Effects/MonsterSkillEffects.cpp, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.cpp, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/NyanggrassEffect.cpp, Source/Contents/Effects/NyanggrassEffect.h, Source/Contents/Effects/Particle.cpp, Source/Contents/Effects/Particle.h, Source/Contents/Effects/ParticlePool.cpp, Source/Contents/Effects/ParticlePool.h, Source/Contents/Effects/PartyMemberEffects.cpp, Source/Contents/Effects/PartyMemberEffects.h, Source/Contents/Effects/PokJukEffect.cpp, Source/Contents/Effects/PokJukEffect.h, Source/Contents/Effects/PowderingEffect.cpp, Source/Contents/Effects/PowderingEffect.h, Source/Contents/Effects/RagEffect.cpp, Source/Contents/Effects/RagEffect.h, Source/Contents/Effects/RagEffectInitialization.cpp, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RainbowEffect.cpp, Source/Contents/Effects/RainbowEffect.h, Source/Contents/Effects/RectUpEffect.cpp, Source/Contents/Effects/RectUpEffect.h, Source/Contents/Effects/RedLineEffect.cpp, Source/Contents/Effects/RedLineEffect.h, Source/Contents/Effects/RichManKim.cpp, Source/Contents/Effects/RichManKim.h, Source/Contents/Effects/RotateBgEffect.cpp, Source/Contents/Effects/RotateBgEffect.h, Source/Contents/Effects/RotateItemEffect.cpp, Source/Contents/Effects/RotateItemEffect.h, Source/Contents/Effects/RotateLineEffect.cpp, Source/Contents/Effects/RotateLineEffect.h, Source/Contents/Effects/SaintCastingEffect.cpp, Source/Contents/Effects/SaintCastingEffect.h, Source/Contents/Effects/ScatterEffect.cpp, Source/Contents/Effects/ScatterEffect.h, Source/Contents/Effects/ShadowExceedEffect.cpp, Source/Contents/Effects/ShadowExceedEffect.h, Source/Contents/Effects/ShadowExceedNewEffect.cpp, Source/Contents/Effects/ShowEffect.cpp, Source/Contents/Effects/ShowEffect.h, Source/Contents/Effects/SkillEffects.h, Source/Contents/Effects/SmokeEffect.cpp, Source/Contents/Effects/SmokeEffect.h, Source/Contents/Effects/SoulCollectEffect.cpp, Source/Contents/Effects/SoulCollectEffect.h, Source/Contents/Effects/SoulUnityEffect.cpp, Source/Contents/Effects/SoulUnityEffect.h, Source/Contents/Effects/SphereWind2Effect.cpp, Source/Contents/Effects/SphereWind2Effect.h, Source/Contents/Effects/SphereWindEffect.cpp, Source/Contents/Effects/SphereWindEffect.h, Source/Contents/Effects/SpriteEffect.cpp, Source/Contents/Effects/SpriteEffect.h, Source/Contents/Effects/SpriteParticle.cpp, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/SquareRangeEffect.cpp, Source/Contents/Effects/SquareRangeEffect.h, Source/Contents/Effects/StarEffect.cpp, Source/Contents/Effects/StarEffect.h, Source/Contents/Effects/StarEmperorEffect.cpp, Source/Contents/Effects/StarEmperorEffect.h, Source/Contents/Effects/StealEffect.cpp, Source/Contents/Effects/StealEffect.h, Source/Contents/Effects/StormCannonEffect.cpp, Source/Contents/Effects/StormCannonEffect.h, Source/Contents/Effects/StormGustEffect.cpp, Source/Contents/Effects/StormGustEffect.h, Source/Contents/Effects/StormKickEffect.cpp, Source/Contents/Effects/StormKickEffect.h, Source/Contents/Effects/SunStanceEffect.cpp, Source/Contents/Effects/SunStanceEffect.h, Source/Contents/Effects/TalismanMarkEffect.cpp, Source/Contents/Effects/TalismanMarkEffect.h, Source/Contents/Effects/TetraBallEffect.cpp, Source/Contents/Effects/TetraBallEffect.h, Source/Contents/Effects/ThrowEffects.cpp, Source/Contents/Effects/ThrowEffects.h, Source/Contents/Effects/TriangleShotArrow.cpp, Source/Contents/Effects/TriangleShotArrow.h, Source/Contents/Effects/ViolentQuakeEffect.cpp, Source/Contents/Effects/ViolentQuakeEffect.h, Source/Contents/Effects/WhirlwindEffect.h, Source/Contents/Effects/WindEffect.cpp, Source/Contents/Effects/WindEffect.h, Source/Contents/EmblemCacheRaw.cpp, Source/Contents/EnchantMgr.cpp, Source/Contents/EnchantMgr.h, Source/Contents/EnemyMonsterTalk.cpp, Source/Contents/EntryQueueMgr.cpp, Source/Contents/EntryQueueMgr.h, Source/Contents/EquipmentResourceMgr.h, Source/Contents/EquipmentResources.cpp, Source/Contents/FlyingShipRouteInfo.cpp, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/ForbiddenWords.cpp, Source/Contents/ForbiddenWords.h, Source/Contents/GuildEmblemLookup.cpp, Source/Contents/GuildEmblemState.cpp, Source/Contents/GuildInfo.cpp, Source/Contents/GuildInfo.h, Source/Contents/GuildMgr.cpp, Source/Contents/GuildMgr.h, Source/Contents/GuildTip.cpp, Source/Contents/GuildTip.h, Source/Contents/HeadResources.cpp, Source/Contents/HitSounds.cpp, Source/Contents/ItemDBToIDMgr.cpp, Source/Contents/ItemDBToIDMgr.h, Source/Contents/Items/RuneSystem.cpp, Source/Contents/Items/RuneSystem.h, Source/Contents/JobCodeForItem.cpp, Source/Contents/JobCodeForItem.h, Source/Contents/MapInfoMgr.cpp, Source/Contents/MapInfoMgr.h, Source/Contents/MapNameTable.cpp, Source/Contents/MapPropertyMgr.cpp, Source/Contents/MapPropertyMgr.h, Source/Contents/MapSkyMgr.cpp, Source/Contents/MapSkyMgr.h, Source/Contents/MessageTable.cpp, Source/Contents/MessageTable.h, Source/Contents/ModelKeyframes.cpp, Source/Contents/MonsterResources.cpp, Source/Contents/MonsterSpeech.cpp, Source/Contents/MonsterXmlActions.cpp, Source/Contents/MovementRoute.cpp, Source/Contents/MovementRouteInterpolation.cpp, Source/Contents/MovementRouteInterpolation.h, Source/Contents/MovementTraversal.cpp, Source/Contents/NavigationCandidates.cpp, Source/Contents/NavigationDestinations.cpp, Source/Contents/NavigationGraph.cpp, Source/Contents/NavigationLink.cpp, Source/Contents/NavigationManager.h, Source/Contents/NavigationRequest.cpp, Source/Contents/NavigationRoute.cpp, Source/Contents/NavigationSource.cpp, Source/Contents/NpcLocationRadius.cpp, Source/Contents/Pathfinding.cpp, Source/Contents/PetEvolutionMgr.cpp, Source/Contents/PetEvolutionMgr.h, Source/Contents/PetStatus.cpp, Source/Contents/PetStrings.cpp, Source/Contents/PetTalk.cpp, Source/Contents/PetTalkNames.cpp, Source/Contents/PlayerNameDictionary.cpp, Source/Contents/PlayerNameDictionary.h, Source/Contents/PrivateAirplaneMgr.cpp, Source/Contents/PrivateAirplaneMgr.h, Source/Contents/RDamageVar.cpp, Source/Contents/RDamageVar.h, Source/Contents/RenewQuestMgr.cpp, Source/Contents/RenewQuestMgr.h, Source/Contents/ReputeMgr.cpp, Source/Contents/ReputeMgr.h, Source/Contents/ReputeRecords.h, Source/Contents/RobeOpacity.cpp, Source/Contents/RobeResources.cpp, Source/Contents/RobeTopLayer.cpp, Source/Contents/RodexMailStore.cpp, Source/Contents/RodexMailStore.h, Source/Contents/RouletteMgr.cpp, Source/Contents/RouletteMgr.h, Source/Contents/ServerTimeManager.cpp, Source/Contents/ServerTimeManager.h, Source/Contents/ShowRankingScheduler.cpp, Source/Contents/ShowRankingScheduler.h, Source/Contents/SimpleStringMgr.cpp, Source/Contents/SimpleStringMgr.h, Source/Contents/SkinCatalog.cpp, Source/Contents/SkinInfo.cpp, Source/Contents/SkinMgr.cpp, Source/Contents/SkinMgr.h, Source/Contents/SpecialPopupMgr.cpp, Source/Contents/SpecialPopupMgr.h, Source/Contents/SpriteFrameSynchronization.cpp, Source/Contents/SpriteJob.cpp, Source/Contents/SpriteLayerDepth.cpp, Source/Contents/SpriteLayerDrawing.cpp, Source/Contents/SpriteLayerDrawing.h, Source/Contents/SpriteLayerOrder.cpp, Source/Contents/SpriteLayerOrder.h, Source/Contents/SpriteRidingOffset.cpp, Source/Contents/SpriteRidingOffset.h, Source/Contents/SpriteRidingPolicy.cpp, Source/Contents/SpriteRidingPolicy.h, Source/Contents/SpriteRobe.cpp, Source/Contents/SpriteRobeCommands.cpp, Source/Contents/SpriteShadow.cpp, Source/Contents/StatusIconImages.cpp, Source/Contents/TableMng.cpp, Source/Contents/TableMng.h, Source/Contents/TerrainPathSearch.cpp, Source/Contents/TerrainPathSearch.h, Source/Contents/TipBoxTitles.cpp, Source/Contents/TipBoxTitles.h, Source/Contents/TipOfTheDay.cpp, Source/Contents/TipOfTheDay.h, Source/Contents/TownInfoMgr.cpp, Source/Contents/TownInfoMgr.h, Source/Contents/WorldNavigation.cpp, Source/Contents/WorldView/WorldViewData.cpp, Source/Contents/WorldView/WorldViewData.h --- Source/ActorPickNode.cpp | 2 +- Source/Client/Application/Launcher.cpp | 54 +-- Source/Client/Browser/BrowserFactory.cpp | 2 +- Source/Client/Input/ImeHelper.cpp | 2 +- Source/Client/Input/Language.cpp | 2 +- Source/Client/Mode/CGameMode.h | 2 +- Source/Client/Mode/GameMode.cpp | 42 +- Source/Client/Mode/GameModeHandlers.cpp | 26 +- Source/Client/Mode/GameModeItemLists.cpp | 2 +- Source/Client/Mode/GameModeMiniMap.cpp | 2 +- Source/Client/Mode/GameModeNames.cpp | 2 +- Source/Client/Mode/GameModeNotices.cpp | 34 +- Source/Client/Mode/GameModePackets.cpp | 58 +-- Source/Client/Mode/LoginMode.cpp | 22 +- Source/Client/Mode/LoginModeNotices.cpp | 2 +- Source/Client/Replay.cpp | 4 +- Source/Client/Session.cpp | 40 +- Source/Client/SessionAchievements.cpp | 4 +- Source/Client/SessionState.cpp | 6 +- .../{ => Achievement}/AchievementMgr.cpp | 2 +- .../{ => Achievement}/AchievementMgr.h | 4 +- .../Contents/{ => Actors}/ActorGeometry.cpp | 0 .../Contents/{ => Actors}/ActorNameCache.cpp | 2 +- .../Contents/{ => Actors}/ActorNameCard.cpp | 2 +- Source/Contents/{ => Actors}/ActorNameCard.h | 4 +- .../{ => Actors}/ActorNameDirectory.cpp | 2 +- .../{ => Actors}/ActorNameRequests.cpp | 2 +- Source/Contents/Actors/CharacterRender.cpp | 8 +- Source/Contents/Actors/GameActor.cpp | 10 +- Source/Contents/Actors/GameActor.h | 4 +- Source/Contents/Actors/GameObject.cpp | 24 +- Source/Contents/Actors/GndRiser.h | 2 +- Source/Contents/Actors/GroundScope.h | 2 +- Source/Contents/Actors/Item.cpp | 8 +- Source/Contents/Actors/Item.h | 2 +- Source/Contents/Actors/Player.cpp | 38 +- .../{ => Actors}/PlayerNameDictionary.cpp | 4 +- .../{ => Actors}/PlayerNameDictionary.h | 4 +- Source/Contents/Actors/RenderObject.cpp | 30 +- .../{ => Actors/Resources}/BodyResources.cpp | 2 +- .../Resources}/EquipmentResourceMgr.h | 4 +- .../Resources}/EquipmentResources.cpp | 2 +- .../{ => Actors/Resources}/HeadResources.cpp | 2 +- .../Resources}/MonsterResources.cpp | 0 .../{ => Actors/Resources}/RobeResources.cpp | 2 +- .../Resources}/StatusIconImages.cpp | 2 +- Source/Contents/Actors/Skill.cpp | 14 +- .../AdventureGuideMgr.cpp | 4 +- .../{ => AdventureGuide}/AdventureGuideMgr.h | 4 +- .../{ => CashEmotion}/CashEmotionMgr.cpp | 6 +- .../{ => CashEmotion}/CashEmotionMgr.h | 4 +- Source/Contents/{ => Clan}/ClanInfo.cpp | 2 +- Source/Contents/{ => Clan}/ClanInfo.h | 4 +- Source/Contents/ClientState.cpp | 6 +- Source/Contents/{Combat => }/CombatTypes.h | 4 +- .../{ => Configuration}/ConfigMgr.cpp | 2 +- .../Contents/{ => Configuration}/ConfigMgr.h | 4 +- .../Configuration/ServiceConfiguration.cpp | 2 +- .../Contents/Configuration/ServiceOptions.cpp | 6 +- .../Effects/{ => Core}/CellRangeEffect.cpp | 8 +- .../Effects/{ => Core}/CellRangeEffect.h | 6 +- .../Effects/{ => Core}/ChangeSizeEffect.cpp | 2 +- .../Effects/{ => Core}/ChangeSizeEffect.h | 6 +- .../{ => Core}/DummyEffectLauncher.cpp | 6 +- .../Effects/{ => Core}/DummyEffectLauncher.h | 6 +- Source/Contents/Effects/{ => Core}/Effect.cpp | 6 +- Source/Contents/Effects/{ => Core}/Effect.h | 4 +- .../Effects/{ => Core}/EffectActor.cpp | 4 +- .../Contents/Effects/{ => Core}/EffectActor.h | 4 +- .../Effects/{ => Core}/EffectAttachments.cpp | 4 +- .../Effects/{ => Core}/EffectForceRender.cpp | 2 +- .../Effects/{ => Core}/EffectLists.cpp | 136 +++--- .../Contents/Effects/{ => Core}/EffectLists.h | 6 +- .../Effects/{ => Core}/EffectMaker.cpp | 4 +- .../Contents/Effects/{ => Core}/EffectMaker.h | 6 +- .../Effects/{ => Core}/EffectMemoryMgr.cpp | 8 +- .../Effects/{ => Core}/EffectMemoryMgr.h | 4 +- .../Effects/{ => Core}/EffectMessageId.h | 4 +- .../Contents/Effects/{ => Core}/EffectPoint.h | 4 +- .../Effects/{ => Core}/EffectPrimId.h | 4 +- .../Effects/{ => Core}/EffectTypes.cpp | 2 +- .../Contents/Effects/{ => Core}/EffectTypes.h | 4 +- .../Effects/{ => Core}/EffectVisibility.cpp | 6 +- .../Contents/Effects/{ => Core}/MsgEffect.cpp | 12 +- .../Contents/Effects/{ => Core}/MsgEffect.h | 6 +- .../Contents/Effects/{ => Core}/RagEffect.cpp | 20 +- .../Contents/Effects/{ => Core}/RagEffect.h | 6 +- .../{ => Core}/RagEffectInitialization.cpp | 8 +- .../Effects/{ => Core}/RagEffectState.h | 4 +- .../Effects/{ => Core}/ShowEffect.cpp | 6 +- .../Contents/Effects/{ => Core}/ShowEffect.h | 6 +- .../Effects/{ => Core}/SquareRangeEffect.cpp | 6 +- .../Effects/{ => Core}/SquareRangeEffect.h | 6 +- .../Contents/Effects/EffectPrimitiveMotion.h | 10 - .../{ => Effects}/EffectResourceSwitcher.cpp | 12 +- .../{ => Effects}/EffectResourceSwitcher.h | 10 +- .../{ => Particles}/AnimatedEmitterEffect.cpp | 4 +- .../{ => Particles}/AnimatedEmitterEffect.h | 6 +- .../CharacterParticleBundle.cpp | 8 +- .../{ => Particles}/CharacterParticleBundle.h | 6 +- .../Effects/{ => Particles}/EZ2STREffect.cpp | 8 +- .../Effects/{ => Particles}/EZ2STREffect.h | 8 +- .../{ => Particles}/EZ2STREffectEx.cpp | 4 +- .../Effects/{ => Particles}/EZ2STREffectEx.h | 6 +- .../Effects/{ => Particles}/EffectEmitter.h | 4 +- .../Effects/{ => Particles}/EmitterEffect.cpp | 6 +- .../Effects/{ => Particles}/EmitterEffect.h | 8 +- .../Effects/{ => Particles}/Particle.cpp | 2 +- .../Effects/{ => Particles}/Particle.h | 4 +- .../Effects/{ => Particles}/ParticlePool.cpp | 2 +- .../Effects/{ => Particles}/ParticlePool.h | 4 +- .../Effects/{ => Particles}/SpriteEffect.cpp | 8 +- .../Effects/{ => Particles}/SpriteEffect.h | 6 +- .../{ => Particles}/SpriteParticle.cpp | 4 +- .../Effects/{ => Particles}/SpriteParticle.h | 6 +- .../Effects/{ => Primitives}/EffectPrim.cpp | 4 +- .../Effects/{ => Primitives}/EffectPrim.h | 6 +- .../{ => Primitives}/EffectPrimitiveArcs.cpp | 6 +- .../{ => Primitives}/EffectPrimitiveColor.cpp | 4 +- .../EffectPrimitiveGlowSquares.cpp | 4 +- .../EffectPrimitiveMotion.cpp | 14 +- .../Primitives/EffectPrimitiveMotion.h | 10 + .../EffectPrimitivePanels.cpp | 6 +- .../EffectPrimitiveRecords.cpp | 4 +- .../EffectPrimitiveRendering.cpp | 14 +- .../EffectPrimitiveSprites.cpp | 6 +- .../{ => Primitives}/EffectPrimitiveState.cpp | 6 +- .../{ => Primitives}/EffectPrimitiveState.h | 4 +- .../EffectPrimitiveSweeps.cpp | 4 +- Source/Contents/{ => Effects}/RDamageVar.cpp | 2 +- Source/Contents/{ => Effects}/RDamageVar.h | 4 +- .../Effects/{ => Skills}/AMachineEffect.cpp | 6 +- .../Effects/{ => Skills}/AMachineEffect.h | 6 +- .../Effects/{ => Skills}/AcidifiedThrow.cpp | 8 +- .../Effects/{ => Skills}/AcidifiedThrow.h | 6 +- .../Effects/{ => Skills}/ArrowEffect.cpp | 2 +- .../Effects/{ => Skills}/ArrowEffect.h | 4 +- .../{ => Skills}/AstralStrikeEffect.cpp | 6 +- .../Effects/{ => Skills}/AstralStrikeEffect.h | 6 +- .../Effects/{ => Skills}/AxeBoomerang.cpp | 8 +- .../Effects/{ => Skills}/AxeBoomerang.h | 6 +- Source/Contents/Effects/{ => Skills}/Bash.cpp | 6 +- Source/Contents/Effects/{ => Skills}/Bash.h | 6 +- .../{ => Skills}/BezierArcThrowEffect.cpp | 4 +- .../{ => Skills}/BezierArcThrowEffect.h | 8 +- .../Effects/{ => Skills}/BindTrapEffect.cpp | 8 +- .../Effects/{ => Skills}/BindTrapEffect.h | 6 +- .../Effects/{ => Skills}/BlastForge.cpp | 4 +- .../Effects/{ => Skills}/BlastForge.h | 8 +- .../{ => Skills}/CaneOfEvilEyeEffect.cpp | 4 +- .../{ => Skills}/CaneOfEvilEyeEffect.h | 8 +- .../Effects/{ => Skills}/CartCannon.cpp | 4 +- .../Effects/{ => Skills}/CartCannon.h | 8 +- .../{ => Skills}/ChargingPierceEffect.cpp | 6 +- .../{ => Skills}/ChargingPierceEffect.h | 6 +- .../{ => Skills}/CherryBlossomEffect.cpp | 6 +- .../{ => Skills}/CherryBlossomEffect.h | 8 +- .../Effects/{ => Skills}/ClimaxEffect.cpp | 6 +- .../Effects/{ => Skills}/ClimaxEffect.h | 6 +- .../Effects/{ => Skills}/CloudEffect.cpp | 6 +- .../Effects/{ => Skills}/CloudEffect.h | 6 +- .../Effects/{ => Skills}/CloudKillEffect.cpp | 10 +- .../Effects/{ => Skills}/CloudKillEffect.h | 6 +- .../{ => Skills}/CommonFloorEffect.cpp | 6 +- .../Effects/{ => Skills}/CommonFloorEffect.h | 6 +- .../Effects/{ => Skills}/Competentia.cpp | 8 +- .../Effects/{ => Skills}/Competentia.h | 6 +- .../Effects/{ => Skills}/CresciveBolt.cpp | 6 +- .../Effects/{ => Skills}/CresciveBolt.h | 6 +- .../Effects/{ => Skills}/ElectricEffect.cpp | 6 +- .../Effects/{ => Skills}/ElectricEffect.h | 6 +- .../Effects/{ => Skills}/EnergyOrbEffect.cpp | 8 +- .../Effects/{ => Skills}/EnergyOrbEffect.h | 6 +- .../Effects/{ => Skills}/EvilLandEffect.cpp | 6 +- .../Effects/{ => Skills}/EvilLandEffect.h | 6 +- .../Effects/{ => Skills}/EvilsPawEffect.cpp | 6 +- .../Effects/{ => Skills}/EvilsPawEffect.h | 6 +- .../{ => Skills}/FlowerCastingEffect.cpp | 8 +- .../{ => Skills}/FlowerCastingEffect.h | 6 +- .../{ => Skills}/FortuneKissEffect.cpp | 6 +- .../Effects/{ => Skills}/FortuneKissEffect.h | 6 +- .../Effects/{ => Skills}/FriggSongEffect.cpp | 8 +- .../Effects/{ => Skills}/FriggSongEffect.h | 8 +- .../{ => Skills}/FuumaShouakuEffect.cpp | 10 +- .../Effects/{ => Skills}/FuumaShouakuEffect.h | 6 +- .../Effects/{ => Skills}/GlassWallEffect.cpp | 8 +- .../Effects/{ => Skills}/GlassWallEffect.h | 6 +- .../{ => Skills}/GravityControlEffect.h | 6 +- .../Effects/{ => Skills}/HealEffect.cpp | 8 +- .../Effects/{ => Skills}/HealEffect.h | 8 +- .../Effects/{ => Skills}/HealSpEffect.cpp | 8 +- .../Effects/{ => Skills}/HealSpEffect.h | 6 +- .../Effects/{ => Skills}/HitLineEffect.cpp | 6 +- .../Effects/{ => Skills}/HitLineEffect.h | 6 +- .../JupitelThunderStormEffect.cpp | 10 +- .../{ => Skills}/JupitelThunderStormEffect.h | 6 +- .../Effects/{ => Skills}/Level150Effect.cpp | 6 +- .../Effects/{ => Skills}/Level150Effect.h | 8 +- .../Effects/{ => Skills}/Level99Effect.cpp | 6 +- .../Effects/{ => Skills}/Level99Effect.h | 8 +- .../{ => Skills}/Level99Orb1Effect.cpp | 6 +- .../Effects/{ => Skills}/Level99Orb1Effect.h | 8 +- .../{ => Skills}/Level99Orb2Effect.cpp | 6 +- .../Effects/{ => Skills}/Level99Orb2Effect.h | 8 +- .../{ => Skills}/LightSphereEffect.cpp | 10 +- .../Effects/{ => Skills}/LightSphereEffect.h | 6 +- .../Effects/{ => Skills}/MagicFloorEffect.cpp | 6 +- .../Effects/{ => Skills}/MagicFloorEffect.h | 8 +- .../Effects/{ => Skills}/MagnumBreak.cpp | 6 +- .../Effects/{ => Skills}/MagnumBreak.h | 6 +- .../{ => Skills}/MandraAttackEffect.cpp | 2 +- .../Effects/{ => Skills}/MandraAttackEffect.h | 4 +- .../Effects/{ => Skills}/MapChainEffect.cpp | 6 +- .../Effects/{ => Skills}/MapChainEffect.h | 6 +- .../{ => Skills}/MapMagicZoneEffect.cpp | 6 +- .../Effects/{ => Skills}/MapMagicZoneEffect.h | 6 +- .../Effects/{ => Skills}/MappillarEffect.cpp | 8 +- .../Effects/{ => Skills}/MappillarEffect.h | 6 +- .../Effects/{ => Skills}/MeteorEffect.cpp | 10 +- .../{ => Skills}/MonsterSkillEffects.cpp | 20 +- .../{ => Skills}/MonsterSkillEffects.h | 8 +- .../Effects/{ => Skills}/NyanggrassEffect.cpp | 6 +- .../Effects/{ => Skills}/NyanggrassEffect.h | 8 +- .../{ => Skills}/PartyMemberEffects.cpp | 6 +- .../Effects/{ => Skills}/PartyMemberEffects.h | 4 +- .../Effects/{ => Skills}/PokJukEffect.cpp | 6 +- .../Effects/{ => Skills}/PokJukEffect.h | 6 +- .../Effects/{ => Skills}/PowderingEffect.cpp | 10 +- .../Effects/{ => Skills}/PowderingEffect.h | 6 +- .../Effects/{ => Skills}/RainbowEffect.cpp | 8 +- .../Effects/{ => Skills}/RainbowEffect.h | 6 +- .../Effects/{ => Skills}/RectUpEffect.cpp | 6 +- .../Effects/{ => Skills}/RectUpEffect.h | 8 +- .../Effects/{ => Skills}/RedLineEffect.cpp | 8 +- .../Effects/{ => Skills}/RedLineEffect.h | 6 +- .../Effects/{ => Skills}/RichManKim.cpp | 6 +- .../Effects/{ => Skills}/RichManKim.h | 6 +- .../Effects/{ => Skills}/RotateBgEffect.cpp | 8 +- .../Effects/{ => Skills}/RotateBgEffect.h | 6 +- .../Effects/{ => Skills}/RotateItemEffect.cpp | 6 +- .../Effects/{ => Skills}/RotateItemEffect.h | 6 +- .../Effects/{ => Skills}/RotateLineEffect.cpp | 8 +- .../Effects/{ => Skills}/RotateLineEffect.h | 8 +- .../{ => Skills}/SaintCastingEffect.cpp | 10 +- .../Effects/{ => Skills}/SaintCastingEffect.h | 6 +- .../Effects/{ => Skills}/ScatterEffect.cpp | 6 +- .../Effects/{ => Skills}/ScatterEffect.h | 6 +- .../{ => Skills}/ShadowExceedEffect.cpp | 8 +- .../Effects/{ => Skills}/ShadowExceedEffect.h | 6 +- .../{ => Skills}/ShadowExceedNewEffect.cpp | 8 +- .../Effects/{ => Skills}/SkillEffects.h | 6 +- .../Effects/{ => Skills}/SmokeEffect.cpp | 6 +- .../Effects/{ => Skills}/SmokeEffect.h | 6 +- .../{ => Skills}/SoulCollectEffect.cpp | 6 +- .../Effects/{ => Skills}/SoulCollectEffect.h | 6 +- .../Effects/{ => Skills}/SoulUnityEffect.cpp | 6 +- .../Effects/{ => Skills}/SoulUnityEffect.h | 6 +- .../{ => Skills}/SphereWind2Effect.cpp | 8 +- .../Effects/{ => Skills}/SphereWind2Effect.h | 6 +- .../Effects/{ => Skills}/SphereWindEffect.cpp | 8 +- .../Effects/{ => Skills}/SphereWindEffect.h | 6 +- .../Effects/{ => Skills}/StarEffect.cpp | 6 +- .../Effects/{ => Skills}/StarEffect.h | 6 +- .../{ => Skills}/StarEmperorEffect.cpp | 10 +- .../Effects/{ => Skills}/StarEmperorEffect.h | 6 +- .../Effects/{ => Skills}/StealEffect.cpp | 8 +- .../Effects/{ => Skills}/StealEffect.h | 6 +- .../{ => Skills}/StormCannonEffect.cpp | 6 +- .../Effects/{ => Skills}/StormCannonEffect.h | 6 +- .../Effects/{ => Skills}/StormGustEffect.cpp | 6 +- .../Effects/{ => Skills}/StormGustEffect.h | 6 +- .../Effects/{ => Skills}/StormKickEffect.cpp | 8 +- .../Effects/{ => Skills}/StormKickEffect.h | 8 +- .../Effects/{ => Skills}/SunStanceEffect.cpp | 6 +- .../Effects/{ => Skills}/SunStanceEffect.h | 6 +- .../{ => Skills}/TalismanMarkEffect.cpp | 4 +- .../Effects/{ => Skills}/TalismanMarkEffect.h | 6 +- .../Effects/{ => Skills}/TetraBallEffect.cpp | 8 +- .../Effects/{ => Skills}/TetraBallEffect.h | 6 +- .../Effects/{ => Skills}/ThrowEffects.cpp | 14 +- .../Effects/{ => Skills}/ThrowEffects.h | 6 +- .../{ => Skills}/TriangleShotArrow.cpp | 4 +- .../Effects/{ => Skills}/TriangleShotArrow.h | 6 +- .../{ => Skills}/ViolentQuakeEffect.cpp | 8 +- .../Effects/{ => Skills}/ViolentQuakeEffect.h | 6 +- .../Effects/{ => Skills}/WhirlwindEffect.h | 6 +- .../Effects/{ => Skills}/WindEffect.cpp | 6 +- .../Effects/{ => Skills}/WindEffect.h | 8 +- Source/Contents/Emblems/EmblemCache.cpp | 2 +- .../Contents/{ => Emblems}/EmblemCacheRaw.cpp | 4 +- Source/Contents/Emblems/EmblemUpload.cpp | 2 +- .../{ => Emblems}/GuildEmblemLookup.cpp | 2 +- .../{ => Emblems}/GuildEmblemState.cpp | 2 +- .../{ => EntryQueue}/EntryQueueMgr.cpp | 4 +- .../Contents/{ => EntryQueue}/EntryQueueMgr.h | 4 +- .../{ => Events}/CheckAttendanceMgr.cpp | 2 +- .../{ => Events}/CheckAttendanceMgr.h | 4 +- Source/Contents/{ => Events}/RouletteMgr.cpp | 2 +- Source/Contents/{ => Events}/RouletteMgr.h | 4 +- .../{ => Events}/ShowRankingScheduler.cpp | 6 +- .../{ => Events}/ShowRankingScheduler.h | 4 +- .../Contents/{ => Events}/SpecialPopupMgr.cpp | 2 +- .../Contents/{ => Events}/SpecialPopupMgr.h | 4 +- Source/Contents/Ground/GroundLighting.cpp | 6 +- .../Contents/Ground/GroundWaterRendering.cpp | 2 +- Source/Contents/{ => Guild}/GuildInfo.cpp | 4 +- Source/Contents/{ => Guild}/GuildInfo.h | 4 +- Source/Contents/{ => Guild}/GuildMgr.cpp | 2 +- Source/Contents/{ => Guild}/GuildMgr.h | 4 +- Source/Contents/{ => Guild}/GuildTip.cpp | 2 +- Source/Contents/{ => Guild}/GuildTip.h | 6 +- Source/Contents/Hotkeys/EmotionHotkeys.cpp | 2 +- .../Contents/{ => Items}/ClientItemLists.cpp | 12 +- Source/Contents/{ => Items}/ClientItemLists.h | 4 +- Source/Contents/{ => Items}/EnchantMgr.cpp | 8 +- Source/Contents/{ => Items}/EnchantMgr.h | 4 +- Source/Contents/{ => Items}/ItemDBToIDMgr.cpp | 2 +- Source/Contents/{ => Items}/ItemDBToIDMgr.h | 4 +- Source/Contents/Items/ItemNaming.cpp | 4 +- Source/Contents/Items/ItemReformMgr.cpp | 2 +- .../Contents/{ => Items}/JobCodeForItem.cpp | 2 +- Source/Contents/{ => Items}/JobCodeForItem.h | 4 +- Source/Contents/Jobs/JobInheritance.cpp | 16 +- .../{ => Map}/FlyingShipRouteInfo.cpp | 2 +- .../Contents/{ => Map}/FlyingShipRouteInfo.h | 4 +- Source/Contents/{ => Map}/MapInfoMgr.cpp | 4 +- Source/Contents/{ => Map}/MapInfoMgr.h | 4 +- Source/Contents/{ => Map}/MapNameTable.cpp | 2 +- Source/Contents/{ => Map}/MapPropertyMgr.cpp | 2 +- Source/Contents/{ => Map}/MapPropertyMgr.h | 4 +- Source/Contents/{ => Map}/MapSkyMgr.cpp | 8 +- Source/Contents/{ => Map}/MapSkyMgr.h | 4 +- .../Contents/{ => Map}/PrivateAirplaneMgr.cpp | 2 +- .../Contents/{ => Map}/PrivateAirplaneMgr.h | 4 +- Source/Contents/{ => Map}/TownInfoMgr.cpp | 2 +- Source/Contents/{ => Map}/TownInfoMgr.h | 4 +- Source/Contents/Messenger/ClientMessenger.cpp | 16 +- Source/Contents/Messenger/MessengerMember.cpp | 6 +- .../Contents/{ => Models}/ModelKeyframes.cpp | 0 Source/Contents/Models/ModelRendering.cpp | 4 +- .../{ => Monster}/ChampionMonsterMgr.cpp | 6 +- .../{ => Monster}/ChampionMonsterMgr.h | 4 +- .../{ => Monster}/EnemyMonsterTalk.cpp | 2 +- .../Contents/{ => Monster}/MonsterSpeech.cpp | 0 .../{ => Monster}/MonsterXmlActions.cpp | 2 +- .../{ => Movement}/ActorMovementRoute.cpp | 2 +- .../Contents/{ => Movement}/MovementRoute.cpp | 2 +- .../MovementRouteInterpolation.cpp | 2 +- .../MovementRouteInterpolation.h | 4 +- .../{ => Movement}/MovementTraversal.cpp | 2 +- .../Contents/{ => Movement}/Pathfinding.cpp | 2 +- .../{ => Movement}/TerrainPathSearch.cpp | 2 +- .../{ => Movement}/TerrainPathSearch.h | 6 +- .../{ => Navigation}/NavigationCandidates.cpp | 4 +- .../NavigationDestinations.cpp | 2 +- .../{ => Navigation}/NavigationGraph.cpp | 2 +- .../{ => Navigation}/NavigationLink.cpp | 2 +- .../{ => Navigation}/NavigationManager.h | 8 +- .../{ => Navigation}/NavigationRequest.cpp | 2 +- .../{ => Navigation}/NavigationRoute.cpp | 4 +- .../{ => Navigation}/NavigationSource.cpp | 2 +- .../{ => Navigation}/NpcLocationRadius.cpp | 0 .../{ => Navigation}/WorldNavigation.cpp | 4 +- Source/Contents/Party/PartyBookingMgr.cpp | 2 +- Source/Contents/Party/PartyInfoCompletion.cpp | 2 +- Source/Contents/Party/PartyJoinResult.cpp | 2 +- .../Party/PartyRegistrationCompletion.cpp | 2 +- .../Party/StopRecruitingCompletion.cpp | 2 +- Source/Contents/{Actors => Pet}/PetEnums.h | 4 +- Source/Contents/{ => Pet}/PetEvolutionMgr.cpp | 2 +- Source/Contents/{ => Pet}/PetEvolutionMgr.h | 4 +- Source/Contents/{ => Pet}/PetStatus.cpp | 2 +- Source/Contents/{ => Pet}/PetStrings.cpp | 0 Source/Contents/{ => Pet}/PetTalk.cpp | 4 +- Source/Contents/{ => Pet}/PetTalkNames.cpp | 0 Source/Contents/{ => Quest}/RenewQuestMgr.cpp | 4 +- Source/Contents/{ => Quest}/RenewQuestMgr.h | 4 +- Source/Contents/{ => Repute}/ReputeMgr.cpp | 4 +- Source/Contents/{ => Repute}/ReputeMgr.h | 6 +- Source/Contents/{ => Repute}/ReputeRecords.h | 4 +- .../Contents/{ => Rodex}/RodexMailStore.cpp | 2 +- Source/Contents/{ => Rodex}/RodexMailStore.h | 4 +- .../{Items => RuneSystem}/RuneSystem.cpp | 2 +- .../{Items => RuneSystem}/RuneSystem.h | 4 +- .../Schedule/CaptchaUploadSchedule.cpp | 2 +- Source/Contents/Schedule/CheckGDISchedule.cpp | 4 +- Source/Contents/Schedule/EmotionSchedule.cpp | 4 +- .../Schedule/PartialShutDownSchedule.cpp | 4 +- Source/Contents/Schedule/ShutDownSchedule.cpp | 2 +- Source/Contents/Schedule/TimeScheduler.cpp | 2 +- Source/Contents/Skills/ClientSkills.cpp | 4 +- .../{Actors => Skills}/GraffiSkill.cpp | 2 +- .../Contents/{Actors => Skills}/GraffiSkill.h | 4 +- Source/Contents/Skills/SkillActionAlitea.cpp | 14 +- Source/Contents/Skills/SkillActionDruid.cpp | 16 +- .../Skills/SkillActionImperialGuard.cpp | 12 +- Source/Contents/Skills/SkillActionInfo.cpp | 4 +- Source/Contents/Skills/SkillActionKarnos.cpp | 18 +- Source/Contents/Skills/SkillActionMeister.cpp | 12 +- .../Contents/Skills/SkillActionNightWatch.cpp | 12 +- .../Skills/SkillActionShinkiroShiranui.cpp | 12 +- .../Contents/Skills/SkillActionSkyEmperor.cpp | 8 +- .../Skills/SkillActionSoulAscetic.cpp | 10 +- .../Skills/SkillActionSpiritHandler.cpp | 10 +- .../Contents/Skills/SkillActionTroubadour.cpp | 12 +- .../Contents/Skills/SkillActionWindHawk.cpp | 10 +- Source/Contents/Skills/SkillInfo.cpp | 18 +- Source/Contents/{ => Skin}/SkinCatalog.cpp | 2 +- Source/Contents/{ => Skin}/SkinInfo.cpp | 2 +- Source/Contents/{ => Skin}/SkinMgr.cpp | 2 +- Source/Contents/{ => Skin}/SkinMgr.h | 4 +- Source/Contents/{ => Sound}/HitSounds.cpp | 0 Source/Contents/Sound/SoundMaker.cpp | 6 +- Source/Contents/SpriteLayerOrder.h | 8 - Source/Contents/SpriteRidingPolicy.h | 6 - Source/Contents/{ => Sprites}/RobeOpacity.cpp | 0 .../Contents/{ => Sprites}/RobeTopLayer.cpp | 0 .../SpriteFrameSynchronization.cpp | 0 Source/Contents/{ => Sprites}/SpriteJob.cpp | 0 .../{ => Sprites}/SpriteLayerDepth.cpp | 0 .../{ => Sprites}/SpriteLayerDrawing.cpp | 10 +- .../{ => Sprites}/SpriteLayerDrawing.h | 4 +- .../{ => Sprites}/SpriteLayerOrder.cpp | 2 +- Source/Contents/Sprites/SpriteLayerOrder.h | 8 + .../{ => Sprites}/SpriteRidingOffset.cpp | 4 +- .../{ => Sprites}/SpriteRidingOffset.h | 4 +- .../{ => Sprites}/SpriteRidingPolicy.cpp | 2 +- Source/Contents/Sprites/SpriteRidingPolicy.h | 6 + Source/Contents/{ => Sprites}/SpriteRobe.cpp | 0 .../{ => Sprites}/SpriteRobeCommands.cpp | 0 .../Contents/{ => Sprites}/SpriteShadow.cpp | 0 Source/Contents/Store/MCStoreInfoBackup.cpp | 2 +- .../Contents/{ => Tables}/ClientXmlTables.cpp | 0 .../Contents/{ => Tables}/ForbiddenWords.cpp | 2 +- Source/Contents/{ => Tables}/ForbiddenWords.h | 4 +- Source/Contents/{ => Tables}/MessageTable.cpp | 2 +- Source/Contents/{ => Tables}/MessageTable.h | 4 +- .../Contents/{ => Tables}/SimpleStringMgr.cpp | 2 +- .../Contents/{ => Tables}/SimpleStringMgr.h | 4 +- Source/Contents/{ => Tables}/TableMng.cpp | 2 +- Source/Contents/{ => Tables}/TableMng.h | 4 +- Source/Contents/{ => Tables}/TipBoxTitles.cpp | 2 +- Source/Contents/{ => Tables}/TipBoxTitles.h | 4 +- Source/Contents/{ => Tables}/TipOfTheDay.cpp | 2 +- Source/Contents/{ => Tables}/TipOfTheDay.h | 4 +- Source/Contents/{ => Time}/ClientTiming.cpp | 6 +- .../Contents/{ => Time}/ServerTimeManager.cpp | 2 +- .../Contents/{ => Time}/ServerTimeManager.h | 4 +- Source/Contents/UserData/NormalItemSlots.cpp | 2 +- Source/Contents/World/SkyBox.cpp | 2 +- Source/Contents/World/WorldEffects.cpp | 4 +- Source/Contents/World/WorldModelView.cpp | 4 +- Source/Contents/World/WorldObjects.cpp | 22 +- Source/Contents/World/WorldProximity.cpp | 2 +- Source/Contents/World/WorldSpatialTree.cpp | 2 +- .../{WorldView => World}/WorldViewData.cpp | 4 +- .../{WorldView => World}/WorldViewData.h | 4 +- Source/EntityInit.cpp | 2 +- Source/File/FileCreation.cpp | 2 +- Source/Network/ActorNamePacket.cpp | 2 +- Source/Render/DX9/RendererFrameDX9.cpp | 2 +- Source/Render/Primitives/ScreenLine.cpp | 2 +- Source/Resource/EmblemResource.cpp | 2 +- Source/Resource/TextureNames.cpp | 2 +- Source/Script/LuaScript.cpp | 14 +- Source/Security/NProtectGameGuardMgr.cpp | 2 +- Source/UI/Acceptance/UIChooseSellBuyWnd.cpp | 20 +- Source/UI/Acceptance/UIExchangeAcceptWnd.cpp | 2 +- Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp | 2 +- Source/UI/AdventureGuide/UIAdventureGuide.cpp | 10 +- Source/UI/Buttons/UIButton.cpp | 2 +- Source/UI/Buttons/UINaviLinkButton.cpp | 2 +- Source/UI/Buttons/UITextButton.cpp | 4 +- Source/UI/Buttons/UITextureButton.cpp | 2 +- Source/UI/CashShop/UICashShopWnd.cpp | 2 +- Source/UI/Chat/UIChatRoomMakeWnd.cpp | 2 +- Source/UI/Chat/UIChatRoomTitle.cpp | 4 +- Source/UI/Chat/UINewChatWnd.cpp | 2 +- Source/UI/Clan/UIClanWnd.cpp | 6 +- Source/UI/Dialogs/UIEditctrlWnd.cpp | 6 +- Source/UI/Dialogs/UIPasswordWnd.cpp | 2 +- Source/UI/Edit/UIEditCtrl.cpp | 10 +- Source/UI/Edit/UIEditVariants.cpp | 2 +- Source/UI/Emotion/UIEmotionWnd.cpp | 4 +- Source/UI/Enchant/UIEnchantUI.cpp | 2 +- Source/UI/EntryQueue/UIEntryQueueWnd.cpp | 8 +- Source/UI/Exchange/UIExchangeUI.cpp | 2 +- Source/UI/GameSettings/GameSettingsUI.cpp | 4 +- Source/UI/Guild/UIAgitWnd.cpp | 6 +- Source/UI/Guild/UIGuildHelperWnd.cpp | 4 +- Source/UI/Guild/UIGuildWnd.cpp | 6 +- Source/UI/Guild/UIGuildWnd.h | 6 +- Source/UI/Guild/UIGuild_Storage_Log.cpp | 2 +- Source/UI/Item/UIEquipmentPropertiesWnd.cpp | 2 +- Source/UI/Item/UIMerchantItemLogWnd.cpp | 4 +- Source/UI/Item/UIParaItemShopWnd.cpp | 4 +- Source/UI/Items/MergeItemWnd.cpp | 4 +- Source/UI/Items/UIGameItem.cpp | 4 +- Source/UI/Items/UIItemRepairWnd.cpp | 4 +- Source/UI/Items/UIMakeTargetListWnd.cpp | 4 +- Source/UI/Items/UIMakeTargetProcessWnd.cpp | 2 +- Source/UI/Items/UISwapEquipmentWnd.cpp | 4 +- Source/UI/Items/UIWeaponRefineWnd.cpp | 4 +- Source/UI/Lists/UIChatHisBox.cpp | 6 +- Source/UI/Lists/UIComboBoxDefWnd.cpp | 4 +- Source/UI/Lists/UIListBox.cpp | 2 +- Source/UI/Lists/UIListBoxEx.cpp | 2 +- Source/UI/Lists/UIScrollBar.cpp | 10 +- Source/UI/Lists/UIScrollBarVariants.h | 2 +- Source/UI/Lists/UITagListBox.cpp | 2 +- Source/UI/Menu/UIMenuIconWnd.cpp | 8 +- Source/UI/Party/UIAdvenPartyBoardWnd.cpp | 2 +- Source/UI/Party/UIApplyForPartyWnd.cpp | 2 +- Source/UI/Party/UIMiniPartyWnd.cpp | 4 +- Source/UI/Party/UIPartyInfoWnd.cpp | 2 +- Source/UI/Party/UIRegisterPartyWnd.cpp | 4 +- Source/UI/Party/UIRequestJoinPartyWnd.cpp | 2 +- .../ProbabilityTable/UIProbabilityTable.cpp | 2 +- .../UIProbabilityTableEvents.cpp | 2 +- Source/UI/Quest/UIOngoingQuestInfo.cpp | 6 +- Source/UI/Quest/UIQuestDisplay.cpp | 4 +- Source/UI/Quest/UIRecommendedQuestInfo.cpp | 4 +- Source/UI/Quest/UIRenewQuestUI.cpp | 4 +- Source/UI/Quest/UIRenewQuestWnd.cpp | 6 +- Source/UI/Rodex/UIRodexComposeWnd.cpp | 8 +- Source/UI/Rodex/UIRodexInboxWnd.cpp | 4 +- Source/UI/Rodex/UIRodexInboxWnd.h | 2 +- Source/UI/RuneSystem/UIRuneSystemWindows.h | 4 +- Source/UI/RuneSystem/UIRuneSystemWnd.cpp | 4 +- Source/UI/RuneSystem/UIRuneSystemWnd.h | 4 +- .../UISelectPackageItemBox.cpp | 4 +- Source/UI/Shop/UIMerchantShopTitle.cpp | 2 +- Source/UI/Shortcuts/ShortcutControls.cpp | 2 +- Source/UI/Shortcuts/ShortcutCooldowns.cpp | 4 +- Source/UI/Shortcuts/ShortcutPainting.cpp | 2 +- Source/UI/Shortcuts/ShortcutTooltip.cpp | 2 +- Source/UI/Shortcuts/UIQuickSlotWnd.cpp | 6 +- Source/UI/Shortcuts/UIShortCutWnd.cpp | 6 +- Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp | 2 +- Source/UI/StylingShop/UIStylingShopWnd.cpp | 2 +- Source/UI/Text/ItemLinkDisplay.cpp | 2 +- Source/UI/Text/NavigationLink.cpp | 10 +- Source/UI/Text/UIAchWnd.cpp | 2 +- Source/UI/Text/UIAchWnd.h | 2 +- Source/UI/Text/UIBalloonText.cpp | 4 +- Source/UI/Text/UITagTextViewer.cpp | 2 +- Source/UI/Text/UITextViewer.cpp | 2 +- Source/UI/Text/UITextViewerMessages.cpp | 2 +- Source/UI/UIBartermarketWnd.cpp | 2 +- Source/UI/UICaptchaPreviewWnd.cpp | 2 +- Source/UI/UICaptchaRegisterWnd.cpp | 2 +- Source/UI/UIChangeMaterialWnd.cpp | 4 +- Source/UI/UICheckAttendanceWnd.cpp | 4 +- Source/UI/UIGradeEnchantWnd.cpp | 2 +- Source/UI/UIHotkeyGuideWnd.cpp | 4 +- Source/UI/UIItemReformWnd.cpp | 4 +- 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/UIMacroUserInfoWnd.cpp | 4 +- Source/UI/UIPreviewEquipWnd.cpp | 4 +- Source/UI/UIRefiningWnd.cpp | 2 +- Source/UI/UIReputeWnd.cpp | 4 +- Source/UI/UIReputeWnd.h | 2 +- Source/UI/UIRoundBoxTooltipWnd.cpp | 2 +- Source/UI/Window/FuncDrawWNDChar.cpp | 4 +- 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/UIChangeNameWnd.cpp | 4 +- Source/UI/Window/UIEmblemWnd.cpp | 2 +- Source/UI/Window/UIEscOptionWnd.cpp | 2 +- Source/UI/Window/UIFrameWnd.cpp | 6 +- Source/UI/Window/UIHotKeyWnd.cpp | 2 +- Source/UI/Window/UIJobListWnd.cpp | 2 +- Source/UI/Window/UIMessageBox.cpp | 10 +- Source/UI/Window/UIMileageWnd.cpp | 2 +- Source/UI/Window/UINavigationHelpWnd.cpp | 2 +- Source/UI/Window/UINavigationWnd.cpp | 4 +- Source/UI/Window/UINewMakeCharWnd.cpp | 4 +- Source/UI/Window/UINewMakeCharWnd.h | 2 +- Source/UI/Window/UINewSelectCharWnd.cpp | 4 +- Source/UI/Window/UINewSkillListWnd.cpp | 4 +- Source/UI/Window/UINormalMB.cpp | 2 +- Source/UI/Window/UINoteWnd.cpp | 2 +- Source/UI/Window/UIOpenMailBoxWnd.cpp | 2 +- Source/UI/Window/UIPartyBookingHelpWnd.cpp | 2 +- Source/UI/Window/UIPetEvolutionWnd.cpp | 4 +- Source/UI/Window/UIRoMapWnd.cpp | 6 +- Source/UI/Window/UIRoMapWnd.h | 4 +- Source/UI/Window/UIRodexContentsWnd.cpp | 8 +- Source/UI/Window/UIRoulletteWnd.cpp | 6 +- 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/UIVideoWnd.cpp | 2 +- Source/UI/Window/UIWindow.cpp | 10 +- Source/UI/Window/UIWindowMgr.cpp | 20 +- Source/UI/Window/UIZeroChatWnd.cpp | 2 +- Source/UI/Window/WindowMgrState.cpp | 2 +- Source/Utility/JsonCppLoader.h | 2 +- data/compile.json | 424 +++++++++--------- 609 files changed, 1916 insertions(+), 1916 deletions(-) rename Source/Contents/{ => Achievement}/AchievementMgr.cpp (99%) rename Source/Contents/{ => Achievement}/AchievementMgr.h (96%) rename Source/Contents/{ => Actors}/ActorGeometry.cpp (100%) rename Source/Contents/{ => Actors}/ActorNameCache.cpp (98%) rename Source/Contents/{ => Actors}/ActorNameCard.cpp (97%) rename Source/Contents/{ => Actors}/ActorNameCard.h (95%) rename Source/Contents/{ => Actors}/ActorNameDirectory.cpp (93%) rename Source/Contents/{ => Actors}/ActorNameRequests.cpp (97%) rename Source/Contents/{ => Actors}/PlayerNameDictionary.cpp (97%) rename Source/Contents/{ => Actors}/PlayerNameDictionary.h (91%) rename Source/Contents/{ => Actors/Resources}/BodyResources.cpp (99%) rename Source/Contents/{ => Actors/Resources}/EquipmentResourceMgr.h (92%) rename Source/Contents/{ => Actors/Resources}/EquipmentResources.cpp (99%) rename Source/Contents/{ => Actors/Resources}/HeadResources.cpp (99%) rename Source/Contents/{ => Actors/Resources}/MonsterResources.cpp (100%) rename Source/Contents/{ => Actors/Resources}/RobeResources.cpp (98%) rename Source/Contents/{ => Actors/Resources}/StatusIconImages.cpp (99%) rename Source/Contents/{ => AdventureGuide}/AdventureGuideMgr.cpp (99%) rename Source/Contents/{ => AdventureGuide}/AdventureGuideMgr.h (97%) rename Source/Contents/{ => CashEmotion}/CashEmotionMgr.cpp (99%) rename Source/Contents/{ => CashEmotion}/CashEmotionMgr.h (98%) rename Source/Contents/{ => Clan}/ClanInfo.cpp (96%) rename Source/Contents/{ => Clan}/ClanInfo.h (91%) rename Source/Contents/{Combat => }/CombatTypes.h (93%) rename Source/Contents/{ => Configuration}/ConfigMgr.cpp (93%) rename Source/Contents/{ => Configuration}/ConfigMgr.h (87%) rename Source/Contents/Effects/{ => Core}/CellRangeEffect.cpp (95%) rename Source/Contents/Effects/{ => Core}/CellRangeEffect.h (79%) rename Source/Contents/Effects/{ => Core}/ChangeSizeEffect.cpp (78%) rename Source/Contents/Effects/{ => Core}/ChangeSizeEffect.h (55%) rename Source/Contents/Effects/{ => Core}/DummyEffectLauncher.cpp (91%) rename Source/Contents/Effects/{ => Core}/DummyEffectLauncher.h (73%) rename Source/Contents/Effects/{ => Core}/Effect.cpp (97%) rename Source/Contents/Effects/{ => Core}/Effect.h (96%) rename Source/Contents/Effects/{ => Core}/EffectActor.cpp (92%) rename Source/Contents/Effects/{ => Core}/EffectActor.h (91%) rename Source/Contents/Effects/{ => Core}/EffectAttachments.cpp (88%) rename Source/Contents/Effects/{ => Core}/EffectForceRender.cpp (85%) rename Source/Contents/Effects/{ => Core}/EffectLists.cpp (98%) rename Source/Contents/Effects/{ => Core}/EffectLists.h (92%) rename Source/Contents/Effects/{ => Core}/EffectMaker.cpp (96%) rename Source/Contents/Effects/{ => Core}/EffectMaker.h (81%) rename Source/Contents/Effects/{ => Core}/EffectMemoryMgr.cpp (96%) rename Source/Contents/Effects/{ => Core}/EffectMemoryMgr.h (76%) rename Source/Contents/Effects/{ => Core}/EffectMessageId.h (91%) rename Source/Contents/Effects/{ => Core}/EffectPoint.h (60%) rename Source/Contents/Effects/{ => Core}/EffectPrimId.h (93%) rename Source/Contents/Effects/{ => Core}/EffectTypes.cpp (99%) rename Source/Contents/Effects/{ => Core}/EffectTypes.h (99%) rename Source/Contents/Effects/{ => Core}/EffectVisibility.cpp (90%) rename Source/Contents/Effects/{ => Core}/MsgEffect.cpp (99%) rename Source/Contents/Effects/{ => Core}/MsgEffect.h (89%) rename Source/Contents/Effects/{ => Core}/RagEffect.cpp (99%) rename Source/Contents/Effects/{ => Core}/RagEffect.h (98%) rename Source/Contents/Effects/{ => Core}/RagEffectInitialization.cpp (98%) rename Source/Contents/Effects/{ => Core}/RagEffectState.h (93%) rename Source/Contents/Effects/{ => Core}/ShowEffect.cpp (95%) rename Source/Contents/Effects/{ => Core}/ShowEffect.h (70%) rename Source/Contents/Effects/{ => Core}/SquareRangeEffect.cpp (93%) rename Source/Contents/Effects/{ => Core}/SquareRangeEffect.h (75%) delete mode 100644 Source/Contents/Effects/EffectPrimitiveMotion.h rename Source/Contents/{ => Effects}/EffectResourceSwitcher.cpp (97%) rename Source/Contents/{ => Effects}/EffectResourceSwitcher.h (90%) rename Source/Contents/Effects/{ => Particles}/AnimatedEmitterEffect.cpp (94%) rename Source/Contents/Effects/{ => Particles}/AnimatedEmitterEffect.h (72%) rename Source/Contents/Effects/{ => Particles}/CharacterParticleBundle.cpp (97%) rename Source/Contents/Effects/{ => Particles}/CharacterParticleBundle.h (88%) rename Source/Contents/Effects/{ => Particles}/EZ2STREffect.cpp (99%) rename Source/Contents/Effects/{ => Particles}/EZ2STREffect.h (89%) rename Source/Contents/Effects/{ => Particles}/EZ2STREffectEx.cpp (92%) rename Source/Contents/Effects/{ => Particles}/EZ2STREffectEx.h (87%) rename Source/Contents/Effects/{ => Particles}/EffectEmitter.h (93%) rename Source/Contents/Effects/{ => Particles}/EmitterEffect.cpp (98%) rename Source/Contents/Effects/{ => Particles}/EmitterEffect.h (89%) rename Source/Contents/Effects/{ => Particles}/Particle.cpp (99%) rename Source/Contents/Effects/{ => Particles}/Particle.h (98%) rename Source/Contents/Effects/{ => Particles}/ParticlePool.cpp (97%) rename Source/Contents/Effects/{ => Particles}/ParticlePool.h (80%) rename Source/Contents/Effects/{ => Particles}/SpriteEffect.cpp (99%) rename Source/Contents/Effects/{ => Particles}/SpriteEffect.h (75%) rename Source/Contents/Effects/{ => Particles}/SpriteParticle.cpp (99%) rename Source/Contents/Effects/{ => Particles}/SpriteParticle.h (85%) rename Source/Contents/Effects/{ => Primitives}/EffectPrim.cpp (97%) rename Source/Contents/Effects/{ => Primitives}/EffectPrim.h (97%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveArcs.cpp (99%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveColor.cpp (95%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveGlowSquares.cpp (97%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveMotion.cpp (99%) create mode 100644 Source/Contents/Effects/Primitives/EffectPrimitiveMotion.h rename Source/Contents/Effects/{ => Primitives}/EffectPrimitivePanels.cpp (98%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveRecords.cpp (92%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveRendering.cpp (99%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveSprites.cpp (98%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveState.cpp (93%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveState.h (97%) rename Source/Contents/Effects/{ => Primitives}/EffectPrimitiveSweeps.cpp (99%) rename Source/Contents/{ => Effects}/RDamageVar.cpp (64%) rename Source/Contents/{ => Effects}/RDamageVar.h (54%) rename Source/Contents/Effects/{ => Skills}/AMachineEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/AMachineEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/AcidifiedThrow.cpp (98%) rename Source/Contents/Effects/{ => Skills}/AcidifiedThrow.h (81%) rename Source/Contents/Effects/{ => Skills}/ArrowEffect.cpp (99%) rename Source/Contents/Effects/{ => Skills}/ArrowEffect.h (88%) rename Source/Contents/Effects/{ => Skills}/AstralStrikeEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/AstralStrikeEffect.h (76%) rename Source/Contents/Effects/{ => Skills}/AxeBoomerang.cpp (95%) rename Source/Contents/Effects/{ => Skills}/AxeBoomerang.h (82%) rename Source/Contents/Effects/{ => Skills}/Bash.cpp (98%) rename Source/Contents/Effects/{ => Skills}/Bash.h (80%) rename Source/Contents/Effects/{ => Skills}/BezierArcThrowEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/BezierArcThrowEffect.h (84%) rename Source/Contents/Effects/{ => Skills}/BindTrapEffect.cpp (93%) rename Source/Contents/Effects/{ => Skills}/BindTrapEffect.h (72%) rename Source/Contents/Effects/{ => Skills}/BlastForge.cpp (98%) rename Source/Contents/Effects/{ => Skills}/BlastForge.h (79%) rename Source/Contents/Effects/{ => Skills}/CaneOfEvilEyeEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/CaneOfEvilEyeEffect.h (79%) rename Source/Contents/Effects/{ => Skills}/CartCannon.cpp (97%) rename Source/Contents/Effects/{ => Skills}/CartCannon.h (82%) rename Source/Contents/Effects/{ => Skills}/ChargingPierceEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/ChargingPierceEffect.h (85%) rename Source/Contents/Effects/{ => Skills}/CherryBlossomEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/CherryBlossomEffect.h (71%) rename Source/Contents/Effects/{ => Skills}/ClimaxEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/ClimaxEffect.h (72%) rename Source/Contents/Effects/{ => Skills}/CloudEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/CloudEffect.h (88%) rename Source/Contents/Effects/{ => Skills}/CloudKillEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/CloudKillEffect.h (80%) rename Source/Contents/Effects/{ => Skills}/CommonFloorEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/CommonFloorEffect.h (78%) rename Source/Contents/Effects/{ => Skills}/Competentia.cpp (94%) rename Source/Contents/Effects/{ => Skills}/Competentia.h (75%) rename Source/Contents/Effects/{ => Skills}/CresciveBolt.cpp (94%) rename Source/Contents/Effects/{ => Skills}/CresciveBolt.h (72%) rename Source/Contents/Effects/{ => Skills}/ElectricEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/ElectricEffect.h (78%) rename Source/Contents/Effects/{ => Skills}/EnergyOrbEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/EnergyOrbEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/EvilLandEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/EvilLandEffect.h (71%) rename Source/Contents/Effects/{ => Skills}/EvilsPawEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/EvilsPawEffect.h (84%) rename Source/Contents/Effects/{ => Skills}/FlowerCastingEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/FlowerCastingEffect.h (80%) rename Source/Contents/Effects/{ => Skills}/FortuneKissEffect.cpp (94%) rename Source/Contents/Effects/{ => Skills}/FortuneKissEffect.h (74%) rename Source/Contents/Effects/{ => Skills}/FriggSongEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/FriggSongEffect.h (72%) rename Source/Contents/Effects/{ => Skills}/FuumaShouakuEffect.cpp (93%) rename Source/Contents/Effects/{ => Skills}/FuumaShouakuEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/GlassWallEffect.cpp (95%) rename Source/Contents/Effects/{ => Skills}/GlassWallEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/GravityControlEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/HealEffect.cpp (99%) rename Source/Contents/Effects/{ => Skills}/HealEffect.h (86%) rename Source/Contents/Effects/{ => Skills}/HealSpEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/HealSpEffect.h (81%) rename Source/Contents/Effects/{ => Skills}/HitLineEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/HitLineEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/JupitelThunderStormEffect.cpp (95%) rename Source/Contents/Effects/{ => Skills}/JupitelThunderStormEffect.h (78%) rename Source/Contents/Effects/{ => Skills}/Level150Effect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/Level150Effect.h (85%) rename Source/Contents/Effects/{ => Skills}/Level99Effect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/Level99Effect.h (78%) rename Source/Contents/Effects/{ => Skills}/Level99Orb1Effect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/Level99Orb1Effect.h (72%) rename Source/Contents/Effects/{ => Skills}/Level99Orb2Effect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/Level99Orb2Effect.h (73%) rename Source/Contents/Effects/{ => Skills}/LightSphereEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/LightSphereEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/MagicFloorEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/MagicFloorEffect.h (79%) rename Source/Contents/Effects/{ => Skills}/MagnumBreak.cpp (98%) rename Source/Contents/Effects/{ => Skills}/MagnumBreak.h (80%) rename Source/Contents/Effects/{ => Skills}/MandraAttackEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/MandraAttackEffect.h (80%) rename Source/Contents/Effects/{ => Skills}/MapChainEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/MapChainEffect.h (83%) rename Source/Contents/Effects/{ => Skills}/MapMagicZoneEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/MapMagicZoneEffect.h (85%) rename Source/Contents/Effects/{ => Skills}/MappillarEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/MappillarEffect.h (76%) rename Source/Contents/Effects/{ => Skills}/MeteorEffect.cpp (94%) rename Source/Contents/Effects/{ => Skills}/MonsterSkillEffects.cpp (99%) rename Source/Contents/Effects/{ => Skills}/MonsterSkillEffects.h (98%) rename Source/Contents/Effects/{ => Skills}/NyanggrassEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/NyanggrassEffect.h (87%) rename Source/Contents/Effects/{ => Skills}/PartyMemberEffects.cpp (97%) rename Source/Contents/Effects/{ => Skills}/PartyMemberEffects.h (55%) rename Source/Contents/Effects/{ => Skills}/PokJukEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/PokJukEffect.h (84%) rename Source/Contents/Effects/{ => Skills}/PowderingEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/PowderingEffect.h (82%) rename Source/Contents/Effects/{ => Skills}/RainbowEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/RainbowEffect.h (80%) rename Source/Contents/Effects/{ => Skills}/RectUpEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/RectUpEffect.h (78%) rename Source/Contents/Effects/{ => Skills}/RedLineEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/RedLineEffect.h (80%) rename Source/Contents/Effects/{ => Skills}/RichManKim.cpp (95%) rename Source/Contents/Effects/{ => Skills}/RichManKim.h (77%) rename Source/Contents/Effects/{ => Skills}/RotateBgEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/RotateBgEffect.h (85%) rename Source/Contents/Effects/{ => Skills}/RotateItemEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/RotateItemEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/RotateLineEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/RotateLineEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/SaintCastingEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/SaintCastingEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/ScatterEffect.cpp (94%) rename Source/Contents/Effects/{ => Skills}/ScatterEffect.h (74%) rename Source/Contents/Effects/{ => Skills}/ShadowExceedEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/ShadowExceedEffect.h (74%) rename Source/Contents/Effects/{ => Skills}/ShadowExceedNewEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/SkillEffects.h (93%) rename Source/Contents/Effects/{ => Skills}/SmokeEffect.cpp (95%) rename Source/Contents/Effects/{ => Skills}/SmokeEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/SoulCollectEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/SoulCollectEffect.h (74%) rename Source/Contents/Effects/{ => Skills}/SoulUnityEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/SoulUnityEffect.h (74%) rename Source/Contents/Effects/{ => Skills}/SphereWind2Effect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/SphereWind2Effect.h (78%) rename Source/Contents/Effects/{ => Skills}/SphereWindEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/SphereWindEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/StarEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/StarEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/StarEmperorEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/StarEmperorEffect.h (79%) rename Source/Contents/Effects/{ => Skills}/StealEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/StealEffect.h (76%) rename Source/Contents/Effects/{ => Skills}/StormCannonEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/StormCannonEffect.h (83%) rename Source/Contents/Effects/{ => Skills}/StormGustEffect.cpp (96%) rename Source/Contents/Effects/{ => Skills}/StormGustEffect.h (72%) rename Source/Contents/Effects/{ => Skills}/StormKickEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/StormKickEffect.h (78%) rename Source/Contents/Effects/{ => Skills}/SunStanceEffect.cpp (95%) rename Source/Contents/Effects/{ => Skills}/SunStanceEffect.h (74%) rename Source/Contents/Effects/{ => Skills}/TalismanMarkEffect.cpp (98%) rename Source/Contents/Effects/{ => Skills}/TalismanMarkEffect.h (76%) rename Source/Contents/Effects/{ => Skills}/TetraBallEffect.cpp (94%) rename Source/Contents/Effects/{ => Skills}/TetraBallEffect.h (77%) rename Source/Contents/Effects/{ => Skills}/ThrowEffects.cpp (98%) rename Source/Contents/Effects/{ => Skills}/ThrowEffects.h (89%) rename Source/Contents/Effects/{ => Skills}/TriangleShotArrow.cpp (97%) rename Source/Contents/Effects/{ => Skills}/TriangleShotArrow.h (79%) rename Source/Contents/Effects/{ => Skills}/ViolentQuakeEffect.cpp (95%) rename Source/Contents/Effects/{ => Skills}/ViolentQuakeEffect.h (72%) rename Source/Contents/Effects/{ => Skills}/WhirlwindEffect.h (78%) rename Source/Contents/Effects/{ => Skills}/WindEffect.cpp (97%) rename Source/Contents/Effects/{ => Skills}/WindEffect.h (86%) rename Source/Contents/{ => Emblems}/EmblemCacheRaw.cpp (94%) rename Source/Contents/{ => Emblems}/GuildEmblemLookup.cpp (94%) rename Source/Contents/{ => Emblems}/GuildEmblemState.cpp (94%) rename Source/Contents/{ => EntryQueue}/EntryQueueMgr.cpp (99%) rename Source/Contents/{ => EntryQueue}/EntryQueueMgr.h (96%) rename Source/Contents/{ => Events}/CheckAttendanceMgr.cpp (99%) rename Source/Contents/{ => Events}/CheckAttendanceMgr.h (89%) rename Source/Contents/{ => Events}/RouletteMgr.cpp (99%) rename Source/Contents/{ => Events}/RouletteMgr.h (96%) rename Source/Contents/{ => Events}/ShowRankingScheduler.cpp (97%) rename Source/Contents/{ => Events}/ShowRankingScheduler.h (89%) rename Source/Contents/{ => Events}/SpecialPopupMgr.cpp (99%) rename Source/Contents/{ => Events}/SpecialPopupMgr.h (92%) rename Source/Contents/{ => Guild}/GuildInfo.cpp (99%) rename Source/Contents/{ => Guild}/GuildInfo.h (97%) rename Source/Contents/{ => Guild}/GuildMgr.cpp (96%) rename Source/Contents/{ => Guild}/GuildMgr.h (95%) rename Source/Contents/{ => Guild}/GuildTip.cpp (97%) rename Source/Contents/{ => Guild}/GuildTip.h (74%) rename Source/Contents/{ => Items}/ClientItemLists.cpp (99%) rename Source/Contents/{ => Items}/ClientItemLists.h (59%) rename Source/Contents/{ => Items}/EnchantMgr.cpp (99%) rename Source/Contents/{ => Items}/EnchantMgr.h (98%) rename Source/Contents/{ => Items}/ItemDBToIDMgr.cpp (96%) rename Source/Contents/{ => Items}/ItemDBToIDMgr.h (80%) rename Source/Contents/{ => Items}/JobCodeForItem.cpp (99%) rename Source/Contents/{ => Items}/JobCodeForItem.h (86%) rename Source/Contents/{ => Map}/FlyingShipRouteInfo.cpp (97%) rename Source/Contents/{ => Map}/FlyingShipRouteInfo.h (94%) rename Source/Contents/{ => Map}/MapInfoMgr.cpp (99%) rename Source/Contents/{ => Map}/MapInfoMgr.h (95%) rename Source/Contents/{ => Map}/MapNameTable.cpp (99%) rename Source/Contents/{ => Map}/MapPropertyMgr.cpp (97%) rename Source/Contents/{ => Map}/MapPropertyMgr.h (89%) rename Source/Contents/{ => Map}/MapSkyMgr.cpp (98%) rename Source/Contents/{ => Map}/MapSkyMgr.h (94%) rename Source/Contents/{ => Map}/PrivateAirplaneMgr.cpp (99%) rename Source/Contents/{ => Map}/PrivateAirplaneMgr.h (90%) rename Source/Contents/{ => Map}/TownInfoMgr.cpp (99%) rename Source/Contents/{ => Map}/TownInfoMgr.h (90%) rename Source/Contents/{ => Models}/ModelKeyframes.cpp (100%) rename Source/Contents/{ => Monster}/ChampionMonsterMgr.cpp (97%) rename Source/Contents/{ => Monster}/ChampionMonsterMgr.h (90%) rename Source/Contents/{ => Monster}/EnemyMonsterTalk.cpp (98%) rename Source/Contents/{ => Monster}/MonsterSpeech.cpp (100%) rename Source/Contents/{ => Monster}/MonsterXmlActions.cpp (98%) rename Source/Contents/{ => Movement}/ActorMovementRoute.cpp (97%) rename Source/Contents/{ => Movement}/MovementRoute.cpp (98%) rename Source/Contents/{ => Movement}/MovementRouteInterpolation.cpp (97%) rename Source/Contents/{ => Movement}/MovementRouteInterpolation.h (91%) rename Source/Contents/{ => Movement}/MovementTraversal.cpp (94%) rename Source/Contents/{ => Movement}/Pathfinding.cpp (91%) rename Source/Contents/{ => Movement}/TerrainPathSearch.cpp (99%) rename Source/Contents/{ => Movement}/TerrainPathSearch.h (91%) rename Source/Contents/{ => Navigation}/NavigationCandidates.cpp (95%) rename Source/Contents/{ => Navigation}/NavigationDestinations.cpp (96%) rename Source/Contents/{ => Navigation}/NavigationGraph.cpp (98%) rename Source/Contents/{ => Navigation}/NavigationLink.cpp (99%) rename Source/Contents/{ => Navigation}/NavigationManager.h (98%) rename Source/Contents/{ => Navigation}/NavigationRequest.cpp (99%) rename Source/Contents/{ => Navigation}/NavigationRoute.cpp (99%) rename Source/Contents/{ => Navigation}/NavigationSource.cpp (99%) rename Source/Contents/{ => Navigation}/NpcLocationRadius.cpp (100%) rename Source/Contents/{ => Navigation}/WorldNavigation.cpp (91%) rename Source/Contents/{Actors => Pet}/PetEnums.h (77%) rename Source/Contents/{ => Pet}/PetEvolutionMgr.cpp (99%) rename Source/Contents/{ => Pet}/PetEvolutionMgr.h (92%) rename Source/Contents/{ => Pet}/PetStatus.cpp (99%) rename Source/Contents/{ => Pet}/PetStrings.cpp (100%) rename Source/Contents/{ => Pet}/PetTalk.cpp (96%) rename Source/Contents/{ => Pet}/PetTalkNames.cpp (100%) rename Source/Contents/{ => Quest}/RenewQuestMgr.cpp (99%) rename Source/Contents/{ => Quest}/RenewQuestMgr.h (97%) rename Source/Contents/{ => Repute}/ReputeMgr.cpp (99%) rename Source/Contents/{ => Repute}/ReputeMgr.h (94%) rename Source/Contents/{ => Repute}/ReputeRecords.h (81%) rename Source/Contents/{ => Rodex}/RodexMailStore.cpp (97%) rename Source/Contents/{ => Rodex}/RodexMailStore.h (95%) rename Source/Contents/{Items => RuneSystem}/RuneSystem.cpp (99%) rename Source/Contents/{Items => RuneSystem}/RuneSystem.h (98%) rename Source/Contents/{Actors => Skills}/GraffiSkill.cpp (99%) rename Source/Contents/{Actors => Skills}/GraffiSkill.h (90%) rename Source/Contents/{ => Skin}/SkinCatalog.cpp (98%) rename Source/Contents/{ => Skin}/SkinInfo.cpp (98%) rename Source/Contents/{ => Skin}/SkinMgr.cpp (93%) rename Source/Contents/{ => Skin}/SkinMgr.h (88%) rename Source/Contents/{ => Sound}/HitSounds.cpp (100%) delete mode 100644 Source/Contents/SpriteLayerOrder.h delete mode 100644 Source/Contents/SpriteRidingPolicy.h rename Source/Contents/{ => Sprites}/RobeOpacity.cpp (100%) rename Source/Contents/{ => Sprites}/RobeTopLayer.cpp (100%) rename Source/Contents/{ => Sprites}/SpriteFrameSynchronization.cpp (100%) rename Source/Contents/{ => Sprites}/SpriteJob.cpp (100%) rename Source/Contents/{ => Sprites}/SpriteLayerDepth.cpp (100%) rename Source/Contents/{ => Sprites}/SpriteLayerDrawing.cpp (99%) rename Source/Contents/{ => Sprites}/SpriteLayerDrawing.h (96%) rename Source/Contents/{ => Sprites}/SpriteLayerOrder.cpp (95%) create mode 100644 Source/Contents/Sprites/SpriteLayerOrder.h rename Source/Contents/{ => Sprites}/SpriteRidingOffset.cpp (91%) rename Source/Contents/{ => Sprites}/SpriteRidingOffset.h (67%) rename Source/Contents/{ => Sprites}/SpriteRidingPolicy.cpp (91%) create mode 100644 Source/Contents/Sprites/SpriteRidingPolicy.h rename Source/Contents/{ => Sprites}/SpriteRobe.cpp (100%) rename Source/Contents/{ => Sprites}/SpriteRobeCommands.cpp (100%) rename Source/Contents/{ => Sprites}/SpriteShadow.cpp (100%) rename Source/Contents/{ => Tables}/ClientXmlTables.cpp (100%) rename Source/Contents/{ => Tables}/ForbiddenWords.cpp (99%) rename Source/Contents/{ => Tables}/ForbiddenWords.h (77%) rename Source/Contents/{ => Tables}/MessageTable.cpp (99%) rename Source/Contents/{ => Tables}/MessageTable.h (84%) rename Source/Contents/{ => Tables}/SimpleStringMgr.cpp (98%) rename Source/Contents/{ => Tables}/SimpleStringMgr.h (91%) rename Source/Contents/{ => Tables}/TableMng.cpp (99%) rename Source/Contents/{ => Tables}/TableMng.h (93%) rename Source/Contents/{ => Tables}/TipBoxTitles.cpp (99%) rename Source/Contents/{ => Tables}/TipBoxTitles.h (96%) rename Source/Contents/{ => Tables}/TipOfTheDay.cpp (98%) rename Source/Contents/{ => Tables}/TipOfTheDay.h (82%) rename Source/Contents/{ => Time}/ClientTiming.cpp (99%) rename Source/Contents/{ => Time}/ServerTimeManager.cpp (97%) rename Source/Contents/{ => Time}/ServerTimeManager.h (88%) rename Source/Contents/{WorldView => World}/WorldViewData.cpp (99%) rename Source/Contents/{WorldView => World}/WorldViewData.h (97%) diff --git a/Source/ActorPickNode.cpp b/Source/ActorPickNode.cpp index 2c81bf004..674bf8cb1 100644 --- a/Source/ActorPickNode.cpp +++ b/Source/ActorPickNode.cpp @@ -1,6 +1,6 @@ #include "ActorPickNode.h" #include "Contents/Camera/Camera.h" -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/TerrainPathSearch.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/Pc.h" diff --git a/Source/Client/Application/Launcher.cpp b/Source/Client/Application/Launcher.cpp index aea4d5463..999bb294f 100644 --- a/Source/Client/Application/Launcher.cpp +++ b/Source/Client/Application/Launcher.cpp @@ -4,41 +4,41 @@ #include "Utility/Text/FormatString.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Client/Stove/StoveMgr.h" -#include "Contents/AdventureGuideMgr.h" +#include "Contents/AdventureGuide/AdventureGuideMgr.h" #include "Contents/Async/AsyncWorkMgr.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/ChampionMonsterMgr.h" -#include "Contents/ClanInfo.h" -#include "Contents/ConfigMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#include "Contents/Monster/ChampionMonsterMgr.h" +#include "Contents/Clan/ClanInfo.h" +#include "Contents/Configuration/ConfigMgr.h" #include "Contents/Configuration/GameSettingsMgr.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Contents/Emblems/EmblemDataMgr.h" -#include "Contents/EnchantMgr.h" -#include "Contents/EntryQueueMgr.h" -#include "Contents/EquipmentResourceMgr.h" -#include "Contents/GuildMgr.h" -#include "Contents/ItemDBToIDMgr.h" +#include "Contents/Items/EnchantMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/Items/ItemDBToIDMgr.h" #include "Contents/Items/ItemReformMgr.h" #include "Contents/Items/NeoPackageItemMgr.h" #include "Contents/Items/SelectPackageItemMgr.h" -#include "Contents/JobCodeForItem.h" -#include "Contents/MapPropertyMgr.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Items/JobCodeForItem.h" +#include "Contents/Map/MapPropertyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Messenger/WhisperBlockMgr.h" #include "Contents/Party/AdventurerAgencyMgr.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RenewQuestMgr.h" -#include "Contents/ReputeMgr.h" -#include "Contents/RodexMailStore.h" -#include "Contents/RouletteMgr.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Quest/RenewQuestMgr.h" +#include "Contents/Repute/ReputeMgr.h" +#include "Contents/Rodex/RodexMailStore.h" +#include "Contents/Events/RouletteMgr.h" #include "Contents/Schedule/TimeScheduler.h" #include "Contents/SignBoard/SignBoard.h" -#include "Contents/SimpleStringMgr.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "Contents/Skills/SkillInfo.h" -#include "Contents/TownInfoMgr.h" +#include "Contents/Map/TownInfoMgr.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "Network/Http/CURLMgr.h" @@ -65,10 +65,10 @@ #include "Client/Session.h" #include "Client/Timer.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/MapInfoMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/SkinMgr.h" +#include "Contents/Map/MapInfoMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Skin/SkinMgr.h" #include "Contents/Sound/SoundConfiguration.h" #include "Contents/Sound/SoundMgr.h" #include "Network/Connection/Connection.h" diff --git a/Source/Client/Browser/BrowserFactory.cpp b/Source/Client/Browser/BrowserFactory.cpp index 24bf63443..d2d2d4143 100644 --- a/Source/Client/Browser/BrowserFactory.cpp +++ b/Source/Client/Browser/BrowserFactory.cpp @@ -2,7 +2,7 @@ #include "Client/Application/ApplicationWindow.h" #include "Client/Application/Launcher.h" #include "Client/Browser/WebBrowser.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/MSGSTRINGID.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Client/Input/ImeHelper.cpp b/Source/Client/Input/ImeHelper.cpp index b8d8090a1..a7610a856 100644 --- a/Source/Client/Input/ImeHelper.cpp +++ b/Source/Client/Input/ImeHelper.cpp @@ -1,7 +1,7 @@ #include "Client/Input/ImeHelper.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Client/Input/Language.cpp b/Source/Client/Input/Language.cpp index 04adb88c0..079bc5789 100644 --- a/Source/Client/Input/Language.cpp +++ b/Source/Client/Input/Language.cpp @@ -3,7 +3,7 @@ #include "UI/Window/WindowId.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Input/Language.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Network/TextEncoding.h" #include "Utility/Lexicon/LexiconBoundary.h" diff --git a/Source/Client/Mode/CGameMode.h b/Source/Client/Mode/CGameMode.h index e9bdef89e..f82304aa4 100644 --- a/Source/Client/Mode/CGameMode.h +++ b/Source/Client/Mode/CGameMode.h @@ -3,7 +3,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeDragState.h" -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include #include diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index ac98a880b..42b166e23 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -19,19 +19,19 @@ #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/DummyEffectLauncher.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/SkillEffects.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/DummyEffectLauncher.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Skills/SkillEffects.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/GuildInfo.h" -#include "Contents/GuildMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Actors/MousePointer.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Sound/SoundMgr.h" @@ -52,22 +52,22 @@ #include "Utility/Text/TextTokens.h" #include "Client/Application/Launcher.h" #include "UI/Text/NavigationLink.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Contents/Skills/AutomaticSkills.h" #include "UI/Shortcuts/UIShortCutWnd.h" -#include "Contents/MapInfoMgr.h" +#include "Contents/Map/MapInfoMgr.h" #include #include "File/File.h" #include "Client/Stove/StoveMgr.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Events/ShowRankingScheduler.h" #include "Render/TextureQuad.h" #include "UI/Cooldowns/CooldownOwner.h" #include "Utility/Text/HexString.h" #include "Client/Timer.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Messenger/WhisperBlockMgr.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Items/BarterMarketItemMgr.h" #include "Client/Input/Language.h" #include "UI/Chat/UIChatRoomMakeWnd.h" @@ -78,14 +78,14 @@ #include "UI/UIGradeEnchantWnd.h" #include "UI/Items/UISwapEquipmentWnd.h" #include "UI/Window/UIMonsterInfoWnd.h" -#include "Contents/ClanInfo.h" +#include "Contents/Clan/ClanInfo.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Items/SelectPackageItemMgr.h" #include "Contents/Jobs/JobNames.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "UI/Guild/UIGuildWnd.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/SimpleStringMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "File/ShortcutFilename.h" #include "UI/Window/UICntWnd.h" #include "UI/Window/UINormalMB.h" @@ -6083,7 +6083,7 @@ static_assert(sizeof(GameModeStoredItemEntry) == 0x19); #include "Contents/Items/ItemNaming.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "UI/Window/UINavigationWnd.h" -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #pragma pack(push, 1) struct GameModeUiMessage { @@ -7192,10 +7192,10 @@ void CGameMode::PlayItemUseEffect(int itemId, std::uint32_t aid) { } } -#include "Contents/Effects/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrim.h" #include "Contents/SignBoard/SignBoard.h" #include "Contents/Sound/SoundMaker.h" -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/TerrainPathSearch.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" #include "Network/GameTickPacket.h" #include "UI/Buttons/UITextButton.h" @@ -8732,7 +8732,7 @@ int CGameMode::ProcessGroundClick(int result) { #include "Client/Application/ApplicationMessages.h" #include "Client/ModeFade.h" -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Emblems/EmblemDataMgr.h" #include "Client/Stove/StovePCSDK.h" diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index 43e047ce0..d7a1de6c1 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -11,27 +11,27 @@ #include "Client/Input/InputCharset.h" #include "Client/Session.h" #include "Client/Replay.h" -#include "Contents/AchievementMgr.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/ClanInfo.h" +#include "Contents/Achievement/AchievementMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#include "Contents/Clan/ClanInfo.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/Skill.h" -#include "Contents/Actors/GraffiSkill.h" +#include "Contents/Skills/GraffiSkill.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/MonsterSkillEffects.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Skills/MonsterSkillEffects.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Ground/TerrainHeight.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/Items/RuneSystem.h" -#include "Contents/MessageTable.h" -#include "Contents/RodexMailStore.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/RuneSystem/RuneSystem.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Rodex/RodexMailStore.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "File/File.h" diff --git a/Source/Client/Mode/GameModeItemLists.cpp b/Source/Client/Mode/GameModeItemLists.cpp index 1c0f70be1..79f3a76e4 100644 --- a/Source/Client/Mode/GameModeItemLists.cpp +++ b/Source/Client/Mode/GameModeItemLists.cpp @@ -5,7 +5,7 @@ #include "Contents/ClientState.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Messenger/ClientMessenger.h" -#include "Contents/PetEvolutionMgr.h" +#include "Contents/Pet/PetEvolutionMgr.h" #include "UI/Item/UIItemStoreWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Client/Mode/GameModeMiniMap.cpp b/Source/Client/Mode/GameModeMiniMap.cpp index 7f8285a7c..af0aa0421 100644 --- a/Source/Client/Mode/GameModeMiniMap.cpp +++ b/Source/Client/Mode/GameModeMiniMap.cpp @@ -3,7 +3,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Input/Mouse.h" #include "Client/Session.h" -#include "Contents/TownInfoMgr.h" +#include "Contents/Map/TownInfoMgr.h" #include "File/File.h" #include "Contents/Actors/Pc.h" #include "Contents/Ground/TerrainHeight.h" diff --git a/Source/Client/Mode/GameModeNames.cpp b/Source/Client/Mode/GameModeNames.cpp index 01b223cf8..5a679a2b0 100644 --- a/Source/Client/Mode/GameModeNames.cpp +++ b/Source/Client/Mode/GameModeNames.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/CGameMode.h" #include "Client/Session.h" #include "Contents/Actors/GameActor.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "File/File.h" #include diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index 09474f9fc..cdfa67e7d 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -20,27 +20,27 @@ #include "Contents/ClientState.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/ForbiddenWords.h" -#include "Contents/GuildInfo.h" -#include "Contents/GuildMgr.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Tables/ForbiddenWords.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Guild/GuildMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Jobs/JobId.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/MapPropertyMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Map/MapPropertyMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" -#include "Contents/NavigationManager.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RenewQuestMgr.h" -#include "Contents/RodexMailStore.h" -#include "Contents/RouletteMgr.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Quest/RenewQuestMgr.h" +#include "Contents/Rodex/RodexMailStore.h" +#include "Contents/Events/RouletteMgr.h" #include "Contents/Schedule/CaptchaUploadSchedule.h" #include "Contents/Schedule/CheckGDISchedule.h" #include "Contents/Schedule/TimeScheduler.h" @@ -2785,7 +2785,7 @@ void CGameMode::ReceiveExpGainNotice(const unsigned char* data) { #include "UI/Text/UIStaticText.h" #include "UI/UIBarGraph.h" #include "UI/Window/UIBasicInfoWnd.h" -#include "Contents/Effects/EmitterEffect.h" +#include "Contents/Effects/Particles/EmitterEffect.h" #pragma pack(push, 1) struct BankDepositAckPacket { @@ -7481,7 +7481,7 @@ void CGameMode::ReceiveWhisper2(const unsigned char* data) { this->ProcessWhisper(static_cast(*reinterpret_cast(data + 4)), std::string(nameBuffer), text, data[0x20] != 0); } -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Events/ShowRankingScheduler.h" // OFFSET: 0x00D06760 // FUNCTION: fn_21576 diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index f6efff4e6..aaf7a0acf 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -2,8 +2,8 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/Combat/CombatTypes.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/CombatTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Contents/Items/ItemType.h" #include "Contents/Skills/SkillId.h" #include "Contents/Skills/SkillUnitId.h" @@ -28,28 +28,28 @@ #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/MousePointer.h" -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/Skill.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/MonsterSkillEffects.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Skills/MonsterSkillEffects.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Messenger/ClientMessenger.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RodexMailStore.h" -#include "Contents/RouletteMgr.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Rodex/RodexMailStore.h" +#include "Contents/Events/RouletteMgr.h" #include "Contents/World/World.h" #include "Contents/Camera/Camera.h" #include "Network/Connection/Connection.h" @@ -59,7 +59,7 @@ #include "Render/DeviceContext/DCSurface.h" #include "Resource/ResourceMgr.h" #include "Network/TextEncoding.h" -#include "Contents/SpecialPopupMgr.h" +#include "Contents/Events/SpecialPopupMgr.h" #include "UI/Text/TextMarkup.h" #include "UI/Item/UIItemStoreWnd.h" #include "UI/Text/UIStaticText.h" @@ -80,11 +80,11 @@ #include "Utility/Math/Vector3d.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/StringUtil.h" -#include "Contents/GuildMgr.h" -#include "Contents/EnchantMgr.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/Items/EnchantMgr.h" #include "Contents/Items/ItemReformMgr.h" -#include "Contents/ReputeMgr.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Repute/ReputeMgr.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/Items/BarterMarketItemMgr.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Schedule/CheckGDISchedule.h" @@ -109,25 +109,25 @@ #include #include #include -#include "Contents/ChampionMonsterMgr.h" +#include "Contents/Monster/ChampionMonsterMgr.h" #include "Contents/Jobs/JobId.h" -#include "Contents/Actors/GraffiSkill.h" +#include "Contents/Skills/GraffiSkill.h" #include "UI/Party/UIRequestJoinPartyMgr.h" -#include "Contents/Items/RuneSystem.h" -#include "Contents/SimpleStringMgr.h" +#include "Contents/RuneSystem/RuneSystem.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "Contents/Party/PartyJoinResult.h" #include "Security/NProtectGameGuardMgr.h" -#include "Contents/EntryQueueMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" #include "UI/Window/UIBalloonOpenBtn.h" #include "UI/Window/UINewSelectCharWnd.h" #include "Client/Application/ErrorDialog.h" #include "UI/Items/UIItemCollectionWnd.h" -#include "Contents/MapPropertyMgr.h" +#include "Contents/Map/MapPropertyMgr.h" #include #include "UI/Window/UIChatRoomWnd.h" #include "UI/Navigation/UINavigationV4Wnd.h" -#include "Contents/ClanInfo.h" -#include "Contents/NavigationManager.h" +#include "Contents/Clan/ClanInfo.h" +#include "Contents/Navigation/NavigationManager.h" #include "Utility/Text/LanguageCharset.h" #include "UI/Edit/UIEditCtrl.h" #include "Client/Mode/CLoginMode.h" @@ -136,9 +136,9 @@ #include "Script/LuaScript.h" #include "Contents/Actors/Item.h" #include "Contents/ClientState.h" -#include "Contents/ClientItemLists.h" +#include "Contents/Items/ClientItemLists.h" #include "Contents/Sound/SoundMaker.h" -#include "Contents/PetEvolutionMgr.h" +#include "Contents/Pet/PetEvolutionMgr.h" #include "UI/Window/UIPetInfoWnd.h" #include "UI/Items/UIItemIdentifyWnd.h" #include "UI/Chat/UIChatRoomTitle.h" diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp index 8fa8d92ff..31a3d8431 100644 --- a/Source/Client/Mode/LoginMode.cpp +++ b/Source/Client/Mode/LoginMode.cpp @@ -26,13 +26,13 @@ #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EntryQueueMgr.h" -#include "Contents/CheckAttendanceMgr.h" -#include "Contents/TipOfTheDay.h" -#include "Contents/GuildInfo.h" -#include "Contents/GuildMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" +#include "Contents/Events/CheckAttendanceMgr.h" +#include "Contents/Tables/TipOfTheDay.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/Schedule/CheckGDISchedule.h" #include "Contents/Schedule/PartialShutDownSchedule.h" #include "Contents/Schedule/TimeScheduler.h" @@ -64,12 +64,12 @@ #include "Client/Registry.h" #include "Contents/Actors/Pc.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Emblems/EmblemDataMgr.h" -#include "Contents/Items/RuneSystem.h" +#include "Contents/RuneSystem/RuneSystem.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RodexMailStore.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Rodex/RodexMailStore.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" #include "Network/ExecutableDigestPacket.h" diff --git a/Source/Client/Mode/LoginModeNotices.cpp b/Source/Client/Mode/LoginModeNotices.cpp index 974f5bb0d..3fec84ff1 100644 --- a/Source/Client/Mode/LoginModeNotices.cpp +++ b/Source/Client/Mode/LoginModeNotices.cpp @@ -4,7 +4,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Client/Replay.cpp b/Source/Client/Replay.cpp index 8d47158d9..22e1d4221 100644 --- a/Source/Client/Replay.cpp +++ b/Source/Client/Replay.cpp @@ -11,10 +11,10 @@ #include #include #include -#include "Contents/EntryQueueMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" #include "UI/EntryQueue/UIEntryQueueWnd.h" #include "UI/Window/UIWindowMgr.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/ClientState.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Messenger/MessengerMember.h" diff --git a/Source/Client/Session.cpp b/Source/Client/Session.cpp index dc3c08a7b..60942e21d 100644 --- a/Source/Client/Session.cpp +++ b/Source/Client/Session.cpp @@ -3,21 +3,21 @@ #include "Contents/Actors/ActorEnums.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Utility/EncryptedName.h" #include "Client/Mode/CGameMode.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/EquipmentResourceMgr.h" -#include "Contents/GuildInfo.h" -#include "Contents/GuildMgr.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Guild/GuildMgr.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Jobs/JobId.h" #include "Contents/Skills/SkillId.h" #include "Contents/World/World.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Skills/ClientSkills.h" #include "UI/Window/UINewSelectCharWnd.h" #include "Contents/Messenger/ClientMessenger.h" @@ -33,33 +33,33 @@ #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Client/Application/ErrorDialog.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Utility/Text/FormatString.h" #include "Utility/Cipher/XorBytes.h" #include "Script/LuaScript.h" -#include "Contents/MapPropertyMgr.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Map/MapPropertyMgr.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Skills/SkillInfo.h" #include "Client/Application/ApplicationWindow.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Jobs/JobNames.h" -#include "Contents/SimpleStringMgr.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "File/CommonObject.h" -#include "Contents/WorldView/WorldViewData.h" +#include "Contents/World/WorldViewData.h" #include "UI/Window/UIRoMapWnd.h" -#include "Contents/AchievementMgr.h" -#include "Contents/CheckAttendanceMgr.h" +#include "Contents/Achievement/AchievementMgr.h" +#include "Contents/Events/CheckAttendanceMgr.h" #include "Contents/Items/BarterMarketItemMgr.h" #include "Contents/Items/ChangeMaterialMgr.h" #include "Contents/Items/ItemInfoMgr.h" -#include "Contents/Items/RuneSystem.h" -#include "Contents/MapInfoMgr.h" -#include "Contents/PetEvolutionMgr.h" -#include "Contents/PrivateAirplaneMgr.h" -#include "Contents/SpecialPopupMgr.h" +#include "Contents/RuneSystem/RuneSystem.h" +#include "Contents/Map/MapInfoMgr.h" +#include "Contents/Pet/PetEvolutionMgr.h" +#include "Contents/Map/PrivateAirplaneMgr.h" +#include "Contents/Events/SpecialPopupMgr.h" #include "Resource/MSGSTRINGID.h" #include #include diff --git a/Source/Client/SessionAchievements.cpp b/Source/Client/SessionAchievements.cpp index 11fc73398..cd888e9b2 100644 --- a/Source/Client/SessionAchievements.cpp +++ b/Source/Client/SessionAchievements.cpp @@ -1,11 +1,11 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Session.h" -#include "Contents/AchievementMgr.h" +#include "Contents/Achievement/AchievementMgr.h" #include "Contents/Jobs/JobInheritance.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Utility/Text/FormatString.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Client/SessionState.cpp b/Source/Client/SessionState.cpp index d682a373b..973328b82 100644 --- a/Source/Client/SessionState.cpp +++ b/Source/Client/SessionState.cpp @@ -8,13 +8,13 @@ #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Jobs/JobId.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/World/World.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/AchievementMgr.cpp b/Source/Contents/Achievement/AchievementMgr.cpp similarity index 99% rename from Source/Contents/AchievementMgr.cpp rename to Source/Contents/Achievement/AchievementMgr.cpp index 6ffbc652f..fac267eec 100644 --- a/Source/Contents/AchievementMgr.cpp +++ b/Source/Contents/Achievement/AchievementMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/AchievementMgr.h" +#include "Contents/Achievement/AchievementMgr.h" #include "Client/Session.h" #include "Script/NLuaState.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/AchievementMgr.h b/Source/Contents/Achievement/AchievementMgr.h similarity index 96% rename from Source/Contents/AchievementMgr.h rename to Source/Contents/Achievement/AchievementMgr.h index b6c986dc7..d3def914f 100644 --- a/Source/Contents/AchievementMgr.h +++ b/Source/Contents/Achievement/AchievementMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ACHIEVEMENTMGR_H -#define RAGNAROK_SOURCE_CONTENTS_ACHIEVEMENTMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ACHIEVEMENT_ACHIEVEMENTMGR_H +#define RAGNAROK_SOURCE_CONTENTS_ACHIEVEMENT_ACHIEVEMENTMGR_H #include #include diff --git a/Source/Contents/ActorGeometry.cpp b/Source/Contents/Actors/ActorGeometry.cpp similarity index 100% rename from Source/Contents/ActorGeometry.cpp rename to Source/Contents/Actors/ActorGeometry.cpp diff --git a/Source/Contents/ActorNameCache.cpp b/Source/Contents/Actors/ActorNameCache.cpp similarity index 98% rename from Source/Contents/ActorNameCache.cpp rename to Source/Contents/Actors/ActorNameCache.cpp index 997f2e0f1..edb2619e3 100644 --- a/Source/Contents/ActorNameCache.cpp +++ b/Source/Contents/Actors/ActorNameCache.cpp @@ -1,4 +1,4 @@ -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include diff --git a/Source/Contents/ActorNameCard.cpp b/Source/Contents/Actors/ActorNameCard.cpp similarity index 97% rename from Source/Contents/ActorNameCard.cpp rename to Source/Contents/Actors/ActorNameCard.cpp index 12b6f8cdb..aff6ba60c 100644 --- a/Source/Contents/ActorNameCard.cpp +++ b/Source/Contents/Actors/ActorNameCard.cpp @@ -1,4 +1,4 @@ -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" // OFFSET: 0x005BEA30 // FUNCTION: fn_03484 diff --git a/Source/Contents/ActorNameCard.h b/Source/Contents/Actors/ActorNameCard.h similarity index 95% rename from Source/Contents/ActorNameCard.h rename to Source/Contents/Actors/ActorNameCard.h index 02e63cc7a..3a50b47fa 100644 --- a/Source/Contents/ActorNameCard.h +++ b/Source/Contents/Actors/ActorNameCard.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORNAMECARD_H -#define RAGNAROK_SOURCE_CONTENTS_ACTORNAMECARD_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_ACTORNAMECARD_H +#define RAGNAROK_SOURCE_CONTENTS_ACTORS_ACTORNAMECARD_H #include #include diff --git a/Source/Contents/ActorNameDirectory.cpp b/Source/Contents/Actors/ActorNameDirectory.cpp similarity index 93% rename from Source/Contents/ActorNameDirectory.cpp rename to Source/Contents/Actors/ActorNameDirectory.cpp index 562977022..bd35ff010 100644 --- a/Source/Contents/ActorNameDirectory.cpp +++ b/Source/Contents/Actors/ActorNameDirectory.cpp @@ -1,4 +1,4 @@ -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include diff --git a/Source/Contents/ActorNameRequests.cpp b/Source/Contents/Actors/ActorNameRequests.cpp similarity index 97% rename from Source/Contents/ActorNameRequests.cpp rename to Source/Contents/Actors/ActorNameRequests.cpp index a396b809c..b0ab0fb44 100644 --- a/Source/Contents/ActorNameRequests.cpp +++ b/Source/Contents/Actors/ActorNameRequests.cpp @@ -1,4 +1,4 @@ -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Contents/Actors/CharacterRender.cpp b/Source/Contents/Actors/CharacterRender.cpp index 2d28ee798..59fb0ea83 100644 --- a/Source/Contents/Actors/CharacterRender.cpp +++ b/Source/Contents/Actors/CharacterRender.cpp @@ -7,10 +7,10 @@ #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Skills/ClientSkills.h" -#include "Contents/SpriteLayerDrawing.h" -#include "Contents/SpriteLayerOrder.h" -#include "Contents/SpriteRidingOffset.h" -#include "Contents/SpriteRidingPolicy.h" +#include "Contents/Sprites/SpriteLayerDrawing.h" +#include "Contents/Sprites/SpriteLayerOrder.h" +#include "Contents/Sprites/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingPolicy.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Renderer.h" diff --git a/Source/Contents/Actors/GameActor.cpp b/Source/Contents/Actors/GameActor.cpp index 24a086038..ee6a4bc6a 100644 --- a/Source/Contents/Actors/GameActor.cpp +++ b/Source/Contents/Actors/GameActor.cpp @@ -8,17 +8,17 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Actors/MercenaryAI.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Contents/Ground/TerrainHeight.h" -#include "Contents/MapSkyMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Map/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" #include "Render/Renderer.h" @@ -27,7 +27,7 @@ #include "UI/Gauges/UIPcGage.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Resource/MSGSTRINGID.h" #include #include diff --git a/Source/Contents/Actors/GameActor.h b/Source/Contents/Actors/GameActor.h index 0ee2fc8ab..2f9359d81 100644 --- a/Source/Contents/Actors/GameActor.h +++ b/Source/Contents/Actors/GameActor.h @@ -1,8 +1,8 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_GAMEACTOR_H #define RAGNAROK_SOURCE_CONTENTS_ACTORS_GAMEACTOR_H -#include "Contents/Effects/EffectActor.h" -#include "Contents/MovementRouteInterpolation.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Movement/MovementRouteInterpolation.h" #include #include diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index a77c3500c..f962efc83 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -5,7 +5,7 @@ #include "Contents/Actors/ActorEnums.h" #include "Network/Packets/NoticeEnums.h" #include "Contents/Jobs/JobId.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Contents/Actors/GameActor.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" @@ -16,8 +16,8 @@ #include "Contents/World/World.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Projection/RendererViewport.h" #include "Render/Renderer.h" @@ -34,19 +34,19 @@ #include "Render/Textures/SpritePixels.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/ScalarConversion.h" -#include "Contents/ChampionMonsterMgr.h" +#include "Contents/Monster/ChampionMonsterMgr.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/Pc.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EnergyOrbEffect.h" -#include "Contents/Effects/MonsterSkillEffects.h" -#include "Contents/Effects/MsgEffect.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Skills/EnergyOrbEffect.h" +#include "Contents/Effects/Skills/MonsterSkillEffects.h" +#include "Contents/Effects/Core/MsgEffect.h" #include "Contents/Jobs/JobNames.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Sound/SoundMaker.h" #include "Contents/Sound/SoundMgr.h" diff --git a/Source/Contents/Actors/GndRiser.h b/Source/Contents/Actors/GndRiser.h index 7ee3a2be6..155f243a1 100644 --- a/Source/Contents/Actors/GndRiser.h +++ b/Source/Contents/Actors/GndRiser.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_GNDRISER_H #define RAGNAROK_SOURCE_CONTENTS_ACTORS_GNDRISER_H -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include diff --git a/Source/Contents/Actors/GroundScope.h b/Source/Contents/Actors/GroundScope.h index b29d5fe0b..20e5616db 100644 --- a/Source/Contents/Actors/GroundScope.h +++ b/Source/Contents/Actors/GroundScope.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_GROUNDSCOPE_H #define RAGNAROK_SOURCE_CONTENTS_ACTORS_GROUNDSCOPE_H -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include diff --git a/Source/Contents/Actors/Item.cpp b/Source/Contents/Actors/Item.cpp index 4f30447fd..fac37f0df 100644 --- a/Source/Contents/Actors/Item.cpp +++ b/Source/Contents/Actors/Item.cpp @@ -6,15 +6,15 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemInfoMgr.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Items/ItemResources.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Contents/World/World.h" #include "Resource/ResourceMgr.h" #include "Resource/World/TerrainResource.h" diff --git a/Source/Contents/Actors/Item.h b/Source/Contents/Actors/Item.h index 0004434ad..905e9497c 100644 --- a/Source/Contents/Actors/Item.h +++ b/Source/Contents/Actors/Item.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_ITEM_H #define RAGNAROK_SOURCE_CONTENTS_ACTORS_ITEM_H -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include #include diff --git a/Source/Contents/Actors/Player.cpp b/Source/Contents/Actors/Player.cpp index 2d6b24368..5fb1e002f 100644 --- a/Source/Contents/Actors/Player.cpp +++ b/Source/Contents/Actors/Player.cpp @@ -4,7 +4,7 @@ #include "Contents/Actors/Pc.h" #include "Contents/Actors/ActorEnums.h" #include "Network/Packets/NoticeEnums.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Contents/Skills/SkillUnitId.h" #include "Client/Mode/CGameMode.h" @@ -16,35 +16,35 @@ #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EnergyOrbEffect.h" -#include "Contents/Effects/MonsterSkillEffects.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/TetraBallEffect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Skills/EnergyOrbEffect.h" +#include "Contents/Effects/Skills/MonsterSkillEffects.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Skills/TetraBallEffect.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Sound/SoundMgr.h" -#include "Contents/Effects/MsgEffect.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/EquipmentResourceMgr.h" -#include "Contents/GuildMgr.h" +#include "Contents/Effects/Core/MsgEffect.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "Contents/Items/WeaponType.h" #include "Contents/Jobs/JobId.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Jobs/JobNames.h" -#include "Contents/MapSkyMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Map/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Sound/SoundMgr.h" -#include "Contents/SpriteLayerDrawing.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteLayerDrawing.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Contents/World/World.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Ground/TerrainHeight.h" -#include "Contents/MovementRouteInterpolation.h" -#include "Contents/NavigationManager.h" -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/MovementRouteInterpolation.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Movement/TerrainPathSearch.h" #include "Render/DX9/RendererDX9.h" #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitive.h" @@ -71,7 +71,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" // GLOBAL: gl_24753 int g_maxMoveSpeed = 432; diff --git a/Source/Contents/PlayerNameDictionary.cpp b/Source/Contents/Actors/PlayerNameDictionary.cpp similarity index 97% rename from Source/Contents/PlayerNameDictionary.cpp rename to Source/Contents/Actors/PlayerNameDictionary.cpp index ea8461526..4d9954aa6 100644 --- a/Source/Contents/PlayerNameDictionary.cpp +++ b/Source/Contents/Actors/PlayerNameDictionary.cpp @@ -1,5 +1,5 @@ -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Contents/PlayerNameDictionary.h b/Source/Contents/Actors/PlayerNameDictionary.h similarity index 91% rename from Source/Contents/PlayerNameDictionary.h rename to Source/Contents/Actors/PlayerNameDictionary.h index 42b8f5ccc..20f268bf9 100644 --- a/Source/Contents/PlayerNameDictionary.h +++ b/Source/Contents/Actors/PlayerNameDictionary.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_PLAYERNAMEDICTIONARY_H -#define RAGNAROK_SOURCE_CONTENTS_PLAYERNAMEDICTIONARY_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_PLAYERNAMEDICTIONARY_H +#define RAGNAROK_SOURCE_CONTENTS_ACTORS_PLAYERNAMEDICTIONARY_H #include #include diff --git a/Source/Contents/Actors/RenderObject.cpp b/Source/Contents/Actors/RenderObject.cpp index b83b6d0a4..c69427cac 100644 --- a/Source/Contents/Actors/RenderObject.cpp +++ b/Source/Contents/Actors/RenderObject.cpp @@ -2,12 +2,12 @@ #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Contents/Skills/SkillId.h" #include "Contents/Actors/GrannyGameActor.h" #include "Contents/Actors/RenderObject.h" #include "ActorPickNode.h" -#include "Contents/Effects/MsgEffect.h" +#include "Contents/Effects/Core/MsgEffect.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Session.h" @@ -21,14 +21,14 @@ #include "Contents/Actors/Pc.h" #include "Contents/Actors/EffectActors.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EnergyOrbEffect.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/TetraBallEffect.h" -#include "Contents/GuildMgr.h" -#include "Contents/MapSkyMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Skills/EnergyOrbEffect.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Skills/TetraBallEffect.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/Map/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Jobs/JobId.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Messenger/ClientMessenger.h" @@ -36,8 +36,8 @@ #include "Contents/Skills/SkillInfo.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Contents/World/WorldProximity.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" @@ -59,8 +59,8 @@ #include "Utility/Math/AffineMatrix.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Math/ScalarConversion.h" -#include "Contents/ChampionMonsterMgr.h" -#include "Contents/Effects/EffectPrim.h" +#include "Contents/Monster/ChampionMonsterMgr.h" +#include "Contents/Effects/Primitives/EffectPrim.h" #include "Contents/Ground/TerrainHeight.h" #include #include @@ -71,7 +71,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" // GLOBAL: gl_25173 diff --git a/Source/Contents/BodyResources.cpp b/Source/Contents/Actors/Resources/BodyResources.cpp similarity index 99% rename from Source/Contents/BodyResources.cpp rename to Source/Contents/Actors/Resources/BodyResources.cpp index afe004dcf..52c0b2964 100644 --- a/Source/Contents/BodyResources.cpp +++ b/Source/Contents/Actors/Resources/BodyResources.cpp @@ -1,6 +1,6 @@ #include "Client/Session.h" #include "Utility/EncryptedName.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Contents/Jobs/JobId.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/EquipmentResourceMgr.h b/Source/Contents/Actors/Resources/EquipmentResourceMgr.h similarity index 92% rename from Source/Contents/EquipmentResourceMgr.h rename to Source/Contents/Actors/Resources/EquipmentResourceMgr.h index e6b392a71..144c47e9a 100644 --- a/Source/Contents/EquipmentResourceMgr.h +++ b/Source/Contents/Actors/Resources/EquipmentResourceMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EQUIPMENTRESOURCEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_EQUIPMENTRESOURCEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_RESOURCES_EQUIPMENTRESOURCEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_ACTORS_RESOURCES_EQUIPMENTRESOURCEMGR_H #include #include diff --git a/Source/Contents/EquipmentResources.cpp b/Source/Contents/Actors/Resources/EquipmentResources.cpp similarity index 99% rename from Source/Contents/EquipmentResources.cpp rename to Source/Contents/Actors/Resources/EquipmentResources.cpp index 6bda772d0..14dd24750 100644 --- a/Source/Contents/EquipmentResources.cpp +++ b/Source/Contents/Actors/Resources/EquipmentResources.cpp @@ -1,5 +1,5 @@ #include "Client/Session.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Resource/ResourceMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/HeadResources.cpp b/Source/Contents/Actors/Resources/HeadResources.cpp similarity index 99% rename from Source/Contents/HeadResources.cpp rename to Source/Contents/Actors/Resources/HeadResources.cpp index 62f2eb15d..ec8b4d1b9 100644 --- a/Source/Contents/HeadResources.cpp +++ b/Source/Contents/Actors/Resources/HeadResources.cpp @@ -1,6 +1,6 @@ #include "Client/Session.h" #include "Contents/Jobs/JobId.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Resource/ResourceMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/MonsterResources.cpp b/Source/Contents/Actors/Resources/MonsterResources.cpp similarity index 100% rename from Source/Contents/MonsterResources.cpp rename to Source/Contents/Actors/Resources/MonsterResources.cpp diff --git a/Source/Contents/RobeResources.cpp b/Source/Contents/Actors/Resources/RobeResources.cpp similarity index 98% rename from Source/Contents/RobeResources.cpp rename to Source/Contents/Actors/Resources/RobeResources.cpp index 36d7dbbc9..baba2e013 100644 --- a/Source/Contents/RobeResources.cpp +++ b/Source/Contents/Actors/Resources/RobeResources.cpp @@ -1,5 +1,5 @@ #include "Client/Session.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Resource/ResourceMgr.h" #include "Script/LuaScript.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/StatusIconImages.cpp b/Source/Contents/Actors/Resources/StatusIconImages.cpp similarity index 99% rename from Source/Contents/StatusIconImages.cpp rename to Source/Contents/Actors/Resources/StatusIconImages.cpp index 6b93627cd..b6cb259de 100644 --- a/Source/Contents/StatusIconImages.cpp +++ b/Source/Contents/Actors/Resources/StatusIconImages.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Session.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Actors/Skill.cpp b/Source/Contents/Actors/Skill.cpp index ba6906394..a476ece53 100644 --- a/Source/Contents/Actors/Skill.cpp +++ b/Source/Contents/Actors/Skill.cpp @@ -4,18 +4,18 @@ #include "Contents/Skills/SkillUnitId.h" #include "ActorPickNode.h" -#include "Contents/Actors/GraffiSkill.h" +#include "Contents/Skills/GraffiSkill.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Actors/Pc.h" -#include "Contents/Effects/CaneOfEvilEyeEffect.h" -#include "Contents/Effects/EZ2STREffect.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Skills/CaneOfEvilEyeEffect.h" +#include "Contents/Effects/Particles/EZ2STREffect.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Ground/TerrainHeight.h" #include "Contents/Models/ModelActor.h" #include "Contents/Skills/SkillInfo.h" diff --git a/Source/Contents/AdventureGuideMgr.cpp b/Source/Contents/AdventureGuide/AdventureGuideMgr.cpp similarity index 99% rename from Source/Contents/AdventureGuideMgr.cpp rename to Source/Contents/AdventureGuide/AdventureGuideMgr.cpp index e16a2a68d..beba1c789 100644 --- a/Source/Contents/AdventureGuideMgr.cpp +++ b/Source/Contents/AdventureGuide/AdventureGuideMgr.cpp @@ -1,7 +1,7 @@ -#include "Contents/AdventureGuideMgr.h" +#include "Contents/AdventureGuide/AdventureGuideMgr.h" #include "Client/Session.h" -#include "Contents/JobCodeForItem.h" +#include "Contents/Items/JobCodeForItem.h" #include "Script/LuaScript.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/AdventureGuideMgr.h b/Source/Contents/AdventureGuide/AdventureGuideMgr.h similarity index 97% rename from Source/Contents/AdventureGuideMgr.h rename to Source/Contents/AdventureGuide/AdventureGuideMgr.h index 322fa07e0..9ee4a1303 100644 --- a/Source/Contents/AdventureGuideMgr.h +++ b/Source/Contents/AdventureGuide/AdventureGuideMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ADVENTUREGUIDEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_ADVENTUREGUIDEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ADVENTUREGUIDE_ADVENTUREGUIDEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_ADVENTUREGUIDE_ADVENTUREGUIDEMGR_H #include "Script/LuaInstance.h" diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotion/CashEmotionMgr.cpp similarity index 99% rename from Source/Contents/CashEmotionMgr.cpp rename to Source/Contents/CashEmotion/CashEmotionMgr.cpp index 1076e72b1..335f8ee69 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotion/CashEmotionMgr.cpp @@ -3,7 +3,7 @@ #include "Render/DeviceContext/DCSurface.h" #include "UI/Window/UIEnums.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" @@ -18,7 +18,7 @@ #include "Contents/Skills/SkillInfo.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" -#include "Contents/SimpleStringMgr.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "Network/TextEncoding.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" @@ -32,7 +32,7 @@ #include "UI/CashEmotion/UICashEmotionPiece.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Edit/UIEditCtrl.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIButton.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Text/UIStaticText.h" diff --git a/Source/Contents/CashEmotionMgr.h b/Source/Contents/CashEmotion/CashEmotionMgr.h similarity index 98% rename from Source/Contents/CashEmotionMgr.h rename to Source/Contents/CashEmotion/CashEmotionMgr.h index 8e6098231..5e7e9ee66 100644 --- a/Source/Contents/CashEmotionMgr.h +++ b/Source/Contents/CashEmotion/CashEmotionMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_CASHEMOTIONMGR_H -#define RAGNAROK_SOURCE_CONTENTS_CASHEMOTIONMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_CASHEMOTION_CASHEMOTIONMGR_H +#define RAGNAROK_SOURCE_CONTENTS_CASHEMOTION_CASHEMOTIONMGR_H #include "Utility/Timestamp.h" diff --git a/Source/Contents/ClanInfo.cpp b/Source/Contents/Clan/ClanInfo.cpp similarity index 96% rename from Source/Contents/ClanInfo.cpp rename to Source/Contents/Clan/ClanInfo.cpp index cc78dc3c1..46de9d7a6 100644 --- a/Source/Contents/ClanInfo.cpp +++ b/Source/Contents/Clan/ClanInfo.cpp @@ -1,4 +1,4 @@ -#include "Contents/ClanInfo.h" +#include "Contents/Clan/ClanInfo.h" #include diff --git a/Source/Contents/ClanInfo.h b/Source/Contents/Clan/ClanInfo.h similarity index 91% rename from Source/Contents/ClanInfo.h rename to Source/Contents/Clan/ClanInfo.h index 09f529d28..994ded206 100644 --- a/Source/Contents/ClanInfo.h +++ b/Source/Contents/Clan/ClanInfo.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_CLANINFO_H -#define RAGNAROK_SOURCE_CONTENTS_CLANINFO_H +#ifndef RAGNAROK_SOURCE_CONTENTS_CLAN_CLANINFO_H +#define RAGNAROK_SOURCE_CONTENTS_CLAN_CLANINFO_H #include #include diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp index b9c64ebee..57a29f390 100644 --- a/Source/Contents/ClientState.cpp +++ b/Source/Contents/ClientState.cpp @@ -7,9 +7,9 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Actors/Pc.h" -#include "Contents/EntryQueueMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/World/World.h" #include "UI/EntryQueue/UIEntryQueueWnd.h" #include "UI/Window/UIWindow.h" diff --git a/Source/Contents/Combat/CombatTypes.h b/Source/Contents/CombatTypes.h similarity index 93% rename from Source/Contents/Combat/CombatTypes.h rename to Source/Contents/CombatTypes.h index e7b3c20c9..6c3bcdeef 100644 --- a/Source/Contents/Combat/CombatTypes.h +++ b/Source/Contents/CombatTypes.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_COMBAT_COMBATTYPES_H -#define RAGNAROK_SOURCE_CONTENTS_COMBAT_COMBATTYPES_H +#ifndef RAGNAROK_SOURCE_CONTENTS_COMBATTYPES_H +#define RAGNAROK_SOURCE_CONTENTS_COMBATTYPES_H enum e_damage_type : int { DMG_NORMAL = 0, diff --git a/Source/Contents/ConfigMgr.cpp b/Source/Contents/Configuration/ConfigMgr.cpp similarity index 93% rename from Source/Contents/ConfigMgr.cpp rename to Source/Contents/Configuration/ConfigMgr.cpp index 90cffe135..0a0a6756d 100644 --- a/Source/Contents/ConfigMgr.cpp +++ b/Source/Contents/Configuration/ConfigMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/ConfigMgr.h" +#include "Contents/Configuration/ConfigMgr.h" #include diff --git a/Source/Contents/ConfigMgr.h b/Source/Contents/Configuration/ConfigMgr.h similarity index 87% rename from Source/Contents/ConfigMgr.h rename to Source/Contents/Configuration/ConfigMgr.h index 7b9711ffc..27bdc9fb7 100644 --- a/Source/Contents/ConfigMgr.h +++ b/Source/Contents/Configuration/ConfigMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_CONFIGMGR_H -#define RAGNAROK_SOURCE_CONTENTS_CONFIGMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_CONFIGURATION_CONFIGMGR_H +#define RAGNAROK_SOURCE_CONTENTS_CONFIGURATION_CONFIGMGR_H #include diff --git a/Source/Contents/Configuration/ServiceConfiguration.cpp b/Source/Contents/Configuration/ServiceConfiguration.cpp index a163385b0..ee77b18f9 100644 --- a/Source/Contents/Configuration/ServiceConfiguration.cpp +++ b/Source/Contents/Configuration/ServiceConfiguration.cpp @@ -6,7 +6,7 @@ #include "Client/Application/ErrorDialog.h" #include "Client/Registry.h" #include "Client/Session.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "File/CommonObject.h" #include "File/File.h" #include "File/ResourcePath.h" diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp index 053d95a76..bf09596d6 100644 --- a/Source/Contents/Configuration/ServiceOptions.cpp +++ b/Source/Contents/Configuration/ServiceOptions.cpp @@ -7,9 +7,9 @@ #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MapSkyMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/SkinMgr.h" +#include "Contents/Map/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Skin/SkinMgr.h" #include "File/File.h" #include "Contents/Sound/SoundMgr.h" #include "File/ResourcePath.h" diff --git a/Source/Contents/Effects/CellRangeEffect.cpp b/Source/Contents/Effects/Core/CellRangeEffect.cpp similarity index 95% rename from Source/Contents/Effects/CellRangeEffect.cpp rename to Source/Contents/Effects/Core/CellRangeEffect.cpp index 42535db45..26115009f 100644 --- a/Source/Contents/Effects/CellRangeEffect.cpp +++ b/Source/Contents/Effects/Core/CellRangeEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/CellRangeEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/CellRangeEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/Skill.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Ground/TerrainHeight.h" #include "Contents/World/World.h" #include "Resource/World/TerrainResource.h" diff --git a/Source/Contents/Effects/CellRangeEffect.h b/Source/Contents/Effects/Core/CellRangeEffect.h similarity index 79% rename from Source/Contents/Effects/CellRangeEffect.h rename to Source/Contents/Effects/Core/CellRangeEffect.h index 7f7629b22..317379548 100644 --- a/Source/Contents/Effects/CellRangeEffect.h +++ b/Source/Contents/Effects/Core/CellRangeEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CELLRANGEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CELLRANGEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_CELLRANGEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_CELLRANGEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/ChangeSizeEffect.cpp b/Source/Contents/Effects/Core/ChangeSizeEffect.cpp similarity index 78% rename from Source/Contents/Effects/ChangeSizeEffect.cpp rename to Source/Contents/Effects/Core/ChangeSizeEffect.cpp index 782d60da4..1fee85539 100644 --- a/Source/Contents/Effects/ChangeSizeEffect.cpp +++ b/Source/Contents/Effects/Core/ChangeSizeEffect.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/ChangeSizeEffect.h" +#include "Contents/Effects/Core/ChangeSizeEffect.h" // OFFSET: 0x00702F90 // FUNCTION: fn_07014 diff --git a/Source/Contents/Effects/ChangeSizeEffect.h b/Source/Contents/Effects/Core/ChangeSizeEffect.h similarity index 55% rename from Source/Contents/Effects/ChangeSizeEffect.h rename to Source/Contents/Effects/Core/ChangeSizeEffect.h index 66397b87d..295db675d 100644 --- a/Source/Contents/Effects/ChangeSizeEffect.h +++ b/Source/Contents/Effects/Core/ChangeSizeEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHANGESIZEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHANGESIZEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_CHANGESIZEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_CHANGESIZEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" class CChangeSizeEffect : public CEffect { public: diff --git a/Source/Contents/Effects/DummyEffectLauncher.cpp b/Source/Contents/Effects/Core/DummyEffectLauncher.cpp similarity index 91% rename from Source/Contents/Effects/DummyEffectLauncher.cpp rename to Source/Contents/Effects/Core/DummyEffectLauncher.cpp index cc7705e43..6d3baa247 100644 --- a/Source/Contents/Effects/DummyEffectLauncher.cpp +++ b/Source/Contents/Effects/Core/DummyEffectLauncher.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/DummyEffectLauncher.h" +#include "Contents/Effects/Core/DummyEffectLauncher.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include #include diff --git a/Source/Contents/Effects/DummyEffectLauncher.h b/Source/Contents/Effects/Core/DummyEffectLauncher.h similarity index 73% rename from Source/Contents/Effects/DummyEffectLauncher.h rename to Source/Contents/Effects/Core/DummyEffectLauncher.h index dd5c3259a..09a77d844 100644 --- a/Source/Contents/Effects/DummyEffectLauncher.h +++ b/Source/Contents/Effects/Core/DummyEffectLauncher.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_DUMMYEFFECTLAUNCHER_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_DUMMYEFFECTLAUNCHER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_DUMMYEFFECTLAUNCHER_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_DUMMYEFFECTLAUNCHER_H -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include diff --git a/Source/Contents/Effects/Effect.cpp b/Source/Contents/Effects/Core/Effect.cpp similarity index 97% rename from Source/Contents/Effects/Effect.cpp rename to Source/Contents/Effects/Core/Effect.cpp index 9045924cd..8f4ffbad9 100644 --- a/Source/Contents/Effects/Effect.cpp +++ b/Source/Contents/Effects/Core/Effect.cpp @@ -1,11 +1,11 @@ #include "Client/Mode/ModeMessage.h" -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Client/Session.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/World/World.h" #include "Client/Mode/CGameMode.h" #include "Contents/Actors/Pc.h" diff --git a/Source/Contents/Effects/Effect.h b/Source/Contents/Effects/Core/Effect.h similarity index 96% rename from Source/Contents/Effects/Effect.h rename to Source/Contents/Effects/Core/Effect.h index fbbd4b963..d6c5c1d4d 100644 --- a/Source/Contents/Effects/Effect.h +++ b/Source/Contents/Effects/Core/Effect.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECT_H #include #include diff --git a/Source/Contents/Effects/EffectActor.cpp b/Source/Contents/Effects/Core/EffectActor.cpp similarity index 92% rename from Source/Contents/Effects/EffectActor.cpp rename to Source/Contents/Effects/Core/EffectActor.cpp index e0e48e908..0ec10d350 100644 --- a/Source/Contents/Effects/EffectActor.cpp +++ b/Source/Contents/Effects/Core/EffectActor.cpp @@ -1,6 +1,6 @@ #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/RagEffect.h" // INLINED EffectActorState::EffectActorState() : padding_0138(-1), padding_013C(0), effectLaunched(0), first(nullptr), second(nullptr) { diff --git a/Source/Contents/Effects/EffectActor.h b/Source/Contents/Effects/Core/EffectActor.h similarity index 91% rename from Source/Contents/Effects/EffectActor.h rename to Source/Contents/Effects/Core/EffectActor.h index 8682f447f..27e741fa5 100644 --- a/Source/Contents/Effects/EffectActor.h +++ b/Source/Contents/Effects/Core/EffectActor.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTACTOR_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTACTOR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTACTOR_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTACTOR_H #include "Contents/Actors/RenderObject.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/EffectAttachments.cpp b/Source/Contents/Effects/Core/EffectAttachments.cpp similarity index 88% rename from Source/Contents/Effects/EffectAttachments.cpp rename to Source/Contents/Effects/Core/EffectAttachments.cpp index 2dbf6d8c9..c904b1f0b 100644 --- a/Source/Contents/Effects/EffectAttachments.cpp +++ b/Source/Contents/Effects/Core/EffectAttachments.cpp @@ -1,5 +1,5 @@ -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/RagEffect.h" // OFFSET: 0x00CADBE0 // FUNCTION: fn_21062 diff --git a/Source/Contents/Effects/EffectForceRender.cpp b/Source/Contents/Effects/Core/EffectForceRender.cpp similarity index 85% rename from Source/Contents/Effects/EffectForceRender.cpp rename to Source/Contents/Effects/Core/EffectForceRender.cpp index 857df260a..ddfe8ca62 100644 --- a/Source/Contents/Effects/EffectForceRender.cpp +++ b/Source/Contents/Effects/Core/EffectForceRender.cpp @@ -1,5 +1,5 @@ #include "Client/Session.h" -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Script/LuaScript.h" // OFFSET: 0x00B4E2D0 diff --git a/Source/Contents/Effects/EffectLists.cpp b/Source/Contents/Effects/Core/EffectLists.cpp similarity index 98% rename from Source/Contents/Effects/EffectLists.cpp rename to Source/Contents/Effects/Core/EffectLists.cpp index f83b9c2e1..6e0a1da2c 100644 --- a/Source/Contents/Effects/EffectLists.cpp +++ b/Source/Contents/Effects/Core/EffectLists.cpp @@ -1,71 +1,71 @@ -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Client/Mode/ModeMessage.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/CharacterParticleBundle.h" -#include "Contents/Effects/GravityControlEffect.h" -#include "Contents/Effects/SkillEffects.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/AMachineEffect.h" -#include "Contents/Effects/AcidifiedThrow.h" -#include "Contents/Effects/AnimatedEmitterEffect.h" -#include "Contents/Effects/AstralStrikeEffect.h" -#include "Contents/Effects/AxeBoomerang.h" -#include "Contents/Effects/BezierArcThrowEffect.h" -#include "Contents/Effects/BindTrapEffect.h" -#include "Contents/Effects/BlastForge.h" -#include "Contents/Effects/CaneOfEvilEyeEffect.h" -#include "Contents/Effects/CartCannon.h" -#include "Contents/Effects/CellRangeEffect.h" -#include "Contents/Effects/ChangeSizeEffect.h" -#include "Contents/Effects/ChargingPierceEffect.h" -#include "Contents/Effects/CherryBlossomEffect.h" -#include "Contents/Effects/ClimaxEffect.h" -#include "Contents/Effects/CloudEffect.h" -#include "Contents/Effects/CloudKillEffect.h" -#include "Contents/Effects/CommonFloorEffect.h" -#include "Contents/Effects/Competentia.h" -#include "Contents/Effects/CresciveBolt.h" -#include "Contents/Effects/EZ2STREffect.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/EmitterEffect.h" -#include "Contents/Effects/EnergyOrbEffect.h" -#include "Contents/Effects/EvilLandEffect.h" -#include "Contents/Effects/EvilsPawEffect.h" -#include "Contents/Effects/FriggSongEffect.h" -#include "Contents/Effects/FuumaShouakuEffect.h" -#include "Contents/Effects/HealEffect.h" -#include "Contents/Effects/JupitelThunderStormEffect.h" -#include "Contents/Effects/Level150Effect.h" -#include "Contents/Effects/Level99Effect.h" -#include "Contents/Effects/Level99Orb1Effect.h" -#include "Contents/Effects/Level99Orb2Effect.h" -#include "Contents/Effects/LightSphereEffect.h" -#include "Contents/Effects/MagicFloorEffect.h" -#include "Contents/Effects/MapChainEffect.h" -#include "Contents/Effects/MonsterSkillEffects.h" -#include "Contents/Effects/NyanggrassEffect.h" -#include "Contents/Effects/PowderingEffect.h" -#include "Contents/Effects/RectUpEffect.h" -#include "Contents/Effects/RotateItemEffect.h" -#include "Contents/Effects/RotateLineEffect.h" -#include "Contents/Effects/ScatterEffect.h" -#include "Contents/Effects/ShadowExceedEffect.h" -#include "Contents/Effects/ShowEffect.h" -#include "Contents/Effects/SmokeEffect.h" -#include "Contents/Effects/SoulCollectEffect.h" -#include "Contents/Effects/SoulUnityEffect.h" -#include "Contents/Effects/SpriteEffect.h" -#include "Contents/Effects/SquareRangeEffect.h" -#include "Contents/Effects/StarEmperorEffect.h" -#include "Contents/Effects/StormCannonEffect.h" -#include "Contents/Effects/StormKickEffect.h" -#include "Contents/Effects/SunStanceEffect.h" -#include "Contents/Effects/TalismanMarkEffect.h" -#include "Contents/Effects/TetraBallEffect.h" -#include "Contents/Effects/ThrowEffects.h" -#include "Contents/Effects/TriangleShotArrow.h" -#include "Contents/Effects/ViolentQuakeEffect.h" -#include "Contents/Effects/WindEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/CharacterParticleBundle.h" +#include "Contents/Effects/Skills/GravityControlEffect.h" +#include "Contents/Effects/Skills/SkillEffects.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Skills/AMachineEffect.h" +#include "Contents/Effects/Skills/AcidifiedThrow.h" +#include "Contents/Effects/Particles/AnimatedEmitterEffect.h" +#include "Contents/Effects/Skills/AstralStrikeEffect.h" +#include "Contents/Effects/Skills/AxeBoomerang.h" +#include "Contents/Effects/Skills/BezierArcThrowEffect.h" +#include "Contents/Effects/Skills/BindTrapEffect.h" +#include "Contents/Effects/Skills/BlastForge.h" +#include "Contents/Effects/Skills/CaneOfEvilEyeEffect.h" +#include "Contents/Effects/Skills/CartCannon.h" +#include "Contents/Effects/Core/CellRangeEffect.h" +#include "Contents/Effects/Core/ChangeSizeEffect.h" +#include "Contents/Effects/Skills/ChargingPierceEffect.h" +#include "Contents/Effects/Skills/CherryBlossomEffect.h" +#include "Contents/Effects/Skills/ClimaxEffect.h" +#include "Contents/Effects/Skills/CloudEffect.h" +#include "Contents/Effects/Skills/CloudKillEffect.h" +#include "Contents/Effects/Skills/CommonFloorEffect.h" +#include "Contents/Effects/Skills/Competentia.h" +#include "Contents/Effects/Skills/CresciveBolt.h" +#include "Contents/Effects/Particles/EZ2STREffect.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Particles/EmitterEffect.h" +#include "Contents/Effects/Skills/EnergyOrbEffect.h" +#include "Contents/Effects/Skills/EvilLandEffect.h" +#include "Contents/Effects/Skills/EvilsPawEffect.h" +#include "Contents/Effects/Skills/FriggSongEffect.h" +#include "Contents/Effects/Skills/FuumaShouakuEffect.h" +#include "Contents/Effects/Skills/HealEffect.h" +#include "Contents/Effects/Skills/JupitelThunderStormEffect.h" +#include "Contents/Effects/Skills/Level150Effect.h" +#include "Contents/Effects/Skills/Level99Effect.h" +#include "Contents/Effects/Skills/Level99Orb1Effect.h" +#include "Contents/Effects/Skills/Level99Orb2Effect.h" +#include "Contents/Effects/Skills/LightSphereEffect.h" +#include "Contents/Effects/Skills/MagicFloorEffect.h" +#include "Contents/Effects/Skills/MapChainEffect.h" +#include "Contents/Effects/Skills/MonsterSkillEffects.h" +#include "Contents/Effects/Skills/NyanggrassEffect.h" +#include "Contents/Effects/Skills/PowderingEffect.h" +#include "Contents/Effects/Skills/RectUpEffect.h" +#include "Contents/Effects/Skills/RotateItemEffect.h" +#include "Contents/Effects/Skills/RotateLineEffect.h" +#include "Contents/Effects/Skills/ScatterEffect.h" +#include "Contents/Effects/Skills/ShadowExceedEffect.h" +#include "Contents/Effects/Core/ShowEffect.h" +#include "Contents/Effects/Skills/SmokeEffect.h" +#include "Contents/Effects/Skills/SoulCollectEffect.h" +#include "Contents/Effects/Skills/SoulUnityEffect.h" +#include "Contents/Effects/Particles/SpriteEffect.h" +#include "Contents/Effects/Core/SquareRangeEffect.h" +#include "Contents/Effects/Skills/StarEmperorEffect.h" +#include "Contents/Effects/Skills/StormCannonEffect.h" +#include "Contents/Effects/Skills/StormKickEffect.h" +#include "Contents/Effects/Skills/SunStanceEffect.h" +#include "Contents/Effects/Skills/TalismanMarkEffect.h" +#include "Contents/Effects/Skills/TetraBallEffect.h" +#include "Contents/Effects/Skills/ThrowEffects.h" +#include "Contents/Effects/Skills/TriangleShotArrow.h" +#include "Contents/Effects/Skills/ViolentQuakeEffect.h" +#include "Contents/Effects/Skills/WindEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Session.h" @@ -76,7 +76,7 @@ #include "Render/Renderer.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Math/AffineMatrix.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/Particle.h" #include "Script/LuaScript.h" #include diff --git a/Source/Contents/Effects/EffectLists.h b/Source/Contents/Effects/Core/EffectLists.h similarity index 92% rename from Source/Contents/Effects/EffectLists.h rename to Source/Contents/Effects/Core/EffectLists.h index b9dc3c10d..edca843bd 100644 --- a/Source/Contents/Effects/EffectLists.h +++ b/Source/Contents/Effects/Core/EffectLists.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTLISTS_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTLISTS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTLISTS_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTLISTS_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/EffectMaker.cpp b/Source/Contents/Effects/Core/EffectMaker.cpp similarity index 96% rename from Source/Contents/Effects/EffectMaker.cpp rename to Source/Contents/Effects/Core/EffectMaker.cpp index af26d3913..dd3224abc 100644 --- a/Source/Contents/Effects/EffectMaker.cpp +++ b/Source/Contents/Effects/Core/EffectMaker.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/EffectMaker.h" +#include "Contents/Effects/Core/EffectMaker.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/Pc.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/World/World.h" #include "Resource/World/WorldResource.h" diff --git a/Source/Contents/Effects/EffectMaker.h b/Source/Contents/Effects/Core/EffectMaker.h similarity index 81% rename from Source/Contents/Effects/EffectMaker.h rename to Source/Contents/Effects/Core/EffectMaker.h index c5dbf14a2..d71d3bce6 100644 --- a/Source/Contents/Effects/EffectMaker.h +++ b/Source/Contents/Effects/Core/EffectMaker.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTMAKER_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTMAKER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTMAKER_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTMAKER_H -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include diff --git a/Source/Contents/Effects/EffectMemoryMgr.cpp b/Source/Contents/Effects/Core/EffectMemoryMgr.cpp similarity index 96% rename from Source/Contents/Effects/EffectMemoryMgr.cpp rename to Source/Contents/Effects/Core/EffectMemoryMgr.cpp index d35438628..66807b8f5 100644 --- a/Source/Contents/Effects/EffectMemoryMgr.cpp +++ b/Source/Contents/Effects/Core/EffectMemoryMgr.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/NyanggrassEffect.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Skills/NyanggrassEffect.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/EffectMemoryMgr.h b/Source/Contents/Effects/Core/EffectMemoryMgr.h similarity index 76% rename from Source/Contents/Effects/EffectMemoryMgr.h rename to Source/Contents/Effects/Core/EffectMemoryMgr.h index ecd4a4d95..4f1b3bcb9 100644 --- a/Source/Contents/Effects/EffectMemoryMgr.h +++ b/Source/Contents/Effects/Core/EffectMemoryMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTMEMORYMGR_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTMEMORYMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTMEMORYMGR_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTMEMORYMGR_H class CParticle; struct vector3d; diff --git a/Source/Contents/Effects/EffectMessageId.h b/Source/Contents/Effects/Core/EffectMessageId.h similarity index 91% rename from Source/Contents/Effects/EffectMessageId.h rename to Source/Contents/Effects/Core/EffectMessageId.h index e49a7b877..83ecc7993 100644 --- a/Source/Contents/Effects/EffectMessageId.h +++ b/Source/Contents/Effects/Core/EffectMessageId.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTMESSAGEID_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTMESSAGEID_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTMESSAGEID_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTMESSAGEID_H enum EffectMessageId : int { MSG_SET_INIT = 0, diff --git a/Source/Contents/Effects/EffectPoint.h b/Source/Contents/Effects/Core/EffectPoint.h similarity index 60% rename from Source/Contents/Effects/EffectPoint.h rename to Source/Contents/Effects/Core/EffectPoint.h index 8f7448116..b58f749a7 100644 --- a/Source/Contents/Effects/EffectPoint.h +++ b/Source/Contents/Effects/Core/EffectPoint.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPOINT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPOINT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTPOINT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTPOINT_H struct EffectPoint { EffectPoint() : x(0), y(0), z(0) { diff --git a/Source/Contents/Effects/EffectPrimId.h b/Source/Contents/Effects/Core/EffectPrimId.h similarity index 93% rename from Source/Contents/Effects/EffectPrimId.h rename to Source/Contents/Effects/Core/EffectPrimId.h index b58ca3585..abed11b38 100644 --- a/Source/Contents/Effects/EffectPrimId.h +++ b/Source/Contents/Effects/Core/EffectPrimId.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIMID_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIMID_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTPRIMID_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTPRIMID_H enum EFFECTPRIMID : int { PP_2DTEXTURE = 0, diff --git a/Source/Contents/Effects/EffectTypes.cpp b/Source/Contents/Effects/Core/EffectTypes.cpp similarity index 99% rename from Source/Contents/Effects/EffectTypes.cpp rename to Source/Contents/Effects/Core/EffectTypes.cpp index 5cd929196..132abde55 100644 --- a/Source/Contents/Effects/EffectTypes.cpp +++ b/Source/Contents/Effects/Core/EffectTypes.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" #include diff --git a/Source/Contents/Effects/EffectTypes.h b/Source/Contents/Effects/Core/EffectTypes.h similarity index 99% rename from Source/Contents/Effects/EffectTypes.h rename to Source/Contents/Effects/Core/EffectTypes.h index 8582d793f..06df25504 100644 --- a/Source/Contents/Effects/EffectTypes.h +++ b/Source/Contents/Effects/Core/EffectTypes.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTTYPES_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTTYPES_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTTYPES_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_EFFECTTYPES_H #include diff --git a/Source/Contents/Effects/EffectVisibility.cpp b/Source/Contents/Effects/Core/EffectVisibility.cpp similarity index 90% rename from Source/Contents/Effects/EffectVisibility.cpp rename to Source/Contents/Effects/Core/EffectVisibility.cpp index adc3aebb6..2eaff52b1 100644 --- a/Source/Contents/Effects/EffectVisibility.cpp +++ b/Source/Contents/Effects/Core/EffectVisibility.cpp @@ -1,6 +1,6 @@ -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/RagEffectState.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Core/RagEffectState.h" #include "Contents/Configuration/ServiceOptions.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/Contents/Effects/MsgEffect.cpp b/Source/Contents/Effects/Core/MsgEffect.cpp similarity index 99% rename from Source/Contents/Effects/MsgEffect.cpp rename to Source/Contents/Effects/Core/MsgEffect.cpp index c7814c7bc..f54b07ec9 100644 --- a/Source/Contents/Effects/MsgEffect.cpp +++ b/Source/Contents/Effects/Core/MsgEffect.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/ModeMessage.h" #include "Client/Mode/GameModeEnums.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/MsgEffect.h" +#include "Contents/Effects/Core/MsgEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" @@ -13,11 +13,11 @@ #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Effects/MsgEffect.h b/Source/Contents/Effects/Core/MsgEffect.h similarity index 89% rename from Source/Contents/Effects/MsgEffect.h rename to Source/Contents/Effects/Core/MsgEffect.h index 8e83bb74c..b9b274e86 100644 --- a/Source/Contents/Effects/MsgEffect.h +++ b/Source/Contents/Effects/Core/MsgEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MSGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MSGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_MSGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_MSGEFFECT_H -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include #include diff --git a/Source/Contents/Effects/RagEffect.cpp b/Source/Contents/Effects/Core/RagEffect.cpp similarity index 99% rename from Source/Contents/Effects/RagEffect.cpp rename to Source/Contents/Effects/Core/RagEffect.cpp index b423214dd..7264c4c77 100644 --- a/Source/Contents/Effects/RagEffect.cpp +++ b/Source/Contents/Effects/Core/RagEffect.cpp @@ -1,19 +1,19 @@ -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" #include "Contents/Actors/ActorEnums.h" #include "Contents/Actors/Pc.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Skills/ClientSkills.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Resource/Resource.h" #include "Client/Mode/CGameMode.h" #include "Client/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrim.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Render/Primitives/RenderPrimitive.h" @@ -23,17 +23,17 @@ #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Utility/Math/AffineMatrix.h" -#include "Contents/Effects/EffectPrimitiveMotion.h" +#include "Contents/Effects/Primitives/EffectPrimitiveMotion.h" #include "Resource/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 "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/Particle.h" #include "Client/Application/ErrorDialog.h" #include "Render/DeviceContext/DCSurface.h" #include diff --git a/Source/Contents/Effects/RagEffect.h b/Source/Contents/Effects/Core/RagEffect.h similarity index 98% rename from Source/Contents/Effects/RagEffect.h rename to Source/Contents/Effects/Core/RagEffect.h index 9c09a5831..4d29fe085 100644 --- a/Source/Contents/Effects/RagEffect.h +++ b/Source/Contents/Effects/Core/RagEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_RAGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_RAGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_RAGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_RAGEFFECT_H -#include "Contents/Effects/RagEffectState.h" +#include "Contents/Effects/Core/RagEffectState.h" #include "Contents/Actors/RenderObject.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/RagEffectInitialization.cpp b/Source/Contents/Effects/Core/RagEffectInitialization.cpp similarity index 98% rename from Source/Contents/Effects/RagEffectInitialization.cpp rename to Source/Contents/Effects/Core/RagEffectInitialization.cpp index b9da59074..454ea78ac 100644 --- a/Source/Contents/Effects/RagEffectInitialization.cpp +++ b/Source/Contents/Effects/Core/RagEffectInitialization.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/RagEffectState.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Core/RagEffectState.h" #include "Contents/Configuration/ServiceOptions.h" #include "Resource/EZeffectResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Effects/RagEffectState.h b/Source/Contents/Effects/Core/RagEffectState.h similarity index 93% rename from Source/Contents/Effects/RagEffectState.h rename to Source/Contents/Effects/Core/RagEffectState.h index 68372351d..e03c1ec97 100644 --- a/Source/Contents/Effects/RagEffectState.h +++ b/Source/Contents/Effects/Core/RagEffectState.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_RAGEFFECTSTATE_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_RAGEFFECTSTATE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_RAGEFFECTSTATE_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_RAGEFFECTSTATE_H #include "Resource/EZeffectResource.h" diff --git a/Source/Contents/Effects/ShowEffect.cpp b/Source/Contents/Effects/Core/ShowEffect.cpp similarity index 95% rename from Source/Contents/Effects/ShowEffect.cpp rename to Source/Contents/Effects/Core/ShowEffect.cpp index c114d25cb..40b09bd86 100644 --- a/Source/Contents/Effects/ShowEffect.cpp +++ b/Source/Contents/Effects/Core/ShowEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/ShowEffect.h" +#include "Contents/Effects/Core/ShowEffect.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Actors/Pc.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/World/World.h" namespace { diff --git a/Source/Contents/Effects/ShowEffect.h b/Source/Contents/Effects/Core/ShowEffect.h similarity index 70% rename from Source/Contents/Effects/ShowEffect.h rename to Source/Contents/Effects/Core/ShowEffect.h index 029ae654f..df354dc4a 100644 --- a/Source/Contents/Effects/ShowEffect.h +++ b/Source/Contents/Effects/Core/ShowEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SHOWEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SHOWEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_SHOWEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_SHOWEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/SquareRangeEffect.cpp b/Source/Contents/Effects/Core/SquareRangeEffect.cpp similarity index 93% rename from Source/Contents/Effects/SquareRangeEffect.cpp rename to Source/Contents/Effects/Core/SquareRangeEffect.cpp index 9cc276e97..b950004a9 100644 --- a/Source/Contents/Effects/SquareRangeEffect.cpp +++ b/Source/Contents/Effects/Core/SquareRangeEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/SquareRangeEffect.h" +#include "Contents/Effects/Core/SquareRangeEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/SquareRangeEffect.h b/Source/Contents/Effects/Core/SquareRangeEffect.h similarity index 75% rename from Source/Contents/Effects/SquareRangeEffect.h rename to Source/Contents/Effects/Core/SquareRangeEffect.h index 89db16139..504e4e121 100644 --- a/Source/Contents/Effects/SquareRangeEffect.h +++ b/Source/Contents/Effects/Core/SquareRangeEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SQUARERANGEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SQUARERANGEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_SQUARERANGEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CORE_SQUARERANGEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/EffectPrimitiveMotion.h b/Source/Contents/Effects/EffectPrimitiveMotion.h deleted file mode 100644 index 47d882063..000000000 --- a/Source/Contents/Effects/EffectPrimitiveMotion.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIMITIVEMOTION_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIMITIVEMOTION_H - -struct RenderVertex; -struct matrix; -struct vector3d; - -RenderVertex TransformVert(const matrix& view, const vector3d& position); - -#endif diff --git a/Source/Contents/EffectResourceSwitcher.cpp b/Source/Contents/Effects/EffectResourceSwitcher.cpp similarity index 97% rename from Source/Contents/EffectResourceSwitcher.cpp rename to Source/Contents/Effects/EffectResourceSwitcher.cpp index 094d2ba87..94ae07112 100644 --- a/Source/Contents/EffectResourceSwitcher.cpp +++ b/Source/Contents/Effects/EffectResourceSwitcher.cpp @@ -1,13 +1,13 @@ -#include "Contents/EffectResourceSwitcher.h" +#include "Contents/Effects/EffectResourceSwitcher.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "File/File.h" #include "Network/TextEncoding.h" diff --git a/Source/Contents/EffectResourceSwitcher.h b/Source/Contents/Effects/EffectResourceSwitcher.h similarity index 90% rename from Source/Contents/EffectResourceSwitcher.h rename to Source/Contents/Effects/EffectResourceSwitcher.h index 3e871587f..339de8316 100644 --- a/Source/Contents/EffectResourceSwitcher.h +++ b/Source/Contents/Effects/EffectResourceSwitcher.h @@ -1,9 +1,9 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTRESOURCESWITCHER_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTRESOURCESWITCHER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTRESOURCESWITCHER_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTRESOURCESWITCHER_H -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectEmitter.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/EffectEmitter.h" #include "Utility/Math/Vector3d.h" #include "Utility/Singleton.h" diff --git a/Source/Contents/Effects/AnimatedEmitterEffect.cpp b/Source/Contents/Effects/Particles/AnimatedEmitterEffect.cpp similarity index 94% rename from Source/Contents/Effects/AnimatedEmitterEffect.cpp rename to Source/Contents/Effects/Particles/AnimatedEmitterEffect.cpp index 2c444a2c0..435d7bee3 100644 --- a/Source/Contents/Effects/AnimatedEmitterEffect.cpp +++ b/Source/Contents/Effects/Particles/AnimatedEmitterEffect.cpp @@ -1,6 +1,6 @@ -#include "Contents/Effects/AnimatedEmitterEffect.h" +#include "Contents/Effects/Particles/AnimatedEmitterEffect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/Particle.h" #include diff --git a/Source/Contents/Effects/AnimatedEmitterEffect.h b/Source/Contents/Effects/Particles/AnimatedEmitterEffect.h similarity index 72% rename from Source/Contents/Effects/AnimatedEmitterEffect.h rename to Source/Contents/Effects/Particles/AnimatedEmitterEffect.h index 15ffc9d29..6dd202df1 100644 --- a/Source/Contents/Effects/AnimatedEmitterEffect.h +++ b/Source/Contents/Effects/Particles/AnimatedEmitterEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ANIMATEDEMITTEREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ANIMATEDEMITTEREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_ANIMATEDEMITTEREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_ANIMATEDEMITTEREFFECT_H -#include "Contents/Effects/EmitterEffect.h" +#include "Contents/Effects/Particles/EmitterEffect.h" #include #include diff --git a/Source/Contents/Effects/CharacterParticleBundle.cpp b/Source/Contents/Effects/Particles/CharacterParticleBundle.cpp similarity index 97% rename from Source/Contents/Effects/CharacterParticleBundle.cpp rename to Source/Contents/Effects/Particles/CharacterParticleBundle.cpp index c811bad8e..86d1f3757 100644 --- a/Source/Contents/Effects/CharacterParticleBundle.cpp +++ b/Source/Contents/Effects/Particles/CharacterParticleBundle.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/CharacterParticleBundle.h" +#include "Contents/Effects/Particles/CharacterParticleBundle.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/RadialGrid.h" diff --git a/Source/Contents/Effects/CharacterParticleBundle.h b/Source/Contents/Effects/Particles/CharacterParticleBundle.h similarity index 88% rename from Source/Contents/Effects/CharacterParticleBundle.h rename to Source/Contents/Effects/Particles/CharacterParticleBundle.h index 504634c70..edf59a706 100644 --- a/Source/Contents/Effects/CharacterParticleBundle.h +++ b/Source/Contents/Effects/Particles/CharacterParticleBundle.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHARACTERPARTICLEBUNDLE_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHARACTERPARTICLEBUNDLE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_CHARACTERPARTICLEBUNDLE_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_CHARACTERPARTICLEBUNDLE_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/EZ2STREffect.cpp b/Source/Contents/Effects/Particles/EZ2STREffect.cpp similarity index 99% rename from Source/Contents/Effects/EZ2STREffect.cpp rename to Source/Contents/Effects/Particles/EZ2STREffect.cpp index 4198309b1..f223be812 100644 --- a/Source/Contents/Effects/EZ2STREffect.cpp +++ b/Source/Contents/Effects/Particles/EZ2STREffect.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/EZ2STREffect.h" +#include "Contents/Effects/Particles/EZ2STREffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" @@ -6,9 +6,9 @@ #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" diff --git a/Source/Contents/Effects/EZ2STREffect.h b/Source/Contents/Effects/Particles/EZ2STREffect.h similarity index 89% rename from Source/Contents/Effects/EZ2STREffect.h rename to Source/Contents/Effects/Particles/EZ2STREffect.h index 924deb337..9ae310144 100644 --- a/Source/Contents/Effects/EZ2STREffect.h +++ b/Source/Contents/Effects/Particles/EZ2STREffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EZ2STREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EZ2STREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EZ2STREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EZ2STREFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/EZ2STREffectEx.cpp b/Source/Contents/Effects/Particles/EZ2STREffectEx.cpp similarity index 92% rename from Source/Contents/Effects/EZ2STREffectEx.cpp rename to Source/Contents/Effects/Particles/EZ2STREffectEx.cpp index 8fd2ac6d8..af718a699 100644 --- a/Source/Contents/Effects/EZ2STREffectEx.cpp +++ b/Source/Contents/Effects/Particles/EZ2STREffectEx.cpp @@ -1,6 +1,6 @@ -#include "Contents/Effects/EZ2STREffectEx.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Render/Renderer.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/EZ2STREffectEx.h b/Source/Contents/Effects/Particles/EZ2STREffectEx.h similarity index 87% rename from Source/Contents/Effects/EZ2STREffectEx.h rename to Source/Contents/Effects/Particles/EZ2STREffectEx.h index 334e0a2cd..e868b4515 100644 --- a/Source/Contents/Effects/EZ2STREffectEx.h +++ b/Source/Contents/Effects/Particles/EZ2STREffectEx.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EZ2STREFFECTEX_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EZ2STREFFECTEX_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EZ2STREFFECTEX_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EZ2STREFFECTEX_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/EffectEmitter.h b/Source/Contents/Effects/Particles/EffectEmitter.h similarity index 93% rename from Source/Contents/Effects/EffectEmitter.h rename to Source/Contents/Effects/Particles/EffectEmitter.h index 906c1d0ff..89194aa58 100644 --- a/Source/Contents/Effects/EffectEmitter.h +++ b/Source/Contents/Effects/Particles/EffectEmitter.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTEMITTER_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTEMITTER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EFFECTEMITTER_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EFFECTEMITTER_H #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/EmitterEffect.cpp b/Source/Contents/Effects/Particles/EmitterEffect.cpp similarity index 98% rename from Source/Contents/Effects/EmitterEffect.cpp rename to Source/Contents/Effects/Particles/EmitterEffect.cpp index 8f83e6689..7fd8ad1a2 100644 --- a/Source/Contents/Effects/EmitterEffect.cpp +++ b/Source/Contents/Effects/Particles/EmitterEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/EmitterEffect.h" +#include "Contents/Effects/Particles/EmitterEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/EmitterEffect.h b/Source/Contents/Effects/Particles/EmitterEffect.h similarity index 89% rename from Source/Contents/Effects/EmitterEffect.h rename to Source/Contents/Effects/Particles/EmitterEffect.h index e3ec38b9c..6218edd66 100644 --- a/Source/Contents/Effects/EmitterEffect.h +++ b/Source/Contents/Effects/Particles/EmitterEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EMITTEREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EMITTEREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EMITTEREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_EMITTEREFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/ParticlePool.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/ParticlePool.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/Particle.cpp b/Source/Contents/Effects/Particles/Particle.cpp similarity index 99% rename from Source/Contents/Effects/Particle.cpp rename to Source/Contents/Effects/Particles/Particle.cpp index 66a15c379..24270e5cf 100644 --- a/Source/Contents/Effects/Particle.cpp +++ b/Source/Contents/Effects/Particles/Particle.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/Particle.h" #include "UI/Window/WindowId.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/Contents/Effects/Particle.h b/Source/Contents/Effects/Particles/Particle.h similarity index 98% rename from Source/Contents/Effects/Particle.h rename to Source/Contents/Effects/Particles/Particle.h index 1a7dd00a5..412d1850d 100644 --- a/Source/Contents/Effects/Particle.h +++ b/Source/Contents/Effects/Particles/Particle.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLE_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_PARTICLE_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_PARTICLE_H #include "Render/Primitives/RenderPrimitive.h" #include "Resource/EZeffectResource.h" diff --git a/Source/Contents/Effects/ParticlePool.cpp b/Source/Contents/Effects/Particles/ParticlePool.cpp similarity index 97% rename from Source/Contents/Effects/ParticlePool.cpp rename to Source/Contents/Effects/Particles/ParticlePool.cpp index 699f4a9d2..2531f497c 100644 --- a/Source/Contents/Effects/ParticlePool.cpp +++ b/Source/Contents/Effects/Particles/ParticlePool.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/ParticlePool.h" +#include "Contents/Effects/Particles/ParticlePool.h" // OFFSET: 0x00B402F0 // FUNCTION: fn_18849 diff --git a/Source/Contents/Effects/ParticlePool.h b/Source/Contents/Effects/Particles/ParticlePool.h similarity index 80% rename from Source/Contents/Effects/ParticlePool.h rename to Source/Contents/Effects/Particles/ParticlePool.h index 8bb02a053..d7b27c135 100644 --- a/Source/Contents/Effects/ParticlePool.h +++ b/Source/Contents/Effects/Particles/ParticlePool.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLEPOOL_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLEPOOL_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_PARTICLEPOOL_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_PARTICLEPOOL_H #include #include diff --git a/Source/Contents/Effects/SpriteEffect.cpp b/Source/Contents/Effects/Particles/SpriteEffect.cpp similarity index 99% rename from Source/Contents/Effects/SpriteEffect.cpp rename to Source/Contents/Effects/Particles/SpriteEffect.cpp index 9b102d356..918122f75 100644 --- a/Source/Contents/Effects/SpriteEffect.cpp +++ b/Source/Contents/Effects/Particles/SpriteEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/SpriteEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/SpriteEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Actors/GameActor.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Contents/World/World.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/Effects/SpriteEffect.h b/Source/Contents/Effects/Particles/SpriteEffect.h similarity index 75% rename from Source/Contents/Effects/SpriteEffect.h rename to Source/Contents/Effects/Particles/SpriteEffect.h index 4c0e08799..71f2c4cf4 100644 --- a/Source/Contents/Effects/SpriteEffect.h +++ b/Source/Contents/Effects/Particles/SpriteEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPRITEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPRITEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_SPRITEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_SPRITEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/SpriteParticle.cpp b/Source/Contents/Effects/Particles/SpriteParticle.cpp similarity index 99% rename from Source/Contents/Effects/SpriteParticle.cpp rename to Source/Contents/Effects/Particles/SpriteParticle.cpp index d8eadb5e2..860868773 100644 --- a/Source/Contents/Effects/SpriteParticle.cpp +++ b/Source/Contents/Effects/Particles/SpriteParticle.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" @@ -6,7 +6,7 @@ #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/World/World.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Renderer.h" diff --git a/Source/Contents/Effects/SpriteParticle.h b/Source/Contents/Effects/Particles/SpriteParticle.h similarity index 85% rename from Source/Contents/Effects/SpriteParticle.h rename to Source/Contents/Effects/Particles/SpriteParticle.h index adb509d43..1c4cfceee 100644 --- a/Source/Contents/Effects/SpriteParticle.h +++ b/Source/Contents/Effects/Particles/SpriteParticle.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPRITEPARTICLE_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPRITEPARTICLE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_SPRITEPARTICLE_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTICLES_SPRITEPARTICLE_H -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/Particle.h" #include diff --git a/Source/Contents/Effects/EffectPrim.cpp b/Source/Contents/Effects/Primitives/EffectPrim.cpp similarity index 97% rename from Source/Contents/Effects/EffectPrim.cpp rename to Source/Contents/Effects/Primitives/EffectPrim.cpp index cd6ba0334..97396161b 100644 --- a/Source/Contents/Effects/EffectPrim.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrim.cpp @@ -1,5 +1,5 @@ -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Core/RagEffect.h" #include diff --git a/Source/Contents/Effects/EffectPrim.h b/Source/Contents/Effects/Primitives/EffectPrim.h similarity index 97% rename from Source/Contents/Effects/EffectPrim.h rename to Source/Contents/Effects/Primitives/EffectPrim.h index 27b388b12..9806b3713 100644 --- a/Source/Contents/Effects/EffectPrim.h +++ b/Source/Contents/Effects/Primitives/EffectPrim.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIM_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIM_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PRIMITIVES_EFFECTPRIM_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PRIMITIVES_EFFECTPRIM_H -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Contents/Actors/RenderObject.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/EffectPrimitiveArcs.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp similarity index 99% rename from Source/Contents/Effects/EffectPrimitiveArcs.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp index 8d459028e..6731ed995 100644 --- a/Source/Contents/Effects/EffectPrimitiveArcs.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Render/Renderer.h" #include "Render/SpriteGeometry.h" #include "Render/SpriteQuad.h" diff --git a/Source/Contents/Effects/EffectPrimitiveColor.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveColor.cpp similarity index 95% rename from Source/Contents/Effects/EffectPrimitiveColor.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveColor.cpp index 052d38ecf..bb5111061 100644 --- a/Source/Contents/Effects/EffectPrimitiveColor.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveColor.cpp @@ -1,5 +1,5 @@ -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Utility/Math/ScalarConversion.h" // OFFSET: 0x00BC5E00 diff --git a/Source/Contents/Effects/EffectPrimitiveGlowSquares.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveGlowSquares.cpp similarity index 97% rename from Source/Contents/Effects/EffectPrimitiveGlowSquares.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveGlowSquares.cpp index f7db42fa7..c337ba4af 100644 --- a/Source/Contents/Effects/EffectPrimitiveGlowSquares.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveGlowSquares.cpp @@ -1,5 +1,5 @@ -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Utility/Math/AffineMatrix.h" // OFFSET: 0x00BF5060 diff --git a/Source/Contents/Effects/EffectPrimitiveMotion.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp similarity index 99% rename from Source/Contents/Effects/EffectPrimitiveMotion.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp index bbde443dd..c76d22414 100644 --- a/Source/Contents/Effects/EffectPrimitiveMotion.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/EffectPrimitiveMotion.h" +#include "Contents/Effects/Primitives/EffectPrimitiveMotion.h" #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/EffectPrimId.h" +#include "Contents/Effects/Core/EffectPrimId.h" #include "Client/Application/ErrorDialog.h" #include "Render/DeviceContext/DCSurface.h" #include "Client/Mode/CGameMode.h" @@ -13,13 +13,13 @@ #include "Contents/Actors/GroundScope.h" #include "Contents/World/World.h" #include "Resource/Sprites/ActionResource.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Core/EffectActor.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Skills/ClientSkills.h" -#include "Contents/Effects/RagEffectState.h" +#include "Contents/Effects/Core/RagEffectState.h" #include "Contents/Sound/SoundMgr.h" #include "Resource/World/TerrainResource.h" #include "Contents/Actors/RenderObjectState.h" diff --git a/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.h b/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.h new file mode 100644 index 000000000..335fcc086 --- /dev/null +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveMotion.h @@ -0,0 +1,10 @@ +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PRIMITIVES_EFFECTPRIMITIVEMOTION_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PRIMITIVES_EFFECTPRIMITIVEMOTION_H + +struct RenderVertex; +struct matrix; +struct vector3d; + +RenderVertex TransformVert(const matrix& view, const vector3d& position); + +#endif diff --git a/Source/Contents/Effects/EffectPrimitivePanels.cpp b/Source/Contents/Effects/Primitives/EffectPrimitivePanels.cpp similarity index 98% rename from Source/Contents/Effects/EffectPrimitivePanels.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitivePanels.cpp index b29756155..f691ce435 100644 --- a/Source/Contents/Effects/EffectPrimitivePanels.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitivePanels.cpp @@ -1,6 +1,6 @@ -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Math/AffineMatrix.h" struct ZeroVector3d : vector3d { diff --git a/Source/Contents/Effects/EffectPrimitiveRecords.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveRecords.cpp similarity index 92% rename from Source/Contents/Effects/EffectPrimitiveRecords.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveRecords.cpp index ec1a8f2d4..95a01aee5 100644 --- a/Source/Contents/Effects/EffectPrimitiveRecords.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveRecords.cpp @@ -1,5 +1,5 @@ -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Contents/Actors/RenderObjectState.h" #include diff --git a/Source/Contents/Effects/EffectPrimitiveRendering.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp similarity index 99% rename from Source/Contents/Effects/EffectPrimitiveRendering.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp index dc4c6ab5a..314238dc4 100644 --- a/Source/Contents/Effects/EffectPrimitiveRendering.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp @@ -1,13 +1,13 @@ #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/EffectPrimId.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectPrimId.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Contents/Actors/RenderObjectState.h" #include "Render/Primitives/RenderQueues.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveMotion.h" -#include "Contents/Effects/RagEffectState.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveMotion.h" +#include "Contents/Effects/Core/RagEffectState.h" #include "Render/Renderer.h" #include "Render/TextureQuad.h" #include "Utility/Math/AffineMatrix.h" @@ -19,7 +19,7 @@ #include "Contents/World/World.h" #include "Contents/Ground/GroundGeometry.h" #include "Render/Textures/TextureCache.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Client/Replay.h" #include "Contents/Skills/ClientSkills.h" #include "UI/Cooldowns/CooldownOwner.h" diff --git a/Source/Contents/Effects/EffectPrimitiveSprites.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp similarity index 98% rename from Source/Contents/Effects/EffectPrimitiveSprites.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp index 99e791459..c3a7e0afd 100644 --- a/Source/Contents/Effects/EffectPrimitiveSprites.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp @@ -1,7 +1,7 @@ #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Client/Mode/CGameMode.h" diff --git a/Source/Contents/Effects/EffectPrimitiveState.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveState.cpp similarity index 93% rename from Source/Contents/Effects/EffectPrimitiveState.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveState.cpp index 1fe4010ca..0b499c106 100644 --- a/Source/Contents/Effects/EffectPrimitiveState.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveState.cpp @@ -1,6 +1,6 @@ -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Actors/RenderObjectState.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/EffectPrimitiveState.h b/Source/Contents/Effects/Primitives/EffectPrimitiveState.h similarity index 97% rename from Source/Contents/Effects/EffectPrimitiveState.h rename to Source/Contents/Effects/Primitives/EffectPrimitiveState.h index e6efb970b..45628b426 100644 --- a/Source/Contents/Effects/EffectPrimitiveState.h +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveState.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIMITIVESTATE_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EFFECTPRIMITIVESTATE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PRIMITIVES_EFFECTPRIMITIVESTATE_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PRIMITIVES_EFFECTPRIMITIVESTATE_H #include "Render/Primitives/RenderPrimitive.h" diff --git a/Source/Contents/Effects/EffectPrimitiveSweeps.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveSweeps.cpp similarity index 99% rename from Source/Contents/Effects/EffectPrimitiveSweeps.cpp rename to Source/Contents/Effects/Primitives/EffectPrimitiveSweeps.cpp index 807c48f9e..434a32d6c 100644 --- a/Source/Contents/Effects/EffectPrimitiveSweeps.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveSweeps.cpp @@ -1,5 +1,5 @@ -#include "Contents/Effects/EffectPrim.h" -#include "Contents/Effects/EffectPrimitiveState.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/RDamageVar.cpp b/Source/Contents/Effects/RDamageVar.cpp similarity index 64% rename from Source/Contents/RDamageVar.cpp rename to Source/Contents/Effects/RDamageVar.cpp index 16c402fd0..e076df556 100644 --- a/Source/Contents/RDamageVar.cpp +++ b/Source/Contents/Effects/RDamageVar.cpp @@ -1,4 +1,4 @@ -#include "Contents/RDamageVar.h" +#include "Contents/Effects/RDamageVar.h" // OFFSET: 0x00743640 // FUNCTION: fn_07746 diff --git a/Source/Contents/RDamageVar.h b/Source/Contents/Effects/RDamageVar.h similarity index 54% rename from Source/Contents/RDamageVar.h rename to Source/Contents/Effects/RDamageVar.h index 80e0b32e2..07e7fc7db 100644 --- a/Source/Contents/RDamageVar.h +++ b/Source/Contents/Effects/RDamageVar.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_RDAMAGEVAR_H -#define RAGNAROK_SOURCE_CONTENTS_RDAMAGEVAR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_RDAMAGEVAR_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_RDAMAGEVAR_H class RDamageVar { public: diff --git a/Source/Contents/Effects/AMachineEffect.cpp b/Source/Contents/Effects/Skills/AMachineEffect.cpp similarity index 96% rename from Source/Contents/Effects/AMachineEffect.cpp rename to Source/Contents/Effects/Skills/AMachineEffect.cpp index 5a5398c44..e4bc994df 100644 --- a/Source/Contents/Effects/AMachineEffect.cpp +++ b/Source/Contents/Effects/Skills/AMachineEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/AMachineEffect.h" +#include "Contents/Effects/Skills/AMachineEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" // OFFSET: 0x006F6510 // FUNCTION: fn_06846 diff --git a/Source/Contents/Effects/AMachineEffect.h b/Source/Contents/Effects/Skills/AMachineEffect.h similarity index 77% rename from Source/Contents/Effects/AMachineEffect.h rename to Source/Contents/Effects/Skills/AMachineEffect.h index d38e4615a..ca93409bb 100644 --- a/Source/Contents/Effects/AMachineEffect.h +++ b/Source/Contents/Effects/Skills/AMachineEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_AMACHINEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_AMACHINEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_AMACHINEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_AMACHINEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/AcidifiedThrow.cpp b/Source/Contents/Effects/Skills/AcidifiedThrow.cpp similarity index 98% rename from Source/Contents/Effects/AcidifiedThrow.cpp rename to Source/Contents/Effects/Skills/AcidifiedThrow.cpp index 81b0697e7..7d24ca4d8 100644 --- a/Source/Contents/Effects/AcidifiedThrow.cpp +++ b/Source/Contents/Effects/Skills/AcidifiedThrow.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/AcidifiedThrow.h" +#include "Contents/Effects/Skills/AcidifiedThrow.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectEmitter.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/EffectEmitter.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/AcidifiedThrow.h b/Source/Contents/Effects/Skills/AcidifiedThrow.h similarity index 81% rename from Source/Contents/Effects/AcidifiedThrow.h rename to Source/Contents/Effects/Skills/AcidifiedThrow.h index b967b6e7b..dec86530e 100644 --- a/Source/Contents/Effects/AcidifiedThrow.h +++ b/Source/Contents/Effects/Skills/AcidifiedThrow.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ACIDIFIEDTHROW_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ACIDIFIEDTHROW_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ACIDIFIEDTHROW_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ACIDIFIEDTHROW_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/ArrowEffect.cpp b/Source/Contents/Effects/Skills/ArrowEffect.cpp similarity index 99% rename from Source/Contents/Effects/ArrowEffect.cpp rename to Source/Contents/Effects/Skills/ArrowEffect.cpp index b2fb57a2e..27539b9d5 100644 --- a/Source/Contents/Effects/ArrowEffect.cpp +++ b/Source/Contents/Effects/Skills/ArrowEffect.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/ArrowEffect.h" +#include "Contents/Effects/Skills/ArrowEffect.h" #include "Contents/Jobs/JobId.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/Contents/Effects/ArrowEffect.h b/Source/Contents/Effects/Skills/ArrowEffect.h similarity index 88% rename from Source/Contents/Effects/ArrowEffect.h rename to Source/Contents/Effects/Skills/ArrowEffect.h index 3f8c2ff8c..ad4b75a4d 100644 --- a/Source/Contents/Effects/ArrowEffect.h +++ b/Source/Contents/Effects/Skills/ArrowEffect.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ARROWEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ARROWEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ARROWEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ARROWEFFECT_H #include "Contents/Actors/RenderObject.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/AstralStrikeEffect.cpp b/Source/Contents/Effects/Skills/AstralStrikeEffect.cpp similarity index 97% rename from Source/Contents/Effects/AstralStrikeEffect.cpp rename to Source/Contents/Effects/Skills/AstralStrikeEffect.cpp index 11a97ef0b..a3e8b127c 100644 --- a/Source/Contents/Effects/AstralStrikeEffect.cpp +++ b/Source/Contents/Effects/Skills/AstralStrikeEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/AstralStrikeEffect.h" +#include "Contents/Effects/Skills/AstralStrikeEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include #include diff --git a/Source/Contents/Effects/AstralStrikeEffect.h b/Source/Contents/Effects/Skills/AstralStrikeEffect.h similarity index 76% rename from Source/Contents/Effects/AstralStrikeEffect.h rename to Source/Contents/Effects/Skills/AstralStrikeEffect.h index fca1d426d..e8376bb99 100644 --- a/Source/Contents/Effects/AstralStrikeEffect.h +++ b/Source/Contents/Effects/Skills/AstralStrikeEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ASTRALSTRIKEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ASTRALSTRIKEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ASTRALSTRIKEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ASTRALSTRIKEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/AxeBoomerang.cpp b/Source/Contents/Effects/Skills/AxeBoomerang.cpp similarity index 95% rename from Source/Contents/Effects/AxeBoomerang.cpp rename to Source/Contents/Effects/Skills/AxeBoomerang.cpp index 2f0252264..5148f07fb 100644 --- a/Source/Contents/Effects/AxeBoomerang.cpp +++ b/Source/Contents/Effects/Skills/AxeBoomerang.cpp @@ -1,13 +1,13 @@ -#include "Contents/Effects/AxeBoomerang.h" +#include "Contents/Effects/Skills/AxeBoomerang.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectEmitter.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/EffectEmitter.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/AxeBoomerang.h b/Source/Contents/Effects/Skills/AxeBoomerang.h similarity index 82% rename from Source/Contents/Effects/AxeBoomerang.h rename to Source/Contents/Effects/Skills/AxeBoomerang.h index 29f29c36c..f0b558be5 100644 --- a/Source/Contents/Effects/AxeBoomerang.h +++ b/Source/Contents/Effects/Skills/AxeBoomerang.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_AXEBOOMERANG_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_AXEBOOMERANG_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_AXEBOOMERANG_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_AXEBOOMERANG_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/Bash.cpp b/Source/Contents/Effects/Skills/Bash.cpp similarity index 98% rename from Source/Contents/Effects/Bash.cpp rename to Source/Contents/Effects/Skills/Bash.cpp index 6469bdb94..9d233910e 100644 --- a/Source/Contents/Effects/Bash.cpp +++ b/Source/Contents/Effects/Skills/Bash.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/Bash.h" +#include "Contents/Effects/Skills/Bash.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Render/Primitives/RenderPrimitive.h" #include "Render/Renderer.h" #include "Render/TextureQuad.h" diff --git a/Source/Contents/Effects/Bash.h b/Source/Contents/Effects/Skills/Bash.h similarity index 80% rename from Source/Contents/Effects/Bash.h rename to Source/Contents/Effects/Skills/Bash.h index fccfa80bc..5169934b8 100644 --- a/Source/Contents/Effects/Bash.h +++ b/Source/Contents/Effects/Skills/Bash.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_BASH_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_BASH_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BASH_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BASH_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/BezierArcThrowEffect.cpp b/Source/Contents/Effects/Skills/BezierArcThrowEffect.cpp similarity index 97% rename from Source/Contents/Effects/BezierArcThrowEffect.cpp rename to Source/Contents/Effects/Skills/BezierArcThrowEffect.cpp index aa11a3667..5065a4d70 100644 --- a/Source/Contents/Effects/BezierArcThrowEffect.cpp +++ b/Source/Contents/Effects/Skills/BezierArcThrowEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/BezierArcThrowEffect.h" +#include "Contents/Effects/Skills/BezierArcThrowEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/BezierArcThrowEffect.h b/Source/Contents/Effects/Skills/BezierArcThrowEffect.h similarity index 84% rename from Source/Contents/Effects/BezierArcThrowEffect.h rename to Source/Contents/Effects/Skills/BezierArcThrowEffect.h index f09438f1e..41d0f29c5 100644 --- a/Source/Contents/Effects/BezierArcThrowEffect.h +++ b/Source/Contents/Effects/Skills/BezierArcThrowEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_BEZIERARCTHROWEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_BEZIERARCTHROWEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BEZIERARCTHROWEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BEZIERARCTHROWEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/BindTrapEffect.cpp b/Source/Contents/Effects/Skills/BindTrapEffect.cpp similarity index 93% rename from Source/Contents/Effects/BindTrapEffect.cpp rename to Source/Contents/Effects/Skills/BindTrapEffect.cpp index 66e03b2ac..04e8a2e7a 100644 --- a/Source/Contents/Effects/BindTrapEffect.cpp +++ b/Source/Contents/Effects/Skills/BindTrapEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/BindTrapEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/BindTrapEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/BindTrapEffect.h b/Source/Contents/Effects/Skills/BindTrapEffect.h similarity index 72% rename from Source/Contents/Effects/BindTrapEffect.h rename to Source/Contents/Effects/Skills/BindTrapEffect.h index 88db840b9..3091fc814 100644 --- a/Source/Contents/Effects/BindTrapEffect.h +++ b/Source/Contents/Effects/Skills/BindTrapEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_BINDTRAPEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_BINDTRAPEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BINDTRAPEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BINDTRAPEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/BlastForge.cpp b/Source/Contents/Effects/Skills/BlastForge.cpp similarity index 98% rename from Source/Contents/Effects/BlastForge.cpp rename to Source/Contents/Effects/Skills/BlastForge.cpp index 78de4e3c8..44988ec5d 100644 --- a/Source/Contents/Effects/BlastForge.cpp +++ b/Source/Contents/Effects/Skills/BlastForge.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/BlastForge.h" +#include "Contents/Effects/Skills/BlastForge.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/BlastForge.h b/Source/Contents/Effects/Skills/BlastForge.h similarity index 79% rename from Source/Contents/Effects/BlastForge.h rename to Source/Contents/Effects/Skills/BlastForge.h index 345e5e26c..fb32bc5ae 100644 --- a/Source/Contents/Effects/BlastForge.h +++ b/Source/Contents/Effects/Skills/BlastForge.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_BLASTFORGE_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_BLASTFORGE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BLASTFORGE_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_BLASTFORGE_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/Particle.h" #include #include diff --git a/Source/Contents/Effects/CaneOfEvilEyeEffect.cpp b/Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.cpp similarity index 98% rename from Source/Contents/Effects/CaneOfEvilEyeEffect.cpp rename to Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.cpp index ecbde0c69..2d0b0f520 100644 --- a/Source/Contents/Effects/CaneOfEvilEyeEffect.cpp +++ b/Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/CaneOfEvilEyeEffect.h" +#include "Contents/Effects/Skills/CaneOfEvilEyeEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Render/Renderer.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/CaneOfEvilEyeEffect.h b/Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.h similarity index 79% rename from Source/Contents/Effects/CaneOfEvilEyeEffect.h rename to Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.h index 12e51a94c..b1dadbf3d 100644 --- a/Source/Contents/Effects/CaneOfEvilEyeEffect.h +++ b/Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CANEOFEVILEYEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CANEOFEVILEYEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CANEOFEVILEYEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CANEOFEVILEYEEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/Particle.h" #include #include diff --git a/Source/Contents/Effects/CartCannon.cpp b/Source/Contents/Effects/Skills/CartCannon.cpp similarity index 97% rename from Source/Contents/Effects/CartCannon.cpp rename to Source/Contents/Effects/Skills/CartCannon.cpp index ecd8b7fd2..0241666c8 100644 --- a/Source/Contents/Effects/CartCannon.cpp +++ b/Source/Contents/Effects/Skills/CartCannon.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/CartCannon.h" +#include "Contents/Effects/Skills/CartCannon.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/CartCannon.h b/Source/Contents/Effects/Skills/CartCannon.h similarity index 82% rename from Source/Contents/Effects/CartCannon.h rename to Source/Contents/Effects/Skills/CartCannon.h index 34139662d..29dcc6801 100644 --- a/Source/Contents/Effects/CartCannon.h +++ b/Source/Contents/Effects/Skills/CartCannon.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CARTCANNON_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CARTCANNON_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CARTCANNON_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CARTCANNON_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/ChargingPierceEffect.cpp b/Source/Contents/Effects/Skills/ChargingPierceEffect.cpp similarity index 98% rename from Source/Contents/Effects/ChargingPierceEffect.cpp rename to Source/Contents/Effects/Skills/ChargingPierceEffect.cpp index 4b8c7df64..73a05245f 100644 --- a/Source/Contents/Effects/ChargingPierceEffect.cpp +++ b/Source/Contents/Effects/Skills/ChargingPierceEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/ChargingPierceEffect.h" +#include "Contents/Effects/Skills/ChargingPierceEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Render/Textures/Texture.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/ChargingPierceEffect.h b/Source/Contents/Effects/Skills/ChargingPierceEffect.h similarity index 85% rename from Source/Contents/Effects/ChargingPierceEffect.h rename to Source/Contents/Effects/Skills/ChargingPierceEffect.h index 22d2d9bc7..4fc56094a 100644 --- a/Source/Contents/Effects/ChargingPierceEffect.h +++ b/Source/Contents/Effects/Skills/ChargingPierceEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHARGINGPIERCEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHARGINGPIERCEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CHARGINGPIERCEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CHARGINGPIERCEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/CherryBlossomEffect.cpp b/Source/Contents/Effects/Skills/CherryBlossomEffect.cpp similarity index 96% rename from Source/Contents/Effects/CherryBlossomEffect.cpp rename to Source/Contents/Effects/Skills/CherryBlossomEffect.cpp index 2f1f6e80e..149e7a45c 100644 --- a/Source/Contents/Effects/CherryBlossomEffect.cpp +++ b/Source/Contents/Effects/Skills/CherryBlossomEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/CherryBlossomEffect.h" +#include "Contents/Effects/Skills/CherryBlossomEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/CherryBlossomEffect.h b/Source/Contents/Effects/Skills/CherryBlossomEffect.h similarity index 71% rename from Source/Contents/Effects/CherryBlossomEffect.h rename to Source/Contents/Effects/Skills/CherryBlossomEffect.h index 18dd77b78..0decce1de 100644 --- a/Source/Contents/Effects/CherryBlossomEffect.h +++ b/Source/Contents/Effects/Skills/CherryBlossomEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHERRYBLOSSOMEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CHERRYBLOSSOMEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CHERRYBLOSSOMEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CHERRYBLOSSOMEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/ClimaxEffect.cpp b/Source/Contents/Effects/Skills/ClimaxEffect.cpp similarity index 96% rename from Source/Contents/Effects/ClimaxEffect.cpp rename to Source/Contents/Effects/Skills/ClimaxEffect.cpp index b53958db5..9c9548687 100644 --- a/Source/Contents/Effects/ClimaxEffect.cpp +++ b/Source/Contents/Effects/Skills/ClimaxEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/ClimaxEffect.h" +#include "Contents/Effects/Skills/ClimaxEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" // OFFSET: 0x00706840 diff --git a/Source/Contents/Effects/ClimaxEffect.h b/Source/Contents/Effects/Skills/ClimaxEffect.h similarity index 72% rename from Source/Contents/Effects/ClimaxEffect.h rename to Source/Contents/Effects/Skills/ClimaxEffect.h index 908c3ac95..16b27d6b0 100644 --- a/Source/Contents/Effects/ClimaxEffect.h +++ b/Source/Contents/Effects/Skills/ClimaxEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CLIMAXEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CLIMAXEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CLIMAXEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CLIMAXEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/CloudEffect.cpp b/Source/Contents/Effects/Skills/CloudEffect.cpp similarity index 97% rename from Source/Contents/Effects/CloudEffect.cpp rename to Source/Contents/Effects/Skills/CloudEffect.cpp index 598d59e35..3943538db 100644 --- a/Source/Contents/Effects/CloudEffect.cpp +++ b/Source/Contents/Effects/Skills/CloudEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/CloudEffect.h" +#include "Contents/Effects/Skills/CloudEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Effects/CloudEffect.h b/Source/Contents/Effects/Skills/CloudEffect.h similarity index 88% rename from Source/Contents/Effects/CloudEffect.h rename to Source/Contents/Effects/Skills/CloudEffect.h index 40f2c0627..927603709 100644 --- a/Source/Contents/Effects/CloudEffect.h +++ b/Source/Contents/Effects/Skills/CloudEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CLOUDEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CLOUDEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CLOUDEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CLOUDEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/CloudKillEffect.cpp b/Source/Contents/Effects/Skills/CloudKillEffect.cpp similarity index 97% rename from Source/Contents/Effects/CloudKillEffect.cpp rename to Source/Contents/Effects/Skills/CloudKillEffect.cpp index 4672513ee..b50f9bd9e 100644 --- a/Source/Contents/Effects/CloudKillEffect.cpp +++ b/Source/Contents/Effects/Skills/CloudKillEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/CloudKillEffect.h" +#include "Contents/Effects/Skills/CloudKillEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/SpriteParticle.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Particles/SpriteParticle.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/CloudKillEffect.h b/Source/Contents/Effects/Skills/CloudKillEffect.h similarity index 80% rename from Source/Contents/Effects/CloudKillEffect.h rename to Source/Contents/Effects/Skills/CloudKillEffect.h index f016e4f13..76d68630c 100644 --- a/Source/Contents/Effects/CloudKillEffect.h +++ b/Source/Contents/Effects/Skills/CloudKillEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CLOUDKILLEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CLOUDKILLEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CLOUDKILLEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CLOUDKILLEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/CommonFloorEffect.cpp b/Source/Contents/Effects/Skills/CommonFloorEffect.cpp similarity index 96% rename from Source/Contents/Effects/CommonFloorEffect.cpp rename to Source/Contents/Effects/Skills/CommonFloorEffect.cpp index 756ad1fb8..09ad53621 100644 --- a/Source/Contents/Effects/CommonFloorEffect.cpp +++ b/Source/Contents/Effects/Skills/CommonFloorEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/CommonFloorEffect.h" +#include "Contents/Effects/Skills/CommonFloorEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/CommonFloorEffect.h b/Source/Contents/Effects/Skills/CommonFloorEffect.h similarity index 78% rename from Source/Contents/Effects/CommonFloorEffect.h rename to Source/Contents/Effects/Skills/CommonFloorEffect.h index 5545cc5a7..b86ae0c1b 100644 --- a/Source/Contents/Effects/CommonFloorEffect.h +++ b/Source/Contents/Effects/Skills/CommonFloorEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_COMMONFLOOREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_COMMONFLOOREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_COMMONFLOOREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_COMMONFLOOREFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/Competentia.cpp b/Source/Contents/Effects/Skills/Competentia.cpp similarity index 94% rename from Source/Contents/Effects/Competentia.cpp rename to Source/Contents/Effects/Skills/Competentia.cpp index 6674528b8..207b914f6 100644 --- a/Source/Contents/Effects/Competentia.cpp +++ b/Source/Contents/Effects/Skills/Competentia.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/Competentia.h" +#include "Contents/Effects/Skills/Competentia.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/NyanggrassEffect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Skills/NyanggrassEffect.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Ground/TerrainHeight.h" #include "Contents/World/World.h" #include "Resource/World/TerrainResource.h" diff --git a/Source/Contents/Effects/Competentia.h b/Source/Contents/Effects/Skills/Competentia.h similarity index 75% rename from Source/Contents/Effects/Competentia.h rename to Source/Contents/Effects/Skills/Competentia.h index 52960a05f..215453d5e 100644 --- a/Source/Contents/Effects/Competentia.h +++ b/Source/Contents/Effects/Skills/Competentia.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_COMPETENTIA_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_COMPETENTIA_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_COMPETENTIA_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_COMPETENTIA_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/CresciveBolt.cpp b/Source/Contents/Effects/Skills/CresciveBolt.cpp similarity index 94% rename from Source/Contents/Effects/CresciveBolt.cpp rename to Source/Contents/Effects/Skills/CresciveBolt.cpp index cc1473af1..4e473b912 100644 --- a/Source/Contents/Effects/CresciveBolt.cpp +++ b/Source/Contents/Effects/Skills/CresciveBolt.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/CresciveBolt.h" +#include "Contents/Effects/Skills/CresciveBolt.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Render/Renderer.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/CresciveBolt.h b/Source/Contents/Effects/Skills/CresciveBolt.h similarity index 72% rename from Source/Contents/Effects/CresciveBolt.h rename to Source/Contents/Effects/Skills/CresciveBolt.h index d46c7ed21..445556f3e 100644 --- a/Source/Contents/Effects/CresciveBolt.h +++ b/Source/Contents/Effects/Skills/CresciveBolt.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_CRESCIVEBOLT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_CRESCIVEBOLT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CRESCIVEBOLT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_CRESCIVEBOLT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/ElectricEffect.cpp b/Source/Contents/Effects/Skills/ElectricEffect.cpp similarity index 97% rename from Source/Contents/Effects/ElectricEffect.cpp rename to Source/Contents/Effects/Skills/ElectricEffect.cpp index 501c16202..01b9efaed 100644 --- a/Source/Contents/Effects/ElectricEffect.cpp +++ b/Source/Contents/Effects/Skills/ElectricEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/ElectricEffect.h" +#include "Contents/Effects/Skills/ElectricEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/ElectricEffect.h b/Source/Contents/Effects/Skills/ElectricEffect.h similarity index 78% rename from Source/Contents/Effects/ElectricEffect.h rename to Source/Contents/Effects/Skills/ElectricEffect.h index 8ac61b87d..2bc83d6b9 100644 --- a/Source/Contents/Effects/ElectricEffect.h +++ b/Source/Contents/Effects/Skills/ElectricEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ELECTRICEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ELECTRICEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ELECTRICEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ELECTRICEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/EnergyOrbEffect.cpp b/Source/Contents/Effects/Skills/EnergyOrbEffect.cpp similarity index 96% rename from Source/Contents/Effects/EnergyOrbEffect.cpp rename to Source/Contents/Effects/Skills/EnergyOrbEffect.cpp index 9d53fd95b..d431ceed2 100644 --- a/Source/Contents/Effects/EnergyOrbEffect.cpp +++ b/Source/Contents/Effects/Skills/EnergyOrbEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/EnergyOrbEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/EnergyOrbEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/EnergyOrbEffect.h b/Source/Contents/Effects/Skills/EnergyOrbEffect.h similarity index 77% rename from Source/Contents/Effects/EnergyOrbEffect.h rename to Source/Contents/Effects/Skills/EnergyOrbEffect.h index 9ff09eb6c..22fe3b268 100644 --- a/Source/Contents/Effects/EnergyOrbEffect.h +++ b/Source/Contents/Effects/Skills/EnergyOrbEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ENERGYORBEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ENERGYORBEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ENERGYORBEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ENERGYORBEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/EvilLandEffect.cpp b/Source/Contents/Effects/Skills/EvilLandEffect.cpp similarity index 96% rename from Source/Contents/Effects/EvilLandEffect.cpp rename to Source/Contents/Effects/Skills/EvilLandEffect.cpp index 7d0f7b44b..05e6e7fe5 100644 --- a/Source/Contents/Effects/EvilLandEffect.cpp +++ b/Source/Contents/Effects/Skills/EvilLandEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/EvilLandEffect.h" +#include "Contents/Effects/Skills/EvilLandEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/NyanggrassEffect.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Skills/NyanggrassEffect.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" diff --git a/Source/Contents/Effects/EvilLandEffect.h b/Source/Contents/Effects/Skills/EvilLandEffect.h similarity index 71% rename from Source/Contents/Effects/EvilLandEffect.h rename to Source/Contents/Effects/Skills/EvilLandEffect.h index 15567a5a4..a951b9d5a 100644 --- a/Source/Contents/Effects/EvilLandEffect.h +++ b/Source/Contents/Effects/Skills/EvilLandEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EVILLANDEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EVILLANDEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_EVILLANDEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_EVILLANDEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/EvilsPawEffect.cpp b/Source/Contents/Effects/Skills/EvilsPawEffect.cpp similarity index 96% rename from Source/Contents/Effects/EvilsPawEffect.cpp rename to Source/Contents/Effects/Skills/EvilsPawEffect.cpp index 4069fbb3f..de7f7b77d 100644 --- a/Source/Contents/Effects/EvilsPawEffect.cpp +++ b/Source/Contents/Effects/Skills/EvilsPawEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/EvilsPawEffect.h" +#include "Contents/Effects/Skills/EvilsPawEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/EvilsPawEffect.h b/Source/Contents/Effects/Skills/EvilsPawEffect.h similarity index 84% rename from Source/Contents/Effects/EvilsPawEffect.h rename to Source/Contents/Effects/Skills/EvilsPawEffect.h index b24b88fc8..0e0fce740 100644 --- a/Source/Contents/Effects/EvilsPawEffect.h +++ b/Source/Contents/Effects/Skills/EvilsPawEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_EVILSPAWEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_EVILSPAWEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_EVILSPAWEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_EVILSPAWEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/FlowerCastingEffect.cpp b/Source/Contents/Effects/Skills/FlowerCastingEffect.cpp similarity index 97% rename from Source/Contents/Effects/FlowerCastingEffect.cpp rename to Source/Contents/Effects/Skills/FlowerCastingEffect.cpp index 7d30e8721..7bc39a0e1 100644 --- a/Source/Contents/Effects/FlowerCastingEffect.cpp +++ b/Source/Contents/Effects/Skills/FlowerCastingEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/FlowerCastingEffect.h" +#include "Contents/Effects/Skills/FlowerCastingEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/FlowerCastingEffect.h b/Source/Contents/Effects/Skills/FlowerCastingEffect.h similarity index 80% rename from Source/Contents/Effects/FlowerCastingEffect.h rename to Source/Contents/Effects/Skills/FlowerCastingEffect.h index b749c9fc3..ec27e0144 100644 --- a/Source/Contents/Effects/FlowerCastingEffect.h +++ b/Source/Contents/Effects/Skills/FlowerCastingEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_FLOWERCASTINGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_FLOWERCASTINGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FLOWERCASTINGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FLOWERCASTINGEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/FortuneKissEffect.cpp b/Source/Contents/Effects/Skills/FortuneKissEffect.cpp similarity index 94% rename from Source/Contents/Effects/FortuneKissEffect.cpp rename to Source/Contents/Effects/Skills/FortuneKissEffect.cpp index 08b7e9529..3a5a9ba85 100644 --- a/Source/Contents/Effects/FortuneKissEffect.cpp +++ b/Source/Contents/Effects/Skills/FortuneKissEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/FortuneKissEffect.h" +#include "Contents/Effects/Skills/FortuneKissEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/FortuneKissEffect.h b/Source/Contents/Effects/Skills/FortuneKissEffect.h similarity index 74% rename from Source/Contents/Effects/FortuneKissEffect.h rename to Source/Contents/Effects/Skills/FortuneKissEffect.h index e022f6bb4..b880cf333 100644 --- a/Source/Contents/Effects/FortuneKissEffect.h +++ b/Source/Contents/Effects/Skills/FortuneKissEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_FORTUNEKISSEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_FORTUNEKISSEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FORTUNEKISSEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FORTUNEKISSEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/FriggSongEffect.cpp b/Source/Contents/Effects/Skills/FriggSongEffect.cpp similarity index 96% rename from Source/Contents/Effects/FriggSongEffect.cpp rename to Source/Contents/Effects/Skills/FriggSongEffect.cpp index f48d2b600..3826e3ec5 100644 --- a/Source/Contents/Effects/FriggSongEffect.cpp +++ b/Source/Contents/Effects/Skills/FriggSongEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/FriggSongEffect.h" +#include "Contents/Effects/Skills/FriggSongEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/FriggSongEffect.h b/Source/Contents/Effects/Skills/FriggSongEffect.h similarity index 72% rename from Source/Contents/Effects/FriggSongEffect.h rename to Source/Contents/Effects/Skills/FriggSongEffect.h index 1f2e9bcea..d74b3dbf2 100644 --- a/Source/Contents/Effects/FriggSongEffect.h +++ b/Source/Contents/Effects/Skills/FriggSongEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_FRIGGSONGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_FRIGGSONGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FRIGGSONGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FRIGGSONGEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/FuumaShouakuEffect.cpp b/Source/Contents/Effects/Skills/FuumaShouakuEffect.cpp similarity index 93% rename from Source/Contents/Effects/FuumaShouakuEffect.cpp rename to Source/Contents/Effects/Skills/FuumaShouakuEffect.cpp index 7cacbe98b..117341c71 100644 --- a/Source/Contents/Effects/FuumaShouakuEffect.cpp +++ b/Source/Contents/Effects/Skills/FuumaShouakuEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/FuumaShouakuEffect.h" +#include "Contents/Effects/Skills/FuumaShouakuEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/FuumaShouakuEffect.h b/Source/Contents/Effects/Skills/FuumaShouakuEffect.h similarity index 77% rename from Source/Contents/Effects/FuumaShouakuEffect.h rename to Source/Contents/Effects/Skills/FuumaShouakuEffect.h index cc0d8c42d..6754bdb70 100644 --- a/Source/Contents/Effects/FuumaShouakuEffect.h +++ b/Source/Contents/Effects/Skills/FuumaShouakuEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_FUUMASHOUAKUEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_FUUMASHOUAKUEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FUUMASHOUAKUEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_FUUMASHOUAKUEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/GlassWallEffect.cpp b/Source/Contents/Effects/Skills/GlassWallEffect.cpp similarity index 95% rename from Source/Contents/Effects/GlassWallEffect.cpp rename to Source/Contents/Effects/Skills/GlassWallEffect.cpp index 998a1dae9..d790f1bbe 100644 --- a/Source/Contents/Effects/GlassWallEffect.cpp +++ b/Source/Contents/Effects/Skills/GlassWallEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/GlassWallEffect.h" +#include "Contents/Effects/Skills/GlassWallEffect.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/Effects/EZ2STREffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/EZ2STREffect.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/GlassWallEffect.h b/Source/Contents/Effects/Skills/GlassWallEffect.h similarity index 77% rename from Source/Contents/Effects/GlassWallEffect.h rename to Source/Contents/Effects/Skills/GlassWallEffect.h index 570e11647..b0ba62e71 100644 --- a/Source/Contents/Effects/GlassWallEffect.h +++ b/Source/Contents/Effects/Skills/GlassWallEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_GLASSWALLEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_GLASSWALLEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_GLASSWALLEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_GLASSWALLEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/GravityControlEffect.h b/Source/Contents/Effects/Skills/GravityControlEffect.h similarity index 77% rename from Source/Contents/Effects/GravityControlEffect.h rename to Source/Contents/Effects/Skills/GravityControlEffect.h index 6d4a12d56..c28f9d6ff 100644 --- a/Source/Contents/Effects/GravityControlEffect.h +++ b/Source/Contents/Effects/Skills/GravityControlEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_GRAVITYCONTROLEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_GRAVITYCONTROLEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_GRAVITYCONTROLEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_GRAVITYCONTROLEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/HealEffect.cpp b/Source/Contents/Effects/Skills/HealEffect.cpp similarity index 99% rename from Source/Contents/Effects/HealEffect.cpp rename to Source/Contents/Effects/Skills/HealEffect.cpp index e11be9973..967382244 100644 --- a/Source/Contents/Effects/HealEffect.cpp +++ b/Source/Contents/Effects/Skills/HealEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/HealEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/HealEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/HealEffect.h b/Source/Contents/Effects/Skills/HealEffect.h similarity index 86% rename from Source/Contents/Effects/HealEffect.h rename to Source/Contents/Effects/Skills/HealEffect.h index b79e4afde..60ec28aaa 100644 --- a/Source/Contents/Effects/HealEffect.h +++ b/Source/Contents/Effects/Skills/HealEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_HEALEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_HEALEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_HEALEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_HEALEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/HealSpEffect.cpp b/Source/Contents/Effects/Skills/HealSpEffect.cpp similarity index 97% rename from Source/Contents/Effects/HealSpEffect.cpp rename to Source/Contents/Effects/Skills/HealSpEffect.cpp index 0d56c355e..9a2a935b8 100644 --- a/Source/Contents/Effects/HealSpEffect.cpp +++ b/Source/Contents/Effects/Skills/HealSpEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/HealSpEffect.h" +#include "Contents/Effects/Skills/HealSpEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/HealSpEffect.h b/Source/Contents/Effects/Skills/HealSpEffect.h similarity index 81% rename from Source/Contents/Effects/HealSpEffect.h rename to Source/Contents/Effects/Skills/HealSpEffect.h index 0d37aa953..7de40a098 100644 --- a/Source/Contents/Effects/HealSpEffect.h +++ b/Source/Contents/Effects/Skills/HealSpEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_HEALSPEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_HEALSPEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_HEALSPEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_HEALSPEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/HitLineEffect.cpp b/Source/Contents/Effects/Skills/HitLineEffect.cpp similarity index 97% rename from Source/Contents/Effects/HitLineEffect.cpp rename to Source/Contents/Effects/Skills/HitLineEffect.cpp index 48933e011..2c95d0e1c 100644 --- a/Source/Contents/Effects/HitLineEffect.cpp +++ b/Source/Contents/Effects/Skills/HitLineEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/HitLineEffect.h" +#include "Contents/Effects/Skills/HitLineEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/HitLineEffect.h b/Source/Contents/Effects/Skills/HitLineEffect.h similarity index 77% rename from Source/Contents/Effects/HitLineEffect.h rename to Source/Contents/Effects/Skills/HitLineEffect.h index 79d2097cf..e2951172b 100644 --- a/Source/Contents/Effects/HitLineEffect.h +++ b/Source/Contents/Effects/Skills/HitLineEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_HITLINEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_HITLINEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_HITLINEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_HITLINEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/JupitelThunderStormEffect.cpp b/Source/Contents/Effects/Skills/JupitelThunderStormEffect.cpp similarity index 95% rename from Source/Contents/Effects/JupitelThunderStormEffect.cpp rename to Source/Contents/Effects/Skills/JupitelThunderStormEffect.cpp index bb6fe5361..bfd82bbe8 100644 --- a/Source/Contents/Effects/JupitelThunderStormEffect.cpp +++ b/Source/Contents/Effects/Skills/JupitelThunderStormEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/JupitelThunderStormEffect.h" +#include "Contents/Effects/Skills/JupitelThunderStormEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Effects/JupitelThunderStormEffect.h b/Source/Contents/Effects/Skills/JupitelThunderStormEffect.h similarity index 78% rename from Source/Contents/Effects/JupitelThunderStormEffect.h rename to Source/Contents/Effects/Skills/JupitelThunderStormEffect.h index dc1ba2482..63a38fd34 100644 --- a/Source/Contents/Effects/JupitelThunderStormEffect.h +++ b/Source/Contents/Effects/Skills/JupitelThunderStormEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_JUPITELTHUNDERSTORMEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_JUPITELTHUNDERSTORMEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_JUPITELTHUNDERSTORMEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_JUPITELTHUNDERSTORMEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/Level150Effect.cpp b/Source/Contents/Effects/Skills/Level150Effect.cpp similarity index 98% rename from Source/Contents/Effects/Level150Effect.cpp rename to Source/Contents/Effects/Skills/Level150Effect.cpp index 724948b64..1e737bfc4 100644 --- a/Source/Contents/Effects/Level150Effect.cpp +++ b/Source/Contents/Effects/Skills/Level150Effect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/Level150Effect.h" +#include "Contents/Effects/Skills/Level150Effect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Effects/Level150Effect.h b/Source/Contents/Effects/Skills/Level150Effect.h similarity index 85% rename from Source/Contents/Effects/Level150Effect.h rename to Source/Contents/Effects/Skills/Level150Effect.h index c6838dd18..9d274ab3d 100644 --- a/Source/Contents/Effects/Level150Effect.h +++ b/Source/Contents/Effects/Skills/Level150Effect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL150EFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL150EFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL150EFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL150EFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/Level99Effect.cpp b/Source/Contents/Effects/Skills/Level99Effect.cpp similarity index 98% rename from Source/Contents/Effects/Level99Effect.cpp rename to Source/Contents/Effects/Skills/Level99Effect.cpp index ba7c87b22..37da9ff2b 100644 --- a/Source/Contents/Effects/Level99Effect.cpp +++ b/Source/Contents/Effects/Skills/Level99Effect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/Level99Effect.h" +#include "Contents/Effects/Skills/Level99Effect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/Level99Effect.h b/Source/Contents/Effects/Skills/Level99Effect.h similarity index 78% rename from Source/Contents/Effects/Level99Effect.h rename to Source/Contents/Effects/Skills/Level99Effect.h index 6b9f4ddf0..344ca4cf2 100644 --- a/Source/Contents/Effects/Level99Effect.h +++ b/Source/Contents/Effects/Skills/Level99Effect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL99EFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL99EFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL99EFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL99EFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/Level99Orb1Effect.cpp b/Source/Contents/Effects/Skills/Level99Orb1Effect.cpp similarity index 96% rename from Source/Contents/Effects/Level99Orb1Effect.cpp rename to Source/Contents/Effects/Skills/Level99Orb1Effect.cpp index 1fccd5af9..310434193 100644 --- a/Source/Contents/Effects/Level99Orb1Effect.cpp +++ b/Source/Contents/Effects/Skills/Level99Orb1Effect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/Level99Orb1Effect.h" +#include "Contents/Effects/Skills/Level99Orb1Effect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/Level99Orb1Effect.h b/Source/Contents/Effects/Skills/Level99Orb1Effect.h similarity index 72% rename from Source/Contents/Effects/Level99Orb1Effect.h rename to Source/Contents/Effects/Skills/Level99Orb1Effect.h index 2b16095bc..d07805066 100644 --- a/Source/Contents/Effects/Level99Orb1Effect.h +++ b/Source/Contents/Effects/Skills/Level99Orb1Effect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL99ORB1EFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL99ORB1EFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL99ORB1EFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL99ORB1EFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/Level99Orb2Effect.cpp b/Source/Contents/Effects/Skills/Level99Orb2Effect.cpp similarity index 97% rename from Source/Contents/Effects/Level99Orb2Effect.cpp rename to Source/Contents/Effects/Skills/Level99Orb2Effect.cpp index bd84be87c..7f79dd841 100644 --- a/Source/Contents/Effects/Level99Orb2Effect.cpp +++ b/Source/Contents/Effects/Skills/Level99Orb2Effect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/Level99Orb2Effect.h" +#include "Contents/Effects/Skills/Level99Orb2Effect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/Level99Orb2Effect.h b/Source/Contents/Effects/Skills/Level99Orb2Effect.h similarity index 73% rename from Source/Contents/Effects/Level99Orb2Effect.h rename to Source/Contents/Effects/Skills/Level99Orb2Effect.h index 40637c872..f076f6546 100644 --- a/Source/Contents/Effects/Level99Orb2Effect.h +++ b/Source/Contents/Effects/Skills/Level99Orb2Effect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL99ORB2EFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_LEVEL99ORB2EFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL99ORB2EFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LEVEL99ORB2EFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/LightSphereEffect.cpp b/Source/Contents/Effects/Skills/LightSphereEffect.cpp similarity index 97% rename from Source/Contents/Effects/LightSphereEffect.cpp rename to Source/Contents/Effects/Skills/LightSphereEffect.cpp index 936c75cbb..3fa5a61f0 100644 --- a/Source/Contents/Effects/LightSphereEffect.cpp +++ b/Source/Contents/Effects/Skills/LightSphereEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/LightSphereEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/LightSphereEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/LightSphereEffect.h b/Source/Contents/Effects/Skills/LightSphereEffect.h similarity index 77% rename from Source/Contents/Effects/LightSphereEffect.h rename to Source/Contents/Effects/Skills/LightSphereEffect.h index 276c90fc2..3bf2a8c6a 100644 --- a/Source/Contents/Effects/LightSphereEffect.h +++ b/Source/Contents/Effects/Skills/LightSphereEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_LIGHTSPHEREEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_LIGHTSPHEREEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LIGHTSPHEREEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_LIGHTSPHEREEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/MagicFloorEffect.cpp b/Source/Contents/Effects/Skills/MagicFloorEffect.cpp similarity index 98% rename from Source/Contents/Effects/MagicFloorEffect.cpp rename to Source/Contents/Effects/Skills/MagicFloorEffect.cpp index b806fe26d..75fa654a9 100644 --- a/Source/Contents/Effects/MagicFloorEffect.cpp +++ b/Source/Contents/Effects/Skills/MagicFloorEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/MagicFloorEffect.h" +#include "Contents/Effects/Skills/MagicFloorEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/MagicFloorEffect.h b/Source/Contents/Effects/Skills/MagicFloorEffect.h similarity index 79% rename from Source/Contents/Effects/MagicFloorEffect.h rename to Source/Contents/Effects/Skills/MagicFloorEffect.h index 222721d52..deb9307a1 100644 --- a/Source/Contents/Effects/MagicFloorEffect.h +++ b/Source/Contents/Effects/Skills/MagicFloorEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAGICFLOOREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAGICFLOOREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAGICFLOOREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAGICFLOOREFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/MagnumBreak.cpp b/Source/Contents/Effects/Skills/MagnumBreak.cpp similarity index 98% rename from Source/Contents/Effects/MagnumBreak.cpp rename to Source/Contents/Effects/Skills/MagnumBreak.cpp index b7d34510a..bd7d9a47b 100644 --- a/Source/Contents/Effects/MagnumBreak.cpp +++ b/Source/Contents/Effects/Skills/MagnumBreak.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/MagnumBreak.h" +#include "Contents/Effects/Skills/MagnumBreak.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" // OFFSET: 0x00B49AD0 diff --git a/Source/Contents/Effects/MagnumBreak.h b/Source/Contents/Effects/Skills/MagnumBreak.h similarity index 80% rename from Source/Contents/Effects/MagnumBreak.h rename to Source/Contents/Effects/Skills/MagnumBreak.h index 1230aec07..eba5633f4 100644 --- a/Source/Contents/Effects/MagnumBreak.h +++ b/Source/Contents/Effects/Skills/MagnumBreak.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAGNUMBREAK_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAGNUMBREAK_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAGNUMBREAK_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAGNUMBREAK_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/MandraAttackEffect.cpp b/Source/Contents/Effects/Skills/MandraAttackEffect.cpp similarity index 98% rename from Source/Contents/Effects/MandraAttackEffect.cpp rename to Source/Contents/Effects/Skills/MandraAttackEffect.cpp index 1c291c290..17ecd6092 100644 --- a/Source/Contents/Effects/MandraAttackEffect.cpp +++ b/Source/Contents/Effects/Skills/MandraAttackEffect.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/MandraAttackEffect.h" +#include "Contents/Effects/Skills/MandraAttackEffect.h" #include "Contents/Jobs/JobId.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/Effects/MandraAttackEffect.h b/Source/Contents/Effects/Skills/MandraAttackEffect.h similarity index 80% rename from Source/Contents/Effects/MandraAttackEffect.h rename to Source/Contents/Effects/Skills/MandraAttackEffect.h index 0820c6f6b..b3f9c302e 100644 --- a/Source/Contents/Effects/MandraAttackEffect.h +++ b/Source/Contents/Effects/Skills/MandraAttackEffect.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MANDRAATTACKEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MANDRAATTACKEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MANDRAATTACKEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MANDRAATTACKEFFECT_H #include "Contents/Actors/RenderObject.h" diff --git a/Source/Contents/Effects/MapChainEffect.cpp b/Source/Contents/Effects/Skills/MapChainEffect.cpp similarity index 98% rename from Source/Contents/Effects/MapChainEffect.cpp rename to Source/Contents/Effects/Skills/MapChainEffect.cpp index 8238f2889..58c69e2ea 100644 --- a/Source/Contents/Effects/MapChainEffect.cpp +++ b/Source/Contents/Effects/Skills/MapChainEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/MapChainEffect.h" +#include "Contents/Effects/Skills/MapChainEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/MapChainEffect.h b/Source/Contents/Effects/Skills/MapChainEffect.h similarity index 83% rename from Source/Contents/Effects/MapChainEffect.h rename to Source/Contents/Effects/Skills/MapChainEffect.h index 389af805f..a5323cdc9 100644 --- a/Source/Contents/Effects/MapChainEffect.h +++ b/Source/Contents/Effects/Skills/MapChainEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAPCHAINEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAPCHAINEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAPCHAINEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAPCHAINEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/MapMagicZoneEffect.cpp b/Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp similarity index 98% rename from Source/Contents/Effects/MapMagicZoneEffect.cpp rename to Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp index ba36dcccf..3b7f79d08 100644 --- a/Source/Contents/Effects/MapMagicZoneEffect.cpp +++ b/Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/MapMagicZoneEffect.h" +#include "Contents/Effects/Skills/MapMagicZoneEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/MapMagicZoneEffect.h b/Source/Contents/Effects/Skills/MapMagicZoneEffect.h similarity index 85% rename from Source/Contents/Effects/MapMagicZoneEffect.h rename to Source/Contents/Effects/Skills/MapMagicZoneEffect.h index abaa3613b..9f49a04b9 100644 --- a/Source/Contents/Effects/MapMagicZoneEffect.h +++ b/Source/Contents/Effects/Skills/MapMagicZoneEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAPMAGICZONEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAPMAGICZONEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAPMAGICZONEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAPMAGICZONEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/MappillarEffect.cpp b/Source/Contents/Effects/Skills/MappillarEffect.cpp similarity index 96% rename from Source/Contents/Effects/MappillarEffect.cpp rename to Source/Contents/Effects/Skills/MappillarEffect.cpp index 7eecb53e4..b08b03356 100644 --- a/Source/Contents/Effects/MappillarEffect.cpp +++ b/Source/Contents/Effects/Skills/MappillarEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/MappillarEffect.h" +#include "Contents/Effects/Skills/MappillarEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/MappillarEffect.h b/Source/Contents/Effects/Skills/MappillarEffect.h similarity index 76% rename from Source/Contents/Effects/MappillarEffect.h rename to Source/Contents/Effects/Skills/MappillarEffect.h index e7287774f..4632524c0 100644 --- a/Source/Contents/Effects/MappillarEffect.h +++ b/Source/Contents/Effects/Skills/MappillarEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAPPILLAREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MAPPILLAREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAPPILLAREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MAPPILLAREFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/MeteorEffect.cpp b/Source/Contents/Effects/Skills/MeteorEffect.cpp similarity index 94% rename from Source/Contents/Effects/MeteorEffect.cpp rename to Source/Contents/Effects/Skills/MeteorEffect.cpp index 7fe7d3796..8720358b1 100644 --- a/Source/Contents/Effects/MeteorEffect.cpp +++ b/Source/Contents/Effects/Skills/MeteorEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/SkillEffects.h" +#include "Contents/Effects/Skills/SkillEffects.h" #include "Client/Mode/ModeMessage.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/SpriteParticle.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Particles/SpriteParticle.h" +#include "Contents/Map/MapSkyMgr.h" #include #include diff --git a/Source/Contents/Effects/MonsterSkillEffects.cpp b/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp similarity index 99% rename from Source/Contents/Effects/MonsterSkillEffects.cpp rename to Source/Contents/Effects/Skills/MonsterSkillEffects.cpp index 1970ec0ed..c9fd4f778 100644 --- a/Source/Contents/Effects/MonsterSkillEffects.cpp +++ b/Source/Contents/Effects/Skills/MonsterSkillEffects.cpp @@ -1,20 +1,20 @@ #include "Contents/Jobs/JobId.h" #include "Contents/Skills/SkillId.h" -#include "Contents/Effects/MonsterSkillEffects.h" +#include "Contents/Effects/Skills/MonsterSkillEffects.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/GravityControlEffect.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/SkillEffects.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Skills/GravityControlEffect.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Skills/SkillEffects.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Contents/Ground/TerrainHeight.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Render/Renderer.h" @@ -23,8 +23,8 @@ #include "Resource/Sprites/ActionResource.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/EZ2STREffectEx.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" #include "Resource/World/TerrainResource.h" #include "Script/LuaScript.h" #include "Utility/Text/StringUtil.h" diff --git a/Source/Contents/Effects/MonsterSkillEffects.h b/Source/Contents/Effects/Skills/MonsterSkillEffects.h similarity index 98% rename from Source/Contents/Effects/MonsterSkillEffects.h rename to Source/Contents/Effects/Skills/MonsterSkillEffects.h index a23162a00..4993eb4d6 100644 --- a/Source/Contents/Effects/MonsterSkillEffects.h +++ b/Source/Contents/Effects/Skills/MonsterSkillEffects.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_MONSTERSKILLEFFECTS_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_MONSTERSKILLEFFECTS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MONSTERSKILLEFFECTS_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_MONSTERSKILLEFFECTS_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectEmitter.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/EffectEmitter.h" #include #include diff --git a/Source/Contents/Effects/NyanggrassEffect.cpp b/Source/Contents/Effects/Skills/NyanggrassEffect.cpp similarity index 97% rename from Source/Contents/Effects/NyanggrassEffect.cpp rename to Source/Contents/Effects/Skills/NyanggrassEffect.cpp index 001493c9b..e729ae91b 100644 --- a/Source/Contents/Effects/NyanggrassEffect.cpp +++ b/Source/Contents/Effects/Skills/NyanggrassEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/NyanggrassEffect.h" +#include "Contents/Effects/Skills/NyanggrassEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/World/World.h" #include "Render/AuxiliarySubmission.h" diff --git a/Source/Contents/Effects/NyanggrassEffect.h b/Source/Contents/Effects/Skills/NyanggrassEffect.h similarity index 87% rename from Source/Contents/Effects/NyanggrassEffect.h rename to Source/Contents/Effects/Skills/NyanggrassEffect.h index cbcb1b32d..1b738db94 100644 --- a/Source/Contents/Effects/NyanggrassEffect.h +++ b/Source/Contents/Effects/Skills/NyanggrassEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_NYANGGRASSEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_NYANGGRASSEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_NYANGGRASSEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_NYANGGRASSEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/Particle.h" #include "Render/Primitives/LightmappedPrimitive.h" #include diff --git a/Source/Contents/Effects/PartyMemberEffects.cpp b/Source/Contents/Effects/Skills/PartyMemberEffects.cpp similarity index 97% rename from Source/Contents/Effects/PartyMemberEffects.cpp rename to Source/Contents/Effects/Skills/PartyMemberEffects.cpp index c791d151a..8ec60824e 100644 --- a/Source/Contents/Effects/PartyMemberEffects.cpp +++ b/Source/Contents/Effects/Skills/PartyMemberEffects.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/PartyMemberEffects.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Skills/PartyMemberEffects.h" #include "Client/Application/LaunchInfo.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/Contents/Effects/PartyMemberEffects.h b/Source/Contents/Effects/Skills/PartyMemberEffects.h similarity index 55% rename from Source/Contents/Effects/PartyMemberEffects.h rename to Source/Contents/Effects/Skills/PartyMemberEffects.h index b8ee19be1..0f22cebed 100644 --- a/Source/Contents/Effects/PartyMemberEffects.h +++ b/Source/Contents/Effects/Skills/PartyMemberEffects.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTYMEMBEREFFECTS_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_PARTYMEMBEREFFECTS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_PARTYMEMBEREFFECTS_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_PARTYMEMBEREFFECTS_H #include diff --git a/Source/Contents/Effects/PokJukEffect.cpp b/Source/Contents/Effects/Skills/PokJukEffect.cpp similarity index 98% rename from Source/Contents/Effects/PokJukEffect.cpp rename to Source/Contents/Effects/Skills/PokJukEffect.cpp index 2190ccc2e..8fed654e2 100644 --- a/Source/Contents/Effects/PokJukEffect.cpp +++ b/Source/Contents/Effects/Skills/PokJukEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/PokJukEffect.h" +#include "Contents/Effects/Skills/PokJukEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/PokJukEffect.h b/Source/Contents/Effects/Skills/PokJukEffect.h similarity index 84% rename from Source/Contents/Effects/PokJukEffect.h rename to Source/Contents/Effects/Skills/PokJukEffect.h index 22fe7685f..d41090482 100644 --- a/Source/Contents/Effects/PokJukEffect.h +++ b/Source/Contents/Effects/Skills/PokJukEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_POKJUKEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_POKJUKEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_POKJUKEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_POKJUKEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/PowderingEffect.cpp b/Source/Contents/Effects/Skills/PowderingEffect.cpp similarity index 97% rename from Source/Contents/Effects/PowderingEffect.cpp rename to Source/Contents/Effects/Skills/PowderingEffect.cpp index f9ccb0902..4cd1ec3c2 100644 --- a/Source/Contents/Effects/PowderingEffect.cpp +++ b/Source/Contents/Effects/Skills/PowderingEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/PowderingEffect.h" +#include "Contents/Effects/Skills/PowderingEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/SpriteParticle.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Particles/SpriteParticle.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/PowderingEffect.h b/Source/Contents/Effects/Skills/PowderingEffect.h similarity index 82% rename from Source/Contents/Effects/PowderingEffect.h rename to Source/Contents/Effects/Skills/PowderingEffect.h index cf2374e91..353d4a838 100644 --- a/Source/Contents/Effects/PowderingEffect.h +++ b/Source/Contents/Effects/Skills/PowderingEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_POWDERINGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_POWDERINGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_POWDERINGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_POWDERINGEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/RainbowEffect.cpp b/Source/Contents/Effects/Skills/RainbowEffect.cpp similarity index 96% rename from Source/Contents/Effects/RainbowEffect.cpp rename to Source/Contents/Effects/Skills/RainbowEffect.cpp index 02d330ae8..13e6905d7 100644 --- a/Source/Contents/Effects/RainbowEffect.cpp +++ b/Source/Contents/Effects/Skills/RainbowEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/RainbowEffect.h" +#include "Contents/Effects/Skills/RainbowEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/RainbowEffect.h b/Source/Contents/Effects/Skills/RainbowEffect.h similarity index 80% rename from Source/Contents/Effects/RainbowEffect.h rename to Source/Contents/Effects/Skills/RainbowEffect.h index 6c9c89dcc..8a377e490 100644 --- a/Source/Contents/Effects/RainbowEffect.h +++ b/Source/Contents/Effects/Skills/RainbowEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_RAINBOWEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_RAINBOWEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_RAINBOWEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_RAINBOWEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/RectUpEffect.cpp b/Source/Contents/Effects/Skills/RectUpEffect.cpp similarity index 97% rename from Source/Contents/Effects/RectUpEffect.cpp rename to Source/Contents/Effects/Skills/RectUpEffect.cpp index a8f6b0f70..eb5b13fe6 100644 --- a/Source/Contents/Effects/RectUpEffect.cpp +++ b/Source/Contents/Effects/Skills/RectUpEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/RectUpEffect.h" +#include "Contents/Effects/Skills/RectUpEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/Particle.h" -#include "Contents/Effects/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/RectUpEffect.h b/Source/Contents/Effects/Skills/RectUpEffect.h similarity index 78% rename from Source/Contents/Effects/RectUpEffect.h rename to Source/Contents/Effects/Skills/RectUpEffect.h index 8e0d041a0..4626874c3 100644 --- a/Source/Contents/Effects/RectUpEffect.h +++ b/Source/Contents/Effects/Skills/RectUpEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_RECTUPEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_RECTUPEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_RECTUPEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_RECTUPEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/RedLineEffect.cpp b/Source/Contents/Effects/Skills/RedLineEffect.cpp similarity index 96% rename from Source/Contents/Effects/RedLineEffect.cpp rename to Source/Contents/Effects/Skills/RedLineEffect.cpp index 551621397..7683cde81 100644 --- a/Source/Contents/Effects/RedLineEffect.cpp +++ b/Source/Contents/Effects/Skills/RedLineEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/RedLineEffect.h" +#include "Contents/Effects/Skills/RedLineEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/RedLineEffect.h b/Source/Contents/Effects/Skills/RedLineEffect.h similarity index 80% rename from Source/Contents/Effects/RedLineEffect.h rename to Source/Contents/Effects/Skills/RedLineEffect.h index c65468c50..d80a0b5c8 100644 --- a/Source/Contents/Effects/RedLineEffect.h +++ b/Source/Contents/Effects/Skills/RedLineEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_REDLINEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_REDLINEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_REDLINEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_REDLINEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/RichManKim.cpp b/Source/Contents/Effects/Skills/RichManKim.cpp similarity index 95% rename from Source/Contents/Effects/RichManKim.cpp rename to Source/Contents/Effects/Skills/RichManKim.cpp index 25f77275d..835e3e135 100644 --- a/Source/Contents/Effects/RichManKim.cpp +++ b/Source/Contents/Effects/Skills/RichManKim.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/RichManKim.h" +#include "Contents/Effects/Skills/RichManKim.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/RichManKim.h b/Source/Contents/Effects/Skills/RichManKim.h similarity index 77% rename from Source/Contents/Effects/RichManKim.h rename to Source/Contents/Effects/Skills/RichManKim.h index a2097a8af..8bd198ac9 100644 --- a/Source/Contents/Effects/RichManKim.h +++ b/Source/Contents/Effects/Skills/RichManKim.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_RICHMANKIM_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_RICHMANKIM_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_RICHMANKIM_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_RICHMANKIM_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/RotateBgEffect.cpp b/Source/Contents/Effects/Skills/RotateBgEffect.cpp similarity index 97% rename from Source/Contents/Effects/RotateBgEffect.cpp rename to Source/Contents/Effects/Skills/RotateBgEffect.cpp index 570f6a234..4b14c17de 100644 --- a/Source/Contents/Effects/RotateBgEffect.cpp +++ b/Source/Contents/Effects/Skills/RotateBgEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/RotateBgEffect.h" +#include "Contents/Effects/Skills/RotateBgEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/RotateBgEffect.h b/Source/Contents/Effects/Skills/RotateBgEffect.h similarity index 85% rename from Source/Contents/Effects/RotateBgEffect.h rename to Source/Contents/Effects/Skills/RotateBgEffect.h index aec7a787b..501b4b61a 100644 --- a/Source/Contents/Effects/RotateBgEffect.h +++ b/Source/Contents/Effects/Skills/RotateBgEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ROTATEBGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ROTATEBGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ROTATEBGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ROTATEBGEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/RotateItemEffect.cpp b/Source/Contents/Effects/Skills/RotateItemEffect.cpp similarity index 96% rename from Source/Contents/Effects/RotateItemEffect.cpp rename to Source/Contents/Effects/Skills/RotateItemEffect.cpp index e5f6a692c..f8bca9579 100644 --- a/Source/Contents/Effects/RotateItemEffect.cpp +++ b/Source/Contents/Effects/Skills/RotateItemEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/RotateItemEffect.h" +#include "Contents/Effects/Skills/RotateItemEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/RotateItemEffect.h b/Source/Contents/Effects/Skills/RotateItemEffect.h similarity index 77% rename from Source/Contents/Effects/RotateItemEffect.h rename to Source/Contents/Effects/Skills/RotateItemEffect.h index bcde10dfb..82c4d10f5 100644 --- a/Source/Contents/Effects/RotateItemEffect.h +++ b/Source/Contents/Effects/Skills/RotateItemEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ROTATEITEMEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ROTATEITEMEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ROTATEITEMEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ROTATEITEMEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/RotateLineEffect.cpp b/Source/Contents/Effects/Skills/RotateLineEffect.cpp similarity index 96% rename from Source/Contents/Effects/RotateLineEffect.cpp rename to Source/Contents/Effects/Skills/RotateLineEffect.cpp index a9649ba37..04b1a71e6 100644 --- a/Source/Contents/Effects/RotateLineEffect.cpp +++ b/Source/Contents/Effects/Skills/RotateLineEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/RotateLineEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/RotateLineEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/RotateLineEffect.h b/Source/Contents/Effects/Skills/RotateLineEffect.h similarity index 77% rename from Source/Contents/Effects/RotateLineEffect.h rename to Source/Contents/Effects/Skills/RotateLineEffect.h index e7e3e031c..9e2caff19 100644 --- a/Source/Contents/Effects/RotateLineEffect.h +++ b/Source/Contents/Effects/Skills/RotateLineEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_ROTATELINEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_ROTATELINEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ROTATELINEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_ROTATELINEEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/SaintCastingEffect.cpp b/Source/Contents/Effects/Skills/SaintCastingEffect.cpp similarity index 97% rename from Source/Contents/Effects/SaintCastingEffect.cpp rename to Source/Contents/Effects/Skills/SaintCastingEffect.cpp index 7795fdab3..2b5bca2e3 100644 --- a/Source/Contents/Effects/SaintCastingEffect.cpp +++ b/Source/Contents/Effects/Skills/SaintCastingEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/SaintCastingEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/SaintCastingEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/SaintCastingEffect.h b/Source/Contents/Effects/Skills/SaintCastingEffect.h similarity index 77% rename from Source/Contents/Effects/SaintCastingEffect.h rename to Source/Contents/Effects/Skills/SaintCastingEffect.h index e69709997..a406bdef1 100644 --- a/Source/Contents/Effects/SaintCastingEffect.h +++ b/Source/Contents/Effects/Skills/SaintCastingEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SAINTCASTINGEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SAINTCASTINGEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SAINTCASTINGEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SAINTCASTINGEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/ScatterEffect.cpp b/Source/Contents/Effects/Skills/ScatterEffect.cpp similarity index 94% rename from Source/Contents/Effects/ScatterEffect.cpp rename to Source/Contents/Effects/Skills/ScatterEffect.cpp index 1b23b49fb..e7073ecd8 100644 --- a/Source/Contents/Effects/ScatterEffect.cpp +++ b/Source/Contents/Effects/Skills/ScatterEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/ScatterEffect.h" +#include "Contents/Effects/Skills/ScatterEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/ScatterEffect.h b/Source/Contents/Effects/Skills/ScatterEffect.h similarity index 74% rename from Source/Contents/Effects/ScatterEffect.h rename to Source/Contents/Effects/Skills/ScatterEffect.h index dc84d1a27..456fdbadb 100644 --- a/Source/Contents/Effects/ScatterEffect.h +++ b/Source/Contents/Effects/Skills/ScatterEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SCATTEREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SCATTEREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SCATTEREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SCATTEREFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/ShadowExceedEffect.cpp b/Source/Contents/Effects/Skills/ShadowExceedEffect.cpp similarity index 96% rename from Source/Contents/Effects/ShadowExceedEffect.cpp rename to Source/Contents/Effects/Skills/ShadowExceedEffect.cpp index 69d767ae7..187a182fa 100644 --- a/Source/Contents/Effects/ShadowExceedEffect.cpp +++ b/Source/Contents/Effects/Skills/ShadowExceedEffect.cpp @@ -1,13 +1,13 @@ -#include "Contents/Effects/ShadowExceedEffect.h" +#include "Contents/Effects/Skills/ShadowExceedEffect.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/ShadowExceedEffect.h b/Source/Contents/Effects/Skills/ShadowExceedEffect.h similarity index 74% rename from Source/Contents/Effects/ShadowExceedEffect.h rename to Source/Contents/Effects/Skills/ShadowExceedEffect.h index 1f0d2cd55..18b91d8be 100644 --- a/Source/Contents/Effects/ShadowExceedEffect.h +++ b/Source/Contents/Effects/Skills/ShadowExceedEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SHADOWEXCEEDEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SHADOWEXCEEDEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SHADOWEXCEEDEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SHADOWEXCEEDEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/ShadowExceedNewEffect.cpp b/Source/Contents/Effects/Skills/ShadowExceedNewEffect.cpp similarity index 96% rename from Source/Contents/Effects/ShadowExceedNewEffect.cpp rename to Source/Contents/Effects/Skills/ShadowExceedNewEffect.cpp index e83563197..0ed57791f 100644 --- a/Source/Contents/Effects/ShadowExceedNewEffect.cpp +++ b/Source/Contents/Effects/Skills/ShadowExceedNewEffect.cpp @@ -1,12 +1,12 @@ -#include "Contents/Effects/SkillEffects.h" +#include "Contents/Effects/Skills/SkillEffects.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/SkillEffects.h b/Source/Contents/Effects/Skills/SkillEffects.h similarity index 93% rename from Source/Contents/Effects/SkillEffects.h rename to Source/Contents/Effects/Skills/SkillEffects.h index fc1dbac9c..b07e6feb0 100644 --- a/Source/Contents/Effects/SkillEffects.h +++ b/Source/Contents/Effects/Skills/SkillEffects.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLEFFECTS_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLEFFECTS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SKILLEFFECTS_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SKILLEFFECTS_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/SmokeEffect.cpp b/Source/Contents/Effects/Skills/SmokeEffect.cpp similarity index 95% rename from Source/Contents/Effects/SmokeEffect.cpp rename to Source/Contents/Effects/Skills/SmokeEffect.cpp index 4080007a4..349fb8a20 100644 --- a/Source/Contents/Effects/SmokeEffect.cpp +++ b/Source/Contents/Effects/Skills/SmokeEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/SmokeEffect.h" +#include "Contents/Effects/Skills/SmokeEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/SmokeEffect.h b/Source/Contents/Effects/Skills/SmokeEffect.h similarity index 77% rename from Source/Contents/Effects/SmokeEffect.h rename to Source/Contents/Effects/Skills/SmokeEffect.h index a96964ecd..4e9e7317d 100644 --- a/Source/Contents/Effects/SmokeEffect.h +++ b/Source/Contents/Effects/Skills/SmokeEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SMOKEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SMOKEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SMOKEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SMOKEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/SoulCollectEffect.cpp b/Source/Contents/Effects/Skills/SoulCollectEffect.cpp similarity index 97% rename from Source/Contents/Effects/SoulCollectEffect.cpp rename to Source/Contents/Effects/Skills/SoulCollectEffect.cpp index ddefd3795..5792aaca3 100644 --- a/Source/Contents/Effects/SoulCollectEffect.cpp +++ b/Source/Contents/Effects/Skills/SoulCollectEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/SoulCollectEffect.h" +#include "Contents/Effects/Skills/SoulCollectEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Render/Textures/Texture.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/SoulCollectEffect.h b/Source/Contents/Effects/Skills/SoulCollectEffect.h similarity index 74% rename from Source/Contents/Effects/SoulCollectEffect.h rename to Source/Contents/Effects/Skills/SoulCollectEffect.h index 9bd2ee43c..4f78f5a5e 100644 --- a/Source/Contents/Effects/SoulCollectEffect.h +++ b/Source/Contents/Effects/Skills/SoulCollectEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SOULCOLLECTEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SOULCOLLECTEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SOULCOLLECTEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SOULCOLLECTEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/SoulUnityEffect.cpp b/Source/Contents/Effects/Skills/SoulUnityEffect.cpp similarity index 96% rename from Source/Contents/Effects/SoulUnityEffect.cpp rename to Source/Contents/Effects/Skills/SoulUnityEffect.cpp index c6b3a4dd0..196df00b9 100644 --- a/Source/Contents/Effects/SoulUnityEffect.cpp +++ b/Source/Contents/Effects/Skills/SoulUnityEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/SoulUnityEffect.h" +#include "Contents/Effects/Skills/SoulUnityEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Render/Textures/Texture.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/SoulUnityEffect.h b/Source/Contents/Effects/Skills/SoulUnityEffect.h similarity index 74% rename from Source/Contents/Effects/SoulUnityEffect.h rename to Source/Contents/Effects/Skills/SoulUnityEffect.h index 9b126570f..56fbf99c9 100644 --- a/Source/Contents/Effects/SoulUnityEffect.h +++ b/Source/Contents/Effects/Skills/SoulUnityEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SOULUNITYEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SOULUNITYEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SOULUNITYEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SOULUNITYEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/SphereWind2Effect.cpp b/Source/Contents/Effects/Skills/SphereWind2Effect.cpp similarity index 96% rename from Source/Contents/Effects/SphereWind2Effect.cpp rename to Source/Contents/Effects/Skills/SphereWind2Effect.cpp index f96f28190..8304ebf98 100644 --- a/Source/Contents/Effects/SphereWind2Effect.cpp +++ b/Source/Contents/Effects/Skills/SphereWind2Effect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/SphereWind2Effect.h" +#include "Contents/Effects/Skills/SphereWind2Effect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/SphereWind2Effect.h b/Source/Contents/Effects/Skills/SphereWind2Effect.h similarity index 78% rename from Source/Contents/Effects/SphereWind2Effect.h rename to Source/Contents/Effects/Skills/SphereWind2Effect.h index f28d62045..a060f9c3b 100644 --- a/Source/Contents/Effects/SphereWind2Effect.h +++ b/Source/Contents/Effects/Skills/SphereWind2Effect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPHEREWIND2EFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPHEREWIND2EFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SPHEREWIND2EFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SPHEREWIND2EFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/SphereWindEffect.cpp b/Source/Contents/Effects/Skills/SphereWindEffect.cpp similarity index 96% rename from Source/Contents/Effects/SphereWindEffect.cpp rename to Source/Contents/Effects/Skills/SphereWindEffect.cpp index 72a363548..dbe8905b2 100644 --- a/Source/Contents/Effects/SphereWindEffect.cpp +++ b/Source/Contents/Effects/Skills/SphereWindEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/SphereWindEffect.h" +#include "Contents/Effects/Skills/SphereWindEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/SphereWindEffect.h b/Source/Contents/Effects/Skills/SphereWindEffect.h similarity index 77% rename from Source/Contents/Effects/SphereWindEffect.h rename to Source/Contents/Effects/Skills/SphereWindEffect.h index a4f51c965..22443a178 100644 --- a/Source/Contents/Effects/SphereWindEffect.h +++ b/Source/Contents/Effects/Skills/SphereWindEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPHEREWINDEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SPHEREWINDEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SPHEREWINDEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SPHEREWINDEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/StarEffect.cpp b/Source/Contents/Effects/Skills/StarEffect.cpp similarity index 97% rename from Source/Contents/Effects/StarEffect.cpp rename to Source/Contents/Effects/Skills/StarEffect.cpp index 1c886c889..b468dbe18 100644 --- a/Source/Contents/Effects/StarEffect.cpp +++ b/Source/Contents/Effects/Skills/StarEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/StarEffect.h" +#include "Contents/Effects/Skills/StarEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Effects/StarEffect.h b/Source/Contents/Effects/Skills/StarEffect.h similarity index 77% rename from Source/Contents/Effects/StarEffect.h rename to Source/Contents/Effects/Skills/StarEffect.h index 73b8fde05..0a3048101 100644 --- a/Source/Contents/Effects/StarEffect.h +++ b/Source/Contents/Effects/Skills/StarEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_STAREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_STAREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STAREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STAREFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/StarEmperorEffect.cpp b/Source/Contents/Effects/Skills/StarEmperorEffect.cpp similarity index 97% rename from Source/Contents/Effects/StarEmperorEffect.cpp rename to Source/Contents/Effects/Skills/StarEmperorEffect.cpp index 8b5fa8892..fa05b8c94 100644 --- a/Source/Contents/Effects/StarEmperorEffect.cpp +++ b/Source/Contents/Effects/Skills/StarEmperorEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/StarEmperorEffect.h" +#include "Contents/Effects/Skills/StarEmperorEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/StarEmperorEffect.h b/Source/Contents/Effects/Skills/StarEmperorEffect.h similarity index 79% rename from Source/Contents/Effects/StarEmperorEffect.h rename to Source/Contents/Effects/Skills/StarEmperorEffect.h index b7f182db5..d4ab0c468 100644 --- a/Source/Contents/Effects/StarEmperorEffect.h +++ b/Source/Contents/Effects/Skills/StarEmperorEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_STAREMPEROREFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_STAREMPEROREFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STAREMPEROREFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STAREMPEROREFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/StealEffect.cpp b/Source/Contents/Effects/Skills/StealEffect.cpp similarity index 96% rename from Source/Contents/Effects/StealEffect.cpp rename to Source/Contents/Effects/Skills/StealEffect.cpp index a6156fb20..79a87afd9 100644 --- a/Source/Contents/Effects/StealEffect.cpp +++ b/Source/Contents/Effects/Skills/StealEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/StealEffect.h" +#include "Contents/Effects/Skills/StealEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/SpriteParticle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/SpriteParticle.h" #include "Contents/Ground/TerrainHeight.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/World/World.h" #include "Resource/World/TerrainResource.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/StealEffect.h b/Source/Contents/Effects/Skills/StealEffect.h similarity index 76% rename from Source/Contents/Effects/StealEffect.h rename to Source/Contents/Effects/Skills/StealEffect.h index 5cb536f9a..0c48c80ea 100644 --- a/Source/Contents/Effects/StealEffect.h +++ b/Source/Contents/Effects/Skills/StealEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_STEALEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_STEALEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STEALEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STEALEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/StormCannonEffect.cpp b/Source/Contents/Effects/Skills/StormCannonEffect.cpp similarity index 96% rename from Source/Contents/Effects/StormCannonEffect.cpp rename to Source/Contents/Effects/Skills/StormCannonEffect.cpp index b9e17ea9d..ab8ae99af 100644 --- a/Source/Contents/Effects/StormCannonEffect.cpp +++ b/Source/Contents/Effects/Skills/StormCannonEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/StormCannonEffect.h" +#include "Contents/Effects/Skills/StormCannonEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/StormCannonEffect.h b/Source/Contents/Effects/Skills/StormCannonEffect.h similarity index 83% rename from Source/Contents/Effects/StormCannonEffect.h rename to Source/Contents/Effects/Skills/StormCannonEffect.h index 9b4a19a08..53f55a2af 100644 --- a/Source/Contents/Effects/StormCannonEffect.h +++ b/Source/Contents/Effects/Skills/StormCannonEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_STORMCANNONEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_STORMCANNONEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STORMCANNONEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STORMCANNONEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/StormGustEffect.cpp b/Source/Contents/Effects/Skills/StormGustEffect.cpp similarity index 96% rename from Source/Contents/Effects/StormGustEffect.cpp rename to Source/Contents/Effects/Skills/StormGustEffect.cpp index 688e085df..26c0e32e6 100644 --- a/Source/Contents/Effects/StormGustEffect.cpp +++ b/Source/Contents/Effects/Skills/StormGustEffect.cpp @@ -1,8 +1,8 @@ -#include "Contents/Effects/StormGustEffect.h" +#include "Contents/Effects/Skills/StormGustEffect.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/StormGustEffect.h b/Source/Contents/Effects/Skills/StormGustEffect.h similarity index 72% rename from Source/Contents/Effects/StormGustEffect.h rename to Source/Contents/Effects/Skills/StormGustEffect.h index 1624f2842..963d4f81b 100644 --- a/Source/Contents/Effects/StormGustEffect.h +++ b/Source/Contents/Effects/Skills/StormGustEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_STORMGUSTEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_STORMGUSTEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STORMGUSTEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STORMGUSTEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/StormKickEffect.cpp b/Source/Contents/Effects/Skills/StormKickEffect.cpp similarity index 98% rename from Source/Contents/Effects/StormKickEffect.cpp rename to Source/Contents/Effects/Skills/StormKickEffect.cpp index 325e9c613..b2ff0423a 100644 --- a/Source/Contents/Effects/StormKickEffect.cpp +++ b/Source/Contents/Effects/Skills/StormKickEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/StormKickEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/StormKickEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/StormKickEffect.h b/Source/Contents/Effects/Skills/StormKickEffect.h similarity index 78% rename from Source/Contents/Effects/StormKickEffect.h rename to Source/Contents/Effects/Skills/StormKickEffect.h index e63ec5d27..9982fe209 100644 --- a/Source/Contents/Effects/StormKickEffect.h +++ b/Source/Contents/Effects/Skills/StormKickEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_STORMKICKEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_STORMKICKEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STORMKICKEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_STORMKICKEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Effects/SunStanceEffect.cpp b/Source/Contents/Effects/Skills/SunStanceEffect.cpp similarity index 95% rename from Source/Contents/Effects/SunStanceEffect.cpp rename to Source/Contents/Effects/Skills/SunStanceEffect.cpp index f3f5f667c..596d31664 100644 --- a/Source/Contents/Effects/SunStanceEffect.cpp +++ b/Source/Contents/Effects/Skills/SunStanceEffect.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/SunStanceEffect.h" +#include "Contents/Effects/Skills/SunStanceEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/SunStanceEffect.h b/Source/Contents/Effects/Skills/SunStanceEffect.h similarity index 74% rename from Source/Contents/Effects/SunStanceEffect.h rename to Source/Contents/Effects/Skills/SunStanceEffect.h index 0abc16cb0..4b2c2017e 100644 --- a/Source/Contents/Effects/SunStanceEffect.h +++ b/Source/Contents/Effects/Skills/SunStanceEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SUNSTANCEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SUNSTANCEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SUNSTANCEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_SUNSTANCEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/TalismanMarkEffect.cpp b/Source/Contents/Effects/Skills/TalismanMarkEffect.cpp similarity index 98% rename from Source/Contents/Effects/TalismanMarkEffect.cpp rename to Source/Contents/Effects/Skills/TalismanMarkEffect.cpp index aab890fc2..ccf7203db 100644 --- a/Source/Contents/Effects/TalismanMarkEffect.cpp +++ b/Source/Contents/Effects/Skills/TalismanMarkEffect.cpp @@ -1,9 +1,9 @@ -#include "Contents/Effects/TalismanMarkEffect.h" +#include "Contents/Effects/Skills/TalismanMarkEffect.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Effects/TalismanMarkEffect.h b/Source/Contents/Effects/Skills/TalismanMarkEffect.h similarity index 76% rename from Source/Contents/Effects/TalismanMarkEffect.h rename to Source/Contents/Effects/Skills/TalismanMarkEffect.h index 3bf3a0f74..483791149 100644 --- a/Source/Contents/Effects/TalismanMarkEffect.h +++ b/Source/Contents/Effects/Skills/TalismanMarkEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_TALISMANMARKEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_TALISMANMARKEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_TALISMANMARKEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_TALISMANMARKEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/TetraBallEffect.cpp b/Source/Contents/Effects/Skills/TetraBallEffect.cpp similarity index 94% rename from Source/Contents/Effects/TetraBallEffect.cpp rename to Source/Contents/Effects/Skills/TetraBallEffect.cpp index 54185739a..4256bd2f9 100644 --- a/Source/Contents/Effects/TetraBallEffect.cpp +++ b/Source/Contents/Effects/Skills/TetraBallEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/TetraBallEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/TetraBallEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" // OFFSET: 0x0072E680 // FUNCTION: fn_07509 diff --git a/Source/Contents/Effects/TetraBallEffect.h b/Source/Contents/Effects/Skills/TetraBallEffect.h similarity index 77% rename from Source/Contents/Effects/TetraBallEffect.h rename to Source/Contents/Effects/Skills/TetraBallEffect.h index e5668397d..f1e83ddc0 100644 --- a/Source/Contents/Effects/TetraBallEffect.h +++ b/Source/Contents/Effects/Skills/TetraBallEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_TETRABALLEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_TETRABALLEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_TETRABALLEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_TETRABALLEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include diff --git a/Source/Contents/Effects/ThrowEffects.cpp b/Source/Contents/Effects/Skills/ThrowEffects.cpp similarity index 98% rename from Source/Contents/Effects/ThrowEffects.cpp rename to Source/Contents/Effects/Skills/ThrowEffects.cpp index 26648f712..e0b059760 100644 --- a/Source/Contents/Effects/ThrowEffects.cpp +++ b/Source/Contents/Effects/Skills/ThrowEffects.cpp @@ -1,14 +1,14 @@ -#include "Contents/Combat/CombatTypes.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/ThrowEffects.h" +#include "Contents/CombatTypes.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Skills/ThrowEffects.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Particles/Particle.h" #include "Contents/World/World.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/Effects/ThrowEffects.h b/Source/Contents/Effects/Skills/ThrowEffects.h similarity index 89% rename from Source/Contents/Effects/ThrowEffects.h rename to Source/Contents/Effects/Skills/ThrowEffects.h index 5e5902bfc..18d566ac8 100644 --- a/Source/Contents/Effects/ThrowEffects.h +++ b/Source/Contents/Effects/Skills/ThrowEffects.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_THROWEFFECTS_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_THROWEFFECTS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_THROWEFFECTS_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_THROWEFFECTS_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/TriangleShotArrow.cpp b/Source/Contents/Effects/Skills/TriangleShotArrow.cpp similarity index 97% rename from Source/Contents/Effects/TriangleShotArrow.cpp rename to Source/Contents/Effects/Skills/TriangleShotArrow.cpp index 6ed3cdbaa..e633083ab 100644 --- a/Source/Contents/Effects/TriangleShotArrow.cpp +++ b/Source/Contents/Effects/Skills/TriangleShotArrow.cpp @@ -1,10 +1,10 @@ -#include "Contents/Effects/TriangleShotArrow.h" +#include "Contents/Effects/Skills/TriangleShotArrow.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/TriangleShotArrow.h b/Source/Contents/Effects/Skills/TriangleShotArrow.h similarity index 79% rename from Source/Contents/Effects/TriangleShotArrow.h rename to Source/Contents/Effects/Skills/TriangleShotArrow.h index 9459846ce..8db938620 100644 --- a/Source/Contents/Effects/TriangleShotArrow.h +++ b/Source/Contents/Effects/Skills/TriangleShotArrow.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_TRIANGLESHOTARROW_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_TRIANGLESHOTARROW_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_TRIANGLESHOTARROW_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_TRIANGLESHOTARROW_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include "Utility/Math/Vector3d.h" #include diff --git a/Source/Contents/Effects/ViolentQuakeEffect.cpp b/Source/Contents/Effects/Skills/ViolentQuakeEffect.cpp similarity index 95% rename from Source/Contents/Effects/ViolentQuakeEffect.cpp rename to Source/Contents/Effects/Skills/ViolentQuakeEffect.cpp index 05f666bb9..a18adc522 100644 --- a/Source/Contents/Effects/ViolentQuakeEffect.cpp +++ b/Source/Contents/Effects/Skills/ViolentQuakeEffect.cpp @@ -1,11 +1,11 @@ -#include "Contents/Effects/ViolentQuakeEffect.h" -#include "Contents/Effects/EffectTypes.h" +#include "Contents/Effects/Skills/ViolentQuakeEffect.h" +#include "Contents/Effects/Core/EffectTypes.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Effects/ViolentQuakeEffect.h b/Source/Contents/Effects/Skills/ViolentQuakeEffect.h similarity index 72% rename from Source/Contents/Effects/ViolentQuakeEffect.h rename to Source/Contents/Effects/Skills/ViolentQuakeEffect.h index 4c74ed44d..5dc278d7f 100644 --- a/Source/Contents/Effects/ViolentQuakeEffect.h +++ b/Source/Contents/Effects/Skills/ViolentQuakeEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_VIOLENTQUAKEEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_VIOLENTQUAKEEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_VIOLENTQUAKEEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_VIOLENTQUAKEEFFECT_H -#include "Contents/Effects/Effect.h" +#include "Contents/Effects/Core/Effect.h" #include #include diff --git a/Source/Contents/Effects/WhirlwindEffect.h b/Source/Contents/Effects/Skills/WhirlwindEffect.h similarity index 78% rename from Source/Contents/Effects/WhirlwindEffect.h rename to Source/Contents/Effects/Skills/WhirlwindEffect.h index a3aaa0980..046c5e751 100644 --- a/Source/Contents/Effects/WhirlwindEffect.h +++ b/Source/Contents/Effects/Skills/WhirlwindEffect.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_WHIRLWINDEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_WHIRLWINDEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_WHIRLWINDEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_WHIRLWINDEFFECT_H -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include #include diff --git a/Source/Contents/Effects/WindEffect.cpp b/Source/Contents/Effects/Skills/WindEffect.cpp similarity index 97% rename from Source/Contents/Effects/WindEffect.cpp rename to Source/Contents/Effects/Skills/WindEffect.cpp index baed1aa12..83d99049c 100644 --- a/Source/Contents/Effects/WindEffect.cpp +++ b/Source/Contents/Effects/Skills/WindEffect.cpp @@ -1,7 +1,7 @@ -#include "Contents/Effects/WindEffect.h" +#include "Contents/Effects/Skills/WindEffect.h" -#include "Contents/Effects/EffectMemoryMgr.h" -#include "Contents/Effects/Particle.h" +#include "Contents/Effects/Core/EffectMemoryMgr.h" +#include "Contents/Effects/Particles/Particle.h" #include "Utility/Math/AffineMatrix.h" #include diff --git a/Source/Contents/Effects/WindEffect.h b/Source/Contents/Effects/Skills/WindEffect.h similarity index 86% rename from Source/Contents/Effects/WindEffect.h rename to Source/Contents/Effects/Skills/WindEffect.h index 903eb308e..a92716b37 100644 --- a/Source/Contents/Effects/WindEffect.h +++ b/Source/Contents/Effects/Skills/WindEffect.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_WINDEFFECT_H -#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_WINDEFFECT_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_WINDEFFECT_H +#define RAGNAROK_SOURCE_CONTENTS_EFFECTS_SKILLS_WINDEFFECT_H -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectPoint.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectPoint.h" #include #include diff --git a/Source/Contents/Emblems/EmblemCache.cpp b/Source/Contents/Emblems/EmblemCache.cpp index 6aa598545..213b3f1fa 100644 --- a/Source/Contents/Emblems/EmblemCache.cpp +++ b/Source/Contents/Emblems/EmblemCache.cpp @@ -4,7 +4,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Emblems/GuildEmblemReqBundle.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "File/FileEnumeration.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/EmblemCacheRaw.cpp b/Source/Contents/Emblems/EmblemCacheRaw.cpp similarity index 94% rename from Source/Contents/EmblemCacheRaw.cpp rename to Source/Contents/Emblems/EmblemCacheRaw.cpp index 7295d7f4a..c2f1358e8 100644 --- a/Source/Contents/EmblemCacheRaw.cpp +++ b/Source/Contents/Emblems/EmblemCacheRaw.cpp @@ -1,6 +1,6 @@ #include "Client/Application/Launcher.h" #include "Client/Session.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "File/FileEnumeration.h" #include @@ -9,7 +9,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" // OFFSET: 0x00DFF600 // FUNCTION: fn_23620 diff --git a/Source/Contents/Emblems/EmblemUpload.cpp b/Source/Contents/Emblems/EmblemUpload.cpp index 62e30cd12..1749b2ee2 100644 --- a/Source/Contents/Emblems/EmblemUpload.cpp +++ b/Source/Contents/Emblems/EmblemUpload.cpp @@ -1,5 +1,5 @@ #include "Contents/Emblems/EmblemDataMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/GuildEmblemLookup.cpp b/Source/Contents/Emblems/GuildEmblemLookup.cpp similarity index 94% rename from Source/Contents/GuildEmblemLookup.cpp rename to Source/Contents/Emblems/GuildEmblemLookup.cpp index 782e79ac2..0fa585f73 100644 --- a/Source/Contents/GuildEmblemLookup.cpp +++ b/Source/Contents/Emblems/GuildEmblemLookup.cpp @@ -1,6 +1,6 @@ #include "Client/Replay.h" #include "Contents/Emblems/GuildEmblemReqBundle.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "Resource/ResourceMgr.h" // OFFSET: 0x0065E450 diff --git a/Source/Contents/GuildEmblemState.cpp b/Source/Contents/Emblems/GuildEmblemState.cpp similarity index 94% rename from Source/Contents/GuildEmblemState.cpp rename to Source/Contents/Emblems/GuildEmblemState.cpp index 071f74356..140e1b0c8 100644 --- a/Source/Contents/GuildEmblemState.cpp +++ b/Source/Contents/Emblems/GuildEmblemState.cpp @@ -1,4 +1,4 @@ -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" // OFFSET: 0x0065C440 // FUNCTION: fn_05147 diff --git a/Source/Contents/EntryQueueMgr.cpp b/Source/Contents/EntryQueue/EntryQueueMgr.cpp similarity index 99% rename from Source/Contents/EntryQueueMgr.cpp rename to Source/Contents/EntryQueue/EntryQueueMgr.cpp index a78412a2e..1bdc68090 100644 --- a/Source/Contents/EntryQueueMgr.cpp +++ b/Source/Contents/EntryQueue/EntryQueueMgr.cpp @@ -1,10 +1,10 @@ -#include "Contents/EntryQueueMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Network/Packets/NoticeEnums.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Sound/SoundMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/Contents/EntryQueueMgr.h b/Source/Contents/EntryQueue/EntryQueueMgr.h similarity index 96% rename from Source/Contents/EntryQueueMgr.h rename to Source/Contents/EntryQueue/EntryQueueMgr.h index 9174d70df..702e340f2 100644 --- a/Source/Contents/EntryQueueMgr.h +++ b/Source/Contents/EntryQueue/EntryQueueMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ENTRYQUEUEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_ENTRYQUEUEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ENTRYQUEUE_ENTRYQUEUEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_ENTRYQUEUE_ENTRYQUEUEMGR_H #include #include diff --git a/Source/Contents/CheckAttendanceMgr.cpp b/Source/Contents/Events/CheckAttendanceMgr.cpp similarity index 99% rename from Source/Contents/CheckAttendanceMgr.cpp rename to Source/Contents/Events/CheckAttendanceMgr.cpp index 0b10aa22b..6b1094b5d 100644 --- a/Source/Contents/CheckAttendanceMgr.cpp +++ b/Source/Contents/Events/CheckAttendanceMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/CheckAttendanceMgr.h" +#include "Contents/Events/CheckAttendanceMgr.h" #include "Script/NLuaState.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/CheckAttendanceMgr.h b/Source/Contents/Events/CheckAttendanceMgr.h similarity index 89% rename from Source/Contents/CheckAttendanceMgr.h rename to Source/Contents/Events/CheckAttendanceMgr.h index a0e868529..55252ffa0 100644 --- a/Source/Contents/CheckAttendanceMgr.h +++ b/Source/Contents/Events/CheckAttendanceMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_CHECKATTENDANCEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_CHECKATTENDANCEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EVENTS_CHECKATTENDANCEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_EVENTS_CHECKATTENDANCEMGR_H #include #include diff --git a/Source/Contents/RouletteMgr.cpp b/Source/Contents/Events/RouletteMgr.cpp similarity index 99% rename from Source/Contents/RouletteMgr.cpp rename to Source/Contents/Events/RouletteMgr.cpp index a4768a6f5..072433bb7 100644 --- a/Source/Contents/RouletteMgr.cpp +++ b/Source/Contents/Events/RouletteMgr.cpp @@ -1,5 +1,5 @@ #include "UI/Window/UIEnums.h" -#include "Contents/RouletteMgr.h" +#include "Contents/Events/RouletteMgr.h" #include "Render/Renderer.h" #include "Render/TextureQuad.h" #include "Render/Textures/TextureCache.h" diff --git a/Source/Contents/RouletteMgr.h b/Source/Contents/Events/RouletteMgr.h similarity index 96% rename from Source/Contents/RouletteMgr.h rename to Source/Contents/Events/RouletteMgr.h index 9c9b4cdaf..df8d19aec 100644 --- a/Source/Contents/RouletteMgr.h +++ b/Source/Contents/Events/RouletteMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ROULETTEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_ROULETTEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EVENTS_ROULETTEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_EVENTS_ROULETTEMGR_H #include "Contents/Items/ItemInfo.h" #include "Render/Primitives/RenderPrimitive.h" diff --git a/Source/Contents/ShowRankingScheduler.cpp b/Source/Contents/Events/ShowRankingScheduler.cpp similarity index 97% rename from Source/Contents/ShowRankingScheduler.cpp rename to Source/Contents/Events/ShowRankingScheduler.cpp index a2e70fe14..52c60ae14 100644 --- a/Source/Contents/ShowRankingScheduler.cpp +++ b/Source/Contents/Events/ShowRankingScheduler.cpp @@ -1,11 +1,11 @@ #include "UI/Window/UIEnums.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Events/ShowRankingScheduler.h" #include "Client/Session.h" #include "Contents/Schedule/CheckGDISchedule.h" #include "Contents/Schedule/TimeScheduler.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Contents/ShowRankingScheduler.h b/Source/Contents/Events/ShowRankingScheduler.h similarity index 89% rename from Source/Contents/ShowRankingScheduler.h rename to Source/Contents/Events/ShowRankingScheduler.h index d7935f72f..59abb6881 100644 --- a/Source/Contents/ShowRankingScheduler.h +++ b/Source/Contents/Events/ShowRankingScheduler.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SHOWRANKINGSCHEDULER_H -#define RAGNAROK_SOURCE_CONTENTS_SHOWRANKINGSCHEDULER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EVENTS_SHOWRANKINGSCHEDULER_H +#define RAGNAROK_SOURCE_CONTENTS_EVENTS_SHOWRANKINGSCHEDULER_H #include "Contents/Schedule/Schedule.h" #include diff --git a/Source/Contents/SpecialPopupMgr.cpp b/Source/Contents/Events/SpecialPopupMgr.cpp similarity index 99% rename from Source/Contents/SpecialPopupMgr.cpp rename to Source/Contents/Events/SpecialPopupMgr.cpp index 427a9f1b9..3ec6818ee 100644 --- a/Source/Contents/SpecialPopupMgr.cpp +++ b/Source/Contents/Events/SpecialPopupMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/SpecialPopupMgr.h" +#include "Contents/Events/SpecialPopupMgr.h" #include "Script/LuaFileOperations.h" #include "Script/NLuaState.h" diff --git a/Source/Contents/SpecialPopupMgr.h b/Source/Contents/Events/SpecialPopupMgr.h similarity index 92% rename from Source/Contents/SpecialPopupMgr.h rename to Source/Contents/Events/SpecialPopupMgr.h index 5c63e7ef8..e76b6a005 100644 --- a/Source/Contents/SpecialPopupMgr.h +++ b/Source/Contents/Events/SpecialPopupMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SPECIALPOPUPMGR_H -#define RAGNAROK_SOURCE_CONTENTS_SPECIALPOPUPMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_EVENTS_SPECIALPOPUPMGR_H +#define RAGNAROK_SOURCE_CONTENTS_EVENTS_SPECIALPOPUPMGR_H #include #include diff --git a/Source/Contents/Ground/GroundLighting.cpp b/Source/Contents/Ground/GroundLighting.cpp index fe541636a..163bb3482 100644 --- a/Source/Contents/Ground/GroundLighting.cpp +++ b/Source/Contents/Ground/GroundLighting.cpp @@ -1,9 +1,9 @@ #include "Contents/Ground/GroundGeometry.h" #include "Contents/Ground/GroundRendering.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectPoint.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Core/EffectPoint.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Map/MapSkyMgr.h" #include "Render/Primitives/LightmappedPrimitive.h" #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" diff --git a/Source/Contents/Ground/GroundWaterRendering.cpp b/Source/Contents/Ground/GroundWaterRendering.cpp index 2ad1ce77a..5e97dc2c9 100644 --- a/Source/Contents/Ground/GroundWaterRendering.cpp +++ b/Source/Contents/Ground/GroundWaterRendering.cpp @@ -2,7 +2,7 @@ #include "Contents/Ground/GroundRendering.h" #include "Render/Primitives/RenderPrimitivePool.h" #include "Render/Primitives/RenderQueues.h" -#include "Contents/Effects/EffectPrim.h" +#include "Contents/Effects/Primitives/EffectPrim.h" #include "Render/Renderer.h" #include "Render/TextureQuad.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/GuildInfo.cpp b/Source/Contents/Guild/GuildInfo.cpp similarity index 99% rename from Source/Contents/GuildInfo.cpp rename to Source/Contents/Guild/GuildInfo.cpp index fb970c71d..18e92d201 100644 --- a/Source/Contents/GuildInfo.cpp +++ b/Source/Contents/Guild/GuildInfo.cpp @@ -1,10 +1,10 @@ -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" #include "Client/Mode/CGameMode.h" #include "Client/Session.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/World/World.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/GuildInfo.h b/Source/Contents/Guild/GuildInfo.h similarity index 97% rename from Source/Contents/GuildInfo.h rename to Source/Contents/Guild/GuildInfo.h index 168bb56e8..739f4df83 100644 --- a/Source/Contents/GuildInfo.h +++ b/Source/Contents/Guild/GuildInfo.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_GUILDINFO_H -#define RAGNAROK_SOURCE_CONTENTS_GUILDINFO_H +#ifndef RAGNAROK_SOURCE_CONTENTS_GUILD_GUILDINFO_H +#define RAGNAROK_SOURCE_CONTENTS_GUILD_GUILDINFO_H #include #include diff --git a/Source/Contents/GuildMgr.cpp b/Source/Contents/Guild/GuildMgr.cpp similarity index 96% rename from Source/Contents/GuildMgr.cpp rename to Source/Contents/Guild/GuildMgr.cpp index a24342a17..86f86565b 100644 --- a/Source/Contents/GuildMgr.cpp +++ b/Source/Contents/Guild/GuildMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "Contents/Emblems/GuildEmblemReqBundle.h" #include diff --git a/Source/Contents/GuildMgr.h b/Source/Contents/Guild/GuildMgr.h similarity index 95% rename from Source/Contents/GuildMgr.h rename to Source/Contents/Guild/GuildMgr.h index 95a93589a..c1a61f5d2 100644 --- a/Source/Contents/GuildMgr.h +++ b/Source/Contents/Guild/GuildMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_GUILDMGR_H -#define RAGNAROK_SOURCE_CONTENTS_GUILDMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_GUILD_GUILDMGR_H +#define RAGNAROK_SOURCE_CONTENTS_GUILD_GUILDMGR_H #include #include diff --git a/Source/Contents/GuildTip.cpp b/Source/Contents/Guild/GuildTip.cpp similarity index 97% rename from Source/Contents/GuildTip.cpp rename to Source/Contents/Guild/GuildTip.cpp index 708de0456..f0347ddd5 100644 --- a/Source/Contents/GuildTip.cpp +++ b/Source/Contents/Guild/GuildTip.cpp @@ -1,4 +1,4 @@ -#include "Contents/GuildTip.h" +#include "Contents/Guild/GuildTip.h" #include "Client/Input/InputCharset.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "File/File.h" diff --git a/Source/Contents/GuildTip.h b/Source/Contents/Guild/GuildTip.h similarity index 74% rename from Source/Contents/GuildTip.h rename to Source/Contents/Guild/GuildTip.h index 570011f43..685b56a3e 100644 --- a/Source/Contents/GuildTip.h +++ b/Source/Contents/Guild/GuildTip.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_GUILDTIP_H -#define RAGNAROK_SOURCE_CONTENTS_GUILDTIP_H +#ifndef RAGNAROK_SOURCE_CONTENTS_GUILD_GUILDTIP_H +#define RAGNAROK_SOURCE_CONTENTS_GUILD_GUILDTIP_H -#include "Contents/TipOfTheDay.h" +#include "Contents/Tables/TipOfTheDay.h" #include #include diff --git a/Source/Contents/Hotkeys/EmotionHotkeys.cpp b/Source/Contents/Hotkeys/EmotionHotkeys.cpp index 8a7431878..d7879034d 100644 --- a/Source/Contents/Hotkeys/EmotionHotkeys.cpp +++ b/Source/Contents/Hotkeys/EmotionHotkeys.cpp @@ -1,6 +1,6 @@ #include "Contents/Hotkeys/EmotionHotkeys.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "File/ShortcutFilename.h" #include "Network/TextEncoding.h" diff --git a/Source/Contents/ClientItemLists.cpp b/Source/Contents/Items/ClientItemLists.cpp similarity index 99% rename from Source/Contents/ClientItemLists.cpp rename to Source/Contents/Items/ClientItemLists.cpp index 1ac007c93..5ece39a9e 100644 --- a/Source/Contents/ClientItemLists.cpp +++ b/Source/Contents/Items/ClientItemLists.cpp @@ -4,22 +4,22 @@ #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Contents/Items/InventoryType.h" #include "Client/Mode/ModeMgr.h" #include "Client/Replay.h" #include "Client/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/ClientState.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/GuildInfo.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Guild/GuildInfo.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Messenger/MessengerMember.h" -#include "Contents/PetEvolutionMgr.h" +#include "Contents/Pet/PetEvolutionMgr.h" #include "Contents/World/World.h" #include "UI/Items/UIEquipWnd.h" #include "UI/Window/UIWindow.h" diff --git a/Source/Contents/ClientItemLists.h b/Source/Contents/Items/ClientItemLists.h similarity index 59% rename from Source/Contents/ClientItemLists.h rename to Source/Contents/Items/ClientItemLists.h index d5943fda3..07a950eef 100644 --- a/Source/Contents/ClientItemLists.h +++ b/Source/Contents/Items/ClientItemLists.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_CLIENTITEMLISTS_H -#define RAGNAROK_SOURCE_CONTENTS_CLIENTITEMLISTS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ITEMS_CLIENTITEMLISTS_H +#define RAGNAROK_SOURCE_CONTENTS_ITEMS_CLIENTITEMLISTS_H void ReceiveItemSlot(const unsigned char* data); void ReceiveItemSlotOptions(const unsigned char* data); diff --git a/Source/Contents/EnchantMgr.cpp b/Source/Contents/Items/EnchantMgr.cpp similarity index 99% rename from Source/Contents/EnchantMgr.cpp rename to Source/Contents/Items/EnchantMgr.cpp index 37536cdb2..98450ee71 100644 --- a/Source/Contents/EnchantMgr.cpp +++ b/Source/Contents/Items/EnchantMgr.cpp @@ -1,13 +1,13 @@ -#include "Contents/EnchantMgr.h" +#include "Contents/Items/EnchantMgr.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Network/Packets/PacketId.h" #include "Client/Session.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/ItemDBToIDMgr.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Items/ItemDBToIDMgr.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Enchant/EnchantUI.h" diff --git a/Source/Contents/EnchantMgr.h b/Source/Contents/Items/EnchantMgr.h similarity index 98% rename from Source/Contents/EnchantMgr.h rename to Source/Contents/Items/EnchantMgr.h index b949aae04..f1d192de0 100644 --- a/Source/Contents/EnchantMgr.h +++ b/Source/Contents/Items/EnchantMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ENCHANTMGR_H -#define RAGNAROK_SOURCE_CONTENTS_ENCHANTMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ITEMS_ENCHANTMGR_H +#define RAGNAROK_SOURCE_CONTENTS_ITEMS_ENCHANTMGR_H #include "Script/LuaInstance.h" #include "Utility/Singleton.h" diff --git a/Source/Contents/ItemDBToIDMgr.cpp b/Source/Contents/Items/ItemDBToIDMgr.cpp similarity index 96% rename from Source/Contents/ItemDBToIDMgr.cpp rename to Source/Contents/Items/ItemDBToIDMgr.cpp index 2669ac006..e11f27108 100644 --- a/Source/Contents/ItemDBToIDMgr.cpp +++ b/Source/Contents/Items/ItemDBToIDMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/ItemDBToIDMgr.h" +#include "Contents/Items/ItemDBToIDMgr.h" #include diff --git a/Source/Contents/ItemDBToIDMgr.h b/Source/Contents/Items/ItemDBToIDMgr.h similarity index 80% rename from Source/Contents/ItemDBToIDMgr.h rename to Source/Contents/Items/ItemDBToIDMgr.h index 8c0d666f0..4a478b67c 100644 --- a/Source/Contents/ItemDBToIDMgr.h +++ b/Source/Contents/Items/ItemDBToIDMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ITEMDBTOIDMGR_H -#define RAGNAROK_SOURCE_CONTENTS_ITEMDBTOIDMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ITEMS_ITEMDBTOIDMGR_H +#define RAGNAROK_SOURCE_CONTENTS_ITEMS_ITEMDBTOIDMGR_H #include "Script/LuaInstance.h" diff --git a/Source/Contents/Items/ItemNaming.cpp b/Source/Contents/Items/ItemNaming.cpp index a933dd8d1..3c7a228b9 100644 --- a/Source/Contents/Items/ItemNaming.cpp +++ b/Source/Contents/Items/ItemNaming.cpp @@ -4,8 +4,8 @@ #include "Contents/Items/ItemNaming.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Utility/Text/FormatString.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include #include diff --git a/Source/Contents/Items/ItemReformMgr.cpp b/Source/Contents/Items/ItemReformMgr.cpp index 455edcdbc..4ca80d7c3 100644 --- a/Source/Contents/Items/ItemReformMgr.cpp +++ b/Source/Contents/Items/ItemReformMgr.cpp @@ -1,7 +1,7 @@ #include "Contents/Items/ItemReformMgr.h" #include "Client/Application/ErrorDialog.h" -#include "Contents/ItemDBToIDMgr.h" +#include "Contents/Items/ItemDBToIDMgr.h" #include "Utility/Text/FormatString.h" extern "C" { diff --git a/Source/Contents/JobCodeForItem.cpp b/Source/Contents/Items/JobCodeForItem.cpp similarity index 99% rename from Source/Contents/JobCodeForItem.cpp rename to Source/Contents/Items/JobCodeForItem.cpp index 17b5a566d..b7452bf3e 100644 --- a/Source/Contents/JobCodeForItem.cpp +++ b/Source/Contents/Items/JobCodeForItem.cpp @@ -1,4 +1,4 @@ -#include "Contents/JobCodeForItem.h" +#include "Contents/Items/JobCodeForItem.h" #include "Contents/Jobs/JobId.h" #include diff --git a/Source/Contents/JobCodeForItem.h b/Source/Contents/Items/JobCodeForItem.h similarity index 86% rename from Source/Contents/JobCodeForItem.h rename to Source/Contents/Items/JobCodeForItem.h index 981abd72f..e9cd8a16f 100644 --- a/Source/Contents/JobCodeForItem.h +++ b/Source/Contents/Items/JobCodeForItem.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_JOBCODEFORITEM_H -#define RAGNAROK_SOURCE_CONTENTS_JOBCODEFORITEM_H +#ifndef RAGNAROK_SOURCE_CONTENTS_ITEMS_JOBCODEFORITEM_H +#define RAGNAROK_SOURCE_CONTENTS_ITEMS_JOBCODEFORITEM_H #include "Utility/Singleton.h" diff --git a/Source/Contents/Jobs/JobInheritance.cpp b/Source/Contents/Jobs/JobInheritance.cpp index 56ed8be4e..dc9d027a6 100644 --- a/Source/Contents/Jobs/JobInheritance.cpp +++ b/Source/Contents/Jobs/JobInheritance.cpp @@ -2,26 +2,26 @@ #include "Client/Mode/ModeMessage.h" #include "Contents/Actors/ActorEnums.h" #include "UI/Window/UIEnums.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CMode.h" #include "Client/Mode/CGameMode.h" #include "Contents/ClientState.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/WeaponType.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Skills/SkillInfo.h" #include "Client/Session.h" #include "Contents/Actors/GameActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Jobs/JobId.h" -#include "Contents/MapPropertyMgr.h" +#include "Contents/Map/MapPropertyMgr.h" #include "Contents/Skills/PlayerSkillBundle.h" #include "Contents/World/World.h" #include "File/MapName.h" @@ -31,8 +31,8 @@ #include "Utility/Text/FormatString.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/AMachineEffect.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Skills/AMachineEffect.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Resource/World/TerrainResource.h" #include "Utility/Math/AffineMatrix.h" diff --git a/Source/Contents/FlyingShipRouteInfo.cpp b/Source/Contents/Map/FlyingShipRouteInfo.cpp similarity index 97% rename from Source/Contents/FlyingShipRouteInfo.cpp rename to Source/Contents/Map/FlyingShipRouteInfo.cpp index 1f4425029..09f61a220 100644 --- a/Source/Contents/FlyingShipRouteInfo.cpp +++ b/Source/Contents/Map/FlyingShipRouteInfo.cpp @@ -1,4 +1,4 @@ -#include "Contents/FlyingShipRouteInfo.h" +#include "Contents/Map/FlyingShipRouteInfo.h" #include "Render/Renderer.h" #include "Render/ScreenGeometry.h" #include "Render/TextureQuad.h" diff --git a/Source/Contents/FlyingShipRouteInfo.h b/Source/Contents/Map/FlyingShipRouteInfo.h similarity index 94% rename from Source/Contents/FlyingShipRouteInfo.h rename to Source/Contents/Map/FlyingShipRouteInfo.h index cb391e88d..0104938cb 100644 --- a/Source/Contents/FlyingShipRouteInfo.h +++ b/Source/Contents/Map/FlyingShipRouteInfo.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_FLYINGSHIPROUTEINFO_H -#define RAGNAROK_SOURCE_CONTENTS_FLYINGSHIPROUTEINFO_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MAP_FLYINGSHIPROUTEINFO_H +#define RAGNAROK_SOURCE_CONTENTS_MAP_FLYINGSHIPROUTEINFO_H #include #include diff --git a/Source/Contents/MapInfoMgr.cpp b/Source/Contents/Map/MapInfoMgr.cpp similarity index 99% rename from Source/Contents/MapInfoMgr.cpp rename to Source/Contents/Map/MapInfoMgr.cpp index 05bfcad0a..0b3f1b7f0 100644 --- a/Source/Contents/MapInfoMgr.cpp +++ b/Source/Contents/Map/MapInfoMgr.cpp @@ -1,6 +1,6 @@ -#include "Contents/MapInfoMgr.h" +#include "Contents/Map/MapInfoMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Render/DeviceContext/DCBitmap.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" diff --git a/Source/Contents/MapInfoMgr.h b/Source/Contents/Map/MapInfoMgr.h similarity index 95% rename from Source/Contents/MapInfoMgr.h rename to Source/Contents/Map/MapInfoMgr.h index ff9f07bb4..3c981cce2 100644 --- a/Source/Contents/MapInfoMgr.h +++ b/Source/Contents/Map/MapInfoMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_MAPINFOMGR_H -#define RAGNAROK_SOURCE_CONTENTS_MAPINFOMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MAP_MAPINFOMGR_H +#define RAGNAROK_SOURCE_CONTENTS_MAP_MAPINFOMGR_H #include "Render/DeviceContext/DeviceContext.h" diff --git a/Source/Contents/MapNameTable.cpp b/Source/Contents/Map/MapNameTable.cpp similarity index 99% rename from Source/Contents/MapNameTable.cpp rename to Source/Contents/Map/MapNameTable.cpp index 299be5719..692db7973 100644 --- a/Source/Contents/MapNameTable.cpp +++ b/Source/Contents/Map/MapNameTable.cpp @@ -1,5 +1,5 @@ #include "Client/Session.h" -#include "Contents/MapInfoMgr.h" +#include "Contents/Map/MapInfoMgr.h" #include "File/CommonObject.h" #include "File/File.h" #include "Render/Renderer.h" diff --git a/Source/Contents/MapPropertyMgr.cpp b/Source/Contents/Map/MapPropertyMgr.cpp similarity index 97% rename from Source/Contents/MapPropertyMgr.cpp rename to Source/Contents/Map/MapPropertyMgr.cpp index cd5ebe256..1eeacaad7 100644 --- a/Source/Contents/MapPropertyMgr.cpp +++ b/Source/Contents/Map/MapPropertyMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/MapPropertyMgr.h" +#include "Contents/Map/MapPropertyMgr.h" #include diff --git a/Source/Contents/MapPropertyMgr.h b/Source/Contents/Map/MapPropertyMgr.h similarity index 89% rename from Source/Contents/MapPropertyMgr.h rename to Source/Contents/Map/MapPropertyMgr.h index 0f1d2c7fe..c75656c64 100644 --- a/Source/Contents/MapPropertyMgr.h +++ b/Source/Contents/Map/MapPropertyMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_MAPPROPERTYMGR_H -#define RAGNAROK_SOURCE_CONTENTS_MAPPROPERTYMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MAP_MAPPROPERTYMGR_H +#define RAGNAROK_SOURCE_CONTENTS_MAP_MAPPROPERTYMGR_H #include #include diff --git a/Source/Contents/MapSkyMgr.cpp b/Source/Contents/Map/MapSkyMgr.cpp similarity index 98% rename from Source/Contents/MapSkyMgr.cpp rename to Source/Contents/Map/MapSkyMgr.cpp index e8aafe50e..ddb2d3350 100644 --- a/Source/Contents/MapSkyMgr.cpp +++ b/Source/Contents/Map/MapSkyMgr.cpp @@ -1,11 +1,11 @@ -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/World/World.h" #include "File/MapName.h" #include "Render/Renderer.h" diff --git a/Source/Contents/MapSkyMgr.h b/Source/Contents/Map/MapSkyMgr.h similarity index 94% rename from Source/Contents/MapSkyMgr.h rename to Source/Contents/Map/MapSkyMgr.h index 505e0bc83..c2f517b76 100644 --- a/Source/Contents/MapSkyMgr.h +++ b/Source/Contents/Map/MapSkyMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_MAPSKYMGR_H -#define RAGNAROK_SOURCE_CONTENTS_MAPSKYMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MAP_MAPSKYMGR_H +#define RAGNAROK_SOURCE_CONTENTS_MAP_MAPSKYMGR_H #include "Script/LuaScript.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/PrivateAirplaneMgr.cpp b/Source/Contents/Map/PrivateAirplaneMgr.cpp similarity index 99% rename from Source/Contents/PrivateAirplaneMgr.cpp rename to Source/Contents/Map/PrivateAirplaneMgr.cpp index 9e04bec60..3bc4395b0 100644 --- a/Source/Contents/PrivateAirplaneMgr.cpp +++ b/Source/Contents/Map/PrivateAirplaneMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/PrivateAirplaneMgr.h" +#include "Contents/Map/PrivateAirplaneMgr.h" #include "Script/NLuaState.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/PrivateAirplaneMgr.h b/Source/Contents/Map/PrivateAirplaneMgr.h similarity index 90% rename from Source/Contents/PrivateAirplaneMgr.h rename to Source/Contents/Map/PrivateAirplaneMgr.h index e1c5dd4de..b8997f858 100644 --- a/Source/Contents/PrivateAirplaneMgr.h +++ b/Source/Contents/Map/PrivateAirplaneMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_PRIVATEAIRPLANEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_PRIVATEAIRPLANEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MAP_PRIVATEAIRPLANEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_MAP_PRIVATEAIRPLANEMGR_H #include #include diff --git a/Source/Contents/TownInfoMgr.cpp b/Source/Contents/Map/TownInfoMgr.cpp similarity index 99% rename from Source/Contents/TownInfoMgr.cpp rename to Source/Contents/Map/TownInfoMgr.cpp index 3bd764dc9..67ae3c633 100644 --- a/Source/Contents/TownInfoMgr.cpp +++ b/Source/Contents/Map/TownInfoMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/TownInfoMgr.h" +#include "Contents/Map/TownInfoMgr.h" #include "Script/NLuaState.h" extern "C" { diff --git a/Source/Contents/TownInfoMgr.h b/Source/Contents/Map/TownInfoMgr.h similarity index 90% rename from Source/Contents/TownInfoMgr.h rename to Source/Contents/Map/TownInfoMgr.h index d8bc99e45..e54145c4f 100644 --- a/Source/Contents/TownInfoMgr.h +++ b/Source/Contents/Map/TownInfoMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_TOWNINFOMGR_H -#define RAGNAROK_SOURCE_CONTENTS_TOWNINFOMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MAP_TOWNINFOMGR_H +#define RAGNAROK_SOURCE_CONTENTS_MAP_TOWNINFOMGR_H #include #include diff --git a/Source/Contents/Messenger/ClientMessenger.cpp b/Source/Contents/Messenger/ClientMessenger.cpp index 73906c1f0..1ee68ff0d 100644 --- a/Source/Contents/Messenger/ClientMessenger.cpp +++ b/Source/Contents/Messenger/ClientMessenger.cpp @@ -2,10 +2,10 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Contents/Items/ItemType.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Contents/Messenger/ClientMessenger.h" #include "Utility/EncryptedName.h" -#include "Contents/Effects/EffectActor.h" +#include "Contents/Effects/Core/EffectActor.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Session.h" @@ -25,17 +25,17 @@ #include "Network/TextEncoding.h" #include "Utility/Text/StringUtil.h" #include "Contents/World/World.h" -#include "Contents/Items/RuneSystem.h" +#include "Contents/RuneSystem/RuneSystem.h" #include "Contents/Skills/SkillInfo.h" -#include "Contents/SimpleStringMgr.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "Contents/Configuration/GameSettingsMgr.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Items/ItemInfoMgr.h" -#include "Contents/MapInfoMgr.h" -#include "Contents/SpecialPopupMgr.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Map/MapInfoMgr.h" +#include "Contents/Events/SpecialPopupMgr.h" +#include "Contents/Tables/TipBoxTitles.h" #include "Render/Text/EmbedFont.h" #include "Utility/Cipher/XorBytes.h" diff --git a/Source/Contents/Messenger/MessengerMember.cpp b/Source/Contents/Messenger/MessengerMember.cpp index be24dee77..fa64ac5fa 100644 --- a/Source/Contents/Messenger/MessengerMember.cpp +++ b/Source/Contents/Messenger/MessengerMember.cpp @@ -5,7 +5,7 @@ #include "UI/Window/UIEnums.h" #include "Client/Input/Mouse.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Render/Renderer.h" @@ -27,7 +27,7 @@ #include "Render/Text/TextContext.h" #include "UI/Party/UIMiniPartyWnd.h" #include "UI/Window/WindowBorder.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Utility/Text/FormatString.h" #include "Resource/SkinPalette.h" #include "UI/Text/UIStaticText.h" @@ -36,7 +36,7 @@ #include "UI/Buttons/UIRadioBtn.h" #include "UI/Window/UIResizer.h" #include "UI/Window/WindowBorder.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Utility/Text/FormatString.h" #include "Resource/SkinPalette.h" #include "Client/Mode/CMode.h" diff --git a/Source/Contents/ModelKeyframes.cpp b/Source/Contents/Models/ModelKeyframes.cpp similarity index 100% rename from Source/Contents/ModelKeyframes.cpp rename to Source/Contents/Models/ModelKeyframes.cpp diff --git a/Source/Contents/Models/ModelRendering.cpp b/Source/Contents/Models/ModelRendering.cpp index 736075837..ee6eb206c 100644 --- a/Source/Contents/Models/ModelRendering.cpp +++ b/Source/Contents/Models/ModelRendering.cpp @@ -4,8 +4,8 @@ #include "Render/Primitives/RenderCommandPool.h" #include "Render/Primitives/RenderQueues.h" #include "Render/Primitives/RenderVertexPool.h" -#include "Contents/Effects/EffectPrim.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Effects/Primitives/EffectPrim.h" +#include "Contents/Map/MapSkyMgr.h" #include "Render/Renderer.h" #include "Render/TextureQuad.h" #include "Resource/World/WorldResource.h" diff --git a/Source/Contents/ChampionMonsterMgr.cpp b/Source/Contents/Monster/ChampionMonsterMgr.cpp similarity index 97% rename from Source/Contents/ChampionMonsterMgr.cpp rename to Source/Contents/Monster/ChampionMonsterMgr.cpp index 7dfe5d6cb..9c7e8211f 100644 --- a/Source/Contents/ChampionMonsterMgr.cpp +++ b/Source/Contents/Monster/ChampionMonsterMgr.cpp @@ -1,9 +1,9 @@ -#include "Contents/ChampionMonsterMgr.h" +#include "Contents/Monster/ChampionMonsterMgr.h" #include "Contents/Actors/ActorEnums.h" #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Actors/GameActor.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Script/NLuaState.h" extern "C" { diff --git a/Source/Contents/ChampionMonsterMgr.h b/Source/Contents/Monster/ChampionMonsterMgr.h similarity index 90% rename from Source/Contents/ChampionMonsterMgr.h rename to Source/Contents/Monster/ChampionMonsterMgr.h index cc9163d4f..2cb18d84c 100644 --- a/Source/Contents/ChampionMonsterMgr.h +++ b/Source/Contents/Monster/ChampionMonsterMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_CHAMPIONMONSTERMGR_H -#define RAGNAROK_SOURCE_CONTENTS_CHAMPIONMONSTERMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MONSTER_CHAMPIONMONSTERMGR_H +#define RAGNAROK_SOURCE_CONTENTS_MONSTER_CHAMPIONMONSTERMGR_H #include #include diff --git a/Source/Contents/EnemyMonsterTalk.cpp b/Source/Contents/Monster/EnemyMonsterTalk.cpp similarity index 98% rename from Source/Contents/EnemyMonsterTalk.cpp rename to Source/Contents/Monster/EnemyMonsterTalk.cpp index 8265dc9db..ecb607f0f 100644 --- a/Source/Contents/EnemyMonsterTalk.cpp +++ b/Source/Contents/Monster/EnemyMonsterTalk.cpp @@ -1,5 +1,5 @@ #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include #include diff --git a/Source/Contents/MonsterSpeech.cpp b/Source/Contents/Monster/MonsterSpeech.cpp similarity index 100% rename from Source/Contents/MonsterSpeech.cpp rename to Source/Contents/Monster/MonsterSpeech.cpp diff --git a/Source/Contents/MonsterXmlActions.cpp b/Source/Contents/Monster/MonsterXmlActions.cpp similarity index 98% rename from Source/Contents/MonsterXmlActions.cpp rename to Source/Contents/Monster/MonsterXmlActions.cpp index 4e4b56ae7..cc1b909d5 100644 --- a/Source/Contents/MonsterXmlActions.cpp +++ b/Source/Contents/Monster/MonsterXmlActions.cpp @@ -1,5 +1,5 @@ #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include #include diff --git a/Source/Contents/ActorMovementRoute.cpp b/Source/Contents/Movement/ActorMovementRoute.cpp similarity index 97% rename from Source/Contents/ActorMovementRoute.cpp rename to Source/Contents/Movement/ActorMovementRoute.cpp index 5162e4203..969778835 100644 --- a/Source/Contents/ActorMovementRoute.cpp +++ b/Source/Contents/Movement/ActorMovementRoute.cpp @@ -1,7 +1,7 @@ #include "Client/Replay.h" #include "Client/Session.h" #include "Contents/Actors/GameActor.h" -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/TerrainPathSearch.h" // GLOBAL: gl_24733 CPathFinder g_pathFinder; diff --git a/Source/Contents/MovementRoute.cpp b/Source/Contents/Movement/MovementRoute.cpp similarity index 98% rename from Source/Contents/MovementRoute.cpp rename to Source/Contents/Movement/MovementRoute.cpp index ca9a769b6..b7fdadaae 100644 --- a/Source/Contents/MovementRoute.cpp +++ b/Source/Contents/Movement/MovementRoute.cpp @@ -1,4 +1,4 @@ -#include "Contents/MovementRouteInterpolation.h" +#include "Contents/Movement/MovementRouteInterpolation.h" #include "Utility/Math/AffineMatrix.h" // OFFSET: 0x00AD7F70 diff --git a/Source/Contents/MovementRouteInterpolation.cpp b/Source/Contents/Movement/MovementRouteInterpolation.cpp similarity index 97% rename from Source/Contents/MovementRouteInterpolation.cpp rename to Source/Contents/Movement/MovementRouteInterpolation.cpp index e3e601a4b..94a928c8c 100644 --- a/Source/Contents/MovementRouteInterpolation.cpp +++ b/Source/Contents/Movement/MovementRouteInterpolation.cpp @@ -1,4 +1,4 @@ -#include "Contents/MovementRouteInterpolation.h" +#include "Contents/Movement/MovementRouteInterpolation.h" // OFFSET: 0x00AD92C0 // FUNCTION: fn_17876 diff --git a/Source/Contents/MovementRouteInterpolation.h b/Source/Contents/Movement/MovementRouteInterpolation.h similarity index 91% rename from Source/Contents/MovementRouteInterpolation.h rename to Source/Contents/Movement/MovementRouteInterpolation.h index e7c78c554..9065651c2 100644 --- a/Source/Contents/MovementRouteInterpolation.h +++ b/Source/Contents/Movement/MovementRouteInterpolation.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_MOVEMENTROUTEINTERPOLATION_H -#define RAGNAROK_SOURCE_CONTENTS_MOVEMENTROUTEINTERPOLATION_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MOVEMENT_MOVEMENTROUTEINTERPOLATION_H +#define RAGNAROK_SOURCE_CONTENTS_MOVEMENT_MOVEMENTROUTEINTERPOLATION_H #include #include diff --git a/Source/Contents/MovementTraversal.cpp b/Source/Contents/Movement/MovementTraversal.cpp similarity index 94% rename from Source/Contents/MovementTraversal.cpp rename to Source/Contents/Movement/MovementTraversal.cpp index 9fb62348d..61dd3e1b2 100644 --- a/Source/Contents/MovementTraversal.cpp +++ b/Source/Contents/Movement/MovementTraversal.cpp @@ -1,4 +1,4 @@ -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/TerrainPathSearch.h" // OFFSET: 0x00AD9550 // FUNCTION: fn_17879 diff --git a/Source/Contents/Pathfinding.cpp b/Source/Contents/Movement/Pathfinding.cpp similarity index 91% rename from Source/Contents/Pathfinding.cpp rename to Source/Contents/Movement/Pathfinding.cpp index 1f152b8ba..04bdbfe20 100644 --- a/Source/Contents/Pathfinding.cpp +++ b/Source/Contents/Movement/Pathfinding.cpp @@ -1,4 +1,4 @@ -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/TerrainPathSearch.h" #include "Resource/World/TerrainResource.h" // OFFSET: 0x00AD85A0 diff --git a/Source/Contents/TerrainPathSearch.cpp b/Source/Contents/Movement/TerrainPathSearch.cpp similarity index 99% rename from Source/Contents/TerrainPathSearch.cpp rename to Source/Contents/Movement/TerrainPathSearch.cpp index c4552e46f..7f096cc3c 100644 --- a/Source/Contents/TerrainPathSearch.cpp +++ b/Source/Contents/Movement/TerrainPathSearch.cpp @@ -1,4 +1,4 @@ -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/TerrainPathSearch.h" #include "Resource/World/TerrainResource.h" #include #include diff --git a/Source/Contents/TerrainPathSearch.h b/Source/Contents/Movement/TerrainPathSearch.h similarity index 91% rename from Source/Contents/TerrainPathSearch.h rename to Source/Contents/Movement/TerrainPathSearch.h index 3d3f1b1f4..c2256da0d 100644 --- a/Source/Contents/TerrainPathSearch.h +++ b/Source/Contents/Movement/TerrainPathSearch.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_TERRAINPATHSEARCH_H -#define RAGNAROK_SOURCE_CONTENTS_TERRAINPATHSEARCH_H +#ifndef RAGNAROK_SOURCE_CONTENTS_MOVEMENT_TERRAINPATHSEARCH_H +#define RAGNAROK_SOURCE_CONTENTS_MOVEMENT_TERRAINPATHSEARCH_H -#include "Contents/MovementRouteInterpolation.h" +#include "Contents/Movement/MovementRouteInterpolation.h" #include "Resource/World/TerrainResource.h" #include diff --git a/Source/Contents/NavigationCandidates.cpp b/Source/Contents/Navigation/NavigationCandidates.cpp similarity index 95% rename from Source/Contents/NavigationCandidates.cpp rename to Source/Contents/Navigation/NavigationCandidates.cpp index eaba8aecc..83d5f39a5 100644 --- a/Source/Contents/NavigationCandidates.cpp +++ b/Source/Contents/Navigation/NavigationCandidates.cpp @@ -1,8 +1,8 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/ResourceMgr.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/NavigationDestinations.cpp b/Source/Contents/Navigation/NavigationDestinations.cpp similarity index 96% rename from Source/Contents/NavigationDestinations.cpp rename to Source/Contents/Navigation/NavigationDestinations.cpp index f074e2ede..d275e2f12 100644 --- a/Source/Contents/NavigationDestinations.cpp +++ b/Source/Contents/Navigation/NavigationDestinations.cpp @@ -1,4 +1,4 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include diff --git a/Source/Contents/NavigationGraph.cpp b/Source/Contents/Navigation/NavigationGraph.cpp similarity index 98% rename from Source/Contents/NavigationGraph.cpp rename to Source/Contents/Navigation/NavigationGraph.cpp index 2e830ddbe..cc7b2076c 100644 --- a/Source/Contents/NavigationGraph.cpp +++ b/Source/Contents/Navigation/NavigationGraph.cpp @@ -1,4 +1,4 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" // OFFSET: 0x00B89990 // FUNCTION: fn_19390 diff --git a/Source/Contents/NavigationLink.cpp b/Source/Contents/Navigation/NavigationLink.cpp similarity index 99% rename from Source/Contents/NavigationLink.cpp rename to Source/Contents/Navigation/NavigationLink.cpp index 676e7c726..c963c83ff 100644 --- a/Source/Contents/NavigationLink.cpp +++ b/Source/Contents/Navigation/NavigationLink.cpp @@ -1,4 +1,4 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" // OFFSET: 0x00B8D8D0 // FUNCTION: fn_19436 diff --git a/Source/Contents/NavigationManager.h b/Source/Contents/Navigation/NavigationManager.h similarity index 98% rename from Source/Contents/NavigationManager.h rename to Source/Contents/Navigation/NavigationManager.h index 800aba37d..3c8bd7caa 100644 --- a/Source/Contents/NavigationManager.h +++ b/Source/Contents/Navigation/NavigationManager.h @@ -1,8 +1,8 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_NAVIGATIONMANAGER_H -#define RAGNAROK_SOURCE_CONTENTS_NAVIGATIONMANAGER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_NAVIGATION_NAVIGATIONMANAGER_H +#define RAGNAROK_SOURCE_CONTENTS_NAVIGATION_NAVIGATIONMANAGER_H -#include "Contents/MovementRouteInterpolation.h" -#include "Contents/TerrainPathSearch.h" +#include "Contents/Movement/MovementRouteInterpolation.h" +#include "Contents/Movement/TerrainPathSearch.h" #include #include diff --git a/Source/Contents/NavigationRequest.cpp b/Source/Contents/Navigation/NavigationRequest.cpp similarity index 99% rename from Source/Contents/NavigationRequest.cpp rename to Source/Contents/Navigation/NavigationRequest.cpp index cb7add2e6..0a301fe0f 100644 --- a/Source/Contents/NavigationRequest.cpp +++ b/Source/Contents/Navigation/NavigationRequest.cpp @@ -1,4 +1,4 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Contents/World/World.h" diff --git a/Source/Contents/NavigationRoute.cpp b/Source/Contents/Navigation/NavigationRoute.cpp similarity index 99% rename from Source/Contents/NavigationRoute.cpp rename to Source/Contents/Navigation/NavigationRoute.cpp index c831f416c..ca1b91503 100644 --- a/Source/Contents/NavigationRoute.cpp +++ b/Source/Contents/Navigation/NavigationRoute.cpp @@ -1,8 +1,8 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Utility/Text/FormatString.h" #include "Client/Registry.h" #include "Client/Replay.h" diff --git a/Source/Contents/NavigationSource.cpp b/Source/Contents/Navigation/NavigationSource.cpp similarity index 99% rename from Source/Contents/NavigationSource.cpp rename to Source/Contents/Navigation/NavigationSource.cpp index 223d15e09..35b163f40 100644 --- a/Source/Contents/NavigationSource.cpp +++ b/Source/Contents/Navigation/NavigationSource.cpp @@ -1,4 +1,4 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" diff --git a/Source/Contents/NpcLocationRadius.cpp b/Source/Contents/Navigation/NpcLocationRadius.cpp similarity index 100% rename from Source/Contents/NpcLocationRadius.cpp rename to Source/Contents/Navigation/NpcLocationRadius.cpp diff --git a/Source/Contents/WorldNavigation.cpp b/Source/Contents/Navigation/WorldNavigation.cpp similarity index 91% rename from Source/Contents/WorldNavigation.cpp rename to Source/Contents/Navigation/WorldNavigation.cpp index 7e47be6c5..f811d8bb7 100644 --- a/Source/Contents/WorldNavigation.cpp +++ b/Source/Contents/Navigation/WorldNavigation.cpp @@ -1,8 +1,8 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/NavigationManager.h" -#include "Contents/TerrainPathSearch.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Movement/TerrainPathSearch.h" #include "Contents/World/World.h" #include diff --git a/Source/Contents/Party/PartyBookingMgr.cpp b/Source/Contents/Party/PartyBookingMgr.cpp index cfefee46c..4e27cb705 100644 --- a/Source/Contents/Party/PartyBookingMgr.cpp +++ b/Source/Contents/Party/PartyBookingMgr.cpp @@ -3,7 +3,7 @@ #include "Contents/Party/PartyBookingMgr.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Sound/SoundMgr.h" #include "UI/Window/UISeekPartyListWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Party/PartyInfoCompletion.cpp b/Source/Contents/Party/PartyInfoCompletion.cpp index bf2fd574d..ceb98e598 100644 --- a/Source/Contents/Party/PartyInfoCompletion.cpp +++ b/Source/Contents/Party/PartyInfoCompletion.cpp @@ -6,7 +6,7 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Utility/Async/AsyncDiagnostic.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Party/UIAdvenPartyBoardWnd.h" #include "UI/Party/UIApplyForPartyWnd.h" #include "UI/Window/UINewSelectCharWnd.h" diff --git a/Source/Contents/Party/PartyJoinResult.cpp b/Source/Contents/Party/PartyJoinResult.cpp index 1c4c4c170..3b9ff3e0a 100644 --- a/Source/Contents/Party/PartyJoinResult.cpp +++ b/Source/Contents/Party/PartyJoinResult.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIEnums.h" #include "Client/Session.h" #include "Contents/Party/AdventurerAgencyMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Party/PartyJoinResult.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Party/PartyRegistrationCompletion.cpp b/Source/Contents/Party/PartyRegistrationCompletion.cpp index 867ae2c06..329aa0cb3 100644 --- a/Source/Contents/Party/PartyRegistrationCompletion.cpp +++ b/Source/Contents/Party/PartyRegistrationCompletion.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Utility/Async/AsyncDiagnostic.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Window/UIWindow.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Party/StopRecruitingCompletion.cpp b/Source/Contents/Party/StopRecruitingCompletion.cpp index c71fb8ae1..35a3af311 100644 --- a/Source/Contents/Party/StopRecruitingCompletion.cpp +++ b/Source/Contents/Party/StopRecruitingCompletion.cpp @@ -3,7 +3,7 @@ #include "Client/Session.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Utility/Async/AsyncDiagnostic.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Party/UIAdvenPartyBoardWnd.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Actors/PetEnums.h b/Source/Contents/Pet/PetEnums.h similarity index 77% rename from Source/Contents/Actors/PetEnums.h rename to Source/Contents/Pet/PetEnums.h index ac931e2e3..3e72920e6 100644 --- a/Source/Contents/Actors/PetEnums.h +++ b/Source/Contents/Pet/PetEnums.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_PETENUMS_H -#define RAGNAROK_SOURCE_CONTENTS_ACTORS_PETENUMS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_PET_PETENUMS_H +#define RAGNAROK_SOURCE_CONTENTS_PET_PETENUMS_H enum PETTALKACTION : int { PM_FEEDING = 0, diff --git a/Source/Contents/PetEvolutionMgr.cpp b/Source/Contents/Pet/PetEvolutionMgr.cpp similarity index 99% rename from Source/Contents/PetEvolutionMgr.cpp rename to Source/Contents/Pet/PetEvolutionMgr.cpp index 1253fea27..b8d49d695 100644 --- a/Source/Contents/PetEvolutionMgr.cpp +++ b/Source/Contents/Pet/PetEvolutionMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/PetEvolutionMgr.h" +#include "Contents/Pet/PetEvolutionMgr.h" #include "Client/Session.h" #include "Script/NLuaState.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/PetEvolutionMgr.h b/Source/Contents/Pet/PetEvolutionMgr.h similarity index 92% rename from Source/Contents/PetEvolutionMgr.h rename to Source/Contents/Pet/PetEvolutionMgr.h index 878859832..791fa1866 100644 --- a/Source/Contents/PetEvolutionMgr.h +++ b/Source/Contents/Pet/PetEvolutionMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_PETEVOLUTIONMGR_H -#define RAGNAROK_SOURCE_CONTENTS_PETEVOLUTIONMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_PET_PETEVOLUTIONMGR_H +#define RAGNAROK_SOURCE_CONTENTS_PET_PETEVOLUTIONMGR_H #include #include diff --git a/Source/Contents/PetStatus.cpp b/Source/Contents/Pet/PetStatus.cpp similarity index 99% rename from Source/Contents/PetStatus.cpp rename to Source/Contents/Pet/PetStatus.cpp index 03614532e..ff59795d4 100644 --- a/Source/Contents/PetStatus.cpp +++ b/Source/Contents/Pet/PetStatus.cpp @@ -1,6 +1,6 @@ #include "Client/Session.h" #include "Script/LuaScript.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include // OFFSET: 0x00E0ADC0 diff --git a/Source/Contents/PetStrings.cpp b/Source/Contents/Pet/PetStrings.cpp similarity index 100% rename from Source/Contents/PetStrings.cpp rename to Source/Contents/Pet/PetStrings.cpp diff --git a/Source/Contents/PetTalk.cpp b/Source/Contents/Pet/PetTalk.cpp similarity index 96% rename from Source/Contents/PetTalk.cpp rename to Source/Contents/Pet/PetTalk.cpp index 5c24657bb..a643d6db9 100644 --- a/Source/Contents/PetTalk.cpp +++ b/Source/Contents/Pet/PetTalk.cpp @@ -1,6 +1,6 @@ #include "Client/Session.h" -#include "Contents/Actors/PetEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Pet/PetEnums.h" +#include "Contents/Tables/MessageTable.h" #include #include diff --git a/Source/Contents/PetTalkNames.cpp b/Source/Contents/Pet/PetTalkNames.cpp similarity index 100% rename from Source/Contents/PetTalkNames.cpp rename to Source/Contents/Pet/PetTalkNames.cpp diff --git a/Source/Contents/RenewQuestMgr.cpp b/Source/Contents/Quest/RenewQuestMgr.cpp similarity index 99% rename from Source/Contents/RenewQuestMgr.cpp rename to Source/Contents/Quest/RenewQuestMgr.cpp index 301ed1855..17dd44301 100644 --- a/Source/Contents/RenewQuestMgr.cpp +++ b/Source/Contents/Quest/RenewQuestMgr.cpp @@ -1,7 +1,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Contents/RenewQuestMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Quest/RenewQuestMgr.h" +#include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Contents/RenewQuestMgr.h b/Source/Contents/Quest/RenewQuestMgr.h similarity index 97% rename from Source/Contents/RenewQuestMgr.h rename to Source/Contents/Quest/RenewQuestMgr.h index 40f968b62..91788b7d4 100644 --- a/Source/Contents/RenewQuestMgr.h +++ b/Source/Contents/Quest/RenewQuestMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_RENEWQUESTMGR_H -#define RAGNAROK_SOURCE_CONTENTS_RENEWQUESTMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_QUEST_RENEWQUESTMGR_H +#define RAGNAROK_SOURCE_CONTENTS_QUEST_RENEWQUESTMGR_H #include #include diff --git a/Source/Contents/ReputeMgr.cpp b/Source/Contents/Repute/ReputeMgr.cpp similarity index 99% rename from Source/Contents/ReputeMgr.cpp rename to Source/Contents/Repute/ReputeMgr.cpp index ab9a9b809..a84fa1ce0 100644 --- a/Source/Contents/ReputeMgr.cpp +++ b/Source/Contents/Repute/ReputeMgr.cpp @@ -1,9 +1,9 @@ -#include "Contents/ReputeMgr.h" +#include "Contents/Repute/ReputeMgr.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Application/ErrorDialog.h" #include "Render/DeviceContext/DCSurface.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "Network/TextEncoding.h" #include "UI/Window/UIWindow.h" diff --git a/Source/Contents/ReputeMgr.h b/Source/Contents/Repute/ReputeMgr.h similarity index 94% rename from Source/Contents/ReputeMgr.h rename to Source/Contents/Repute/ReputeMgr.h index 36e3ec01d..2de84fd1c 100644 --- a/Source/Contents/ReputeMgr.h +++ b/Source/Contents/Repute/ReputeMgr.h @@ -1,7 +1,7 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_REPUTEMGR_H -#define RAGNAROK_SOURCE_CONTENTS_REPUTEMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_REPUTE_REPUTEMGR_H +#define RAGNAROK_SOURCE_CONTENTS_REPUTE_REPUTEMGR_H -#include "Contents/ReputeRecords.h" +#include "Contents/Repute/ReputeRecords.h" #include "Script/LuaInstance.h" #include "Utility/Singleton.h" diff --git a/Source/Contents/ReputeRecords.h b/Source/Contents/Repute/ReputeRecords.h similarity index 81% rename from Source/Contents/ReputeRecords.h rename to Source/Contents/Repute/ReputeRecords.h index 14ac1dc56..5c4bda879 100644 --- a/Source/Contents/ReputeRecords.h +++ b/Source/Contents/Repute/ReputeRecords.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_REPUTERECORDS_H -#define RAGNAROK_SOURCE_CONTENTS_REPUTERECORDS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_REPUTE_REPUTERECORDS_H +#define RAGNAROK_SOURCE_CONTENTS_REPUTE_REPUTERECORDS_H #include #include diff --git a/Source/Contents/RodexMailStore.cpp b/Source/Contents/Rodex/RodexMailStore.cpp similarity index 97% rename from Source/Contents/RodexMailStore.cpp rename to Source/Contents/Rodex/RodexMailStore.cpp index 5a62beadd..869a167d8 100644 --- a/Source/Contents/RodexMailStore.cpp +++ b/Source/Contents/Rodex/RodexMailStore.cpp @@ -1,4 +1,4 @@ -#include "Contents/RodexMailStore.h" +#include "Contents/Rodex/RodexMailStore.h" #include diff --git a/Source/Contents/RodexMailStore.h b/Source/Contents/Rodex/RodexMailStore.h similarity index 95% rename from Source/Contents/RodexMailStore.h rename to Source/Contents/Rodex/RodexMailStore.h index 57b05171c..e4e29f000 100644 --- a/Source/Contents/RodexMailStore.h +++ b/Source/Contents/Rodex/RodexMailStore.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_RODEXMAILSTORE_H -#define RAGNAROK_SOURCE_CONTENTS_RODEXMAILSTORE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_RODEX_RODEXMAILSTORE_H +#define RAGNAROK_SOURCE_CONTENTS_RODEX_RODEXMAILSTORE_H #include #include diff --git a/Source/Contents/Items/RuneSystem.cpp b/Source/Contents/RuneSystem/RuneSystem.cpp similarity index 99% rename from Source/Contents/Items/RuneSystem.cpp rename to Source/Contents/RuneSystem/RuneSystem.cpp index a4c28c27f..89bea29e6 100644 --- a/Source/Contents/Items/RuneSystem.cpp +++ b/Source/Contents/RuneSystem/RuneSystem.cpp @@ -1,4 +1,4 @@ -#include "Contents/Items/RuneSystem.h" +#include "Contents/RuneSystem/RuneSystem.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Session.h" #include "Contents/Items/ItemInfo.h" diff --git a/Source/Contents/Items/RuneSystem.h b/Source/Contents/RuneSystem/RuneSystem.h similarity index 98% rename from Source/Contents/Items/RuneSystem.h rename to Source/Contents/RuneSystem/RuneSystem.h index 7da79021a..8f7a4f3f3 100644 --- a/Source/Contents/Items/RuneSystem.h +++ b/Source/Contents/RuneSystem/RuneSystem.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ITEMS_RUNESYSTEM_H -#define RAGNAROK_SOURCE_CONTENTS_ITEMS_RUNESYSTEM_H +#ifndef RAGNAROK_SOURCE_CONTENTS_RUNESYSTEM_RUNESYSTEM_H +#define RAGNAROK_SOURCE_CONTENTS_RUNESYSTEM_RUNESYSTEM_H #include #include diff --git a/Source/Contents/Schedule/CaptchaUploadSchedule.cpp b/Source/Contents/Schedule/CaptchaUploadSchedule.cpp index 44965dc8f..7d99300e0 100644 --- a/Source/Contents/Schedule/CaptchaUploadSchedule.cpp +++ b/Source/Contents/Schedule/CaptchaUploadSchedule.cpp @@ -1,6 +1,6 @@ #include "Contents/Schedule/CaptchaUploadSchedule.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Events/ShowRankingScheduler.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/Contents/Schedule/CheckGDISchedule.cpp b/Source/Contents/Schedule/CheckGDISchedule.cpp index becc17b29..9ec906963 100644 --- a/Source/Contents/Schedule/CheckGDISchedule.cpp +++ b/Source/Contents/Schedule/CheckGDISchedule.cpp @@ -3,8 +3,8 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Events/ShowRankingScheduler.h" #include "Network/Connection/Connection.h" #include "Network/Connection/ConnectionRuntime.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Schedule/EmotionSchedule.cpp b/Source/Contents/Schedule/EmotionSchedule.cpp index 34cf910f6..22d83d605 100644 --- a/Source/Contents/Schedule/EmotionSchedule.cpp +++ b/Source/Contents/Schedule/EmotionSchedule.cpp @@ -1,7 +1,7 @@ #include "Contents/Schedule/EmotionSchedule.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#include "Contents/Events/ShowRankingScheduler.h" #include "UI/CashEmotion/UICashEmotionListWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/Schedule/PartialShutDownSchedule.cpp b/Source/Contents/Schedule/PartialShutDownSchedule.cpp index 1b6a3f244..985813468 100644 --- a/Source/Contents/Schedule/PartialShutDownSchedule.cpp +++ b/Source/Contents/Schedule/PartialShutDownSchedule.cpp @@ -2,8 +2,8 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Events/ShowRankingScheduler.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Timestamp.h" diff --git a/Source/Contents/Schedule/ShutDownSchedule.cpp b/Source/Contents/Schedule/ShutDownSchedule.cpp index 4a04af0ff..609e62118 100644 --- a/Source/Contents/Schedule/ShutDownSchedule.cpp +++ b/Source/Contents/Schedule/ShutDownSchedule.cpp @@ -2,7 +2,7 @@ #include "Contents/Schedule/ShutDownSchedule.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Window/UIWindowMgr.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Contents/Schedule/TimeScheduler.cpp b/Source/Contents/Schedule/TimeScheduler.cpp index 838765bff..3959a3e16 100644 --- a/Source/Contents/Schedule/TimeScheduler.cpp +++ b/Source/Contents/Schedule/TimeScheduler.cpp @@ -1,5 +1,5 @@ #include "Contents/Schedule/TimeScheduler.h" -#include "Contents/ShowRankingScheduler.h" +#include "Contents/Events/ShowRankingScheduler.h" #include diff --git a/Source/Contents/Skills/ClientSkills.cpp b/Source/Contents/Skills/ClientSkills.cpp index 9789113e2..242a250fe 100644 --- a/Source/Contents/Skills/ClientSkills.cpp +++ b/Source/Contents/Skills/ClientSkills.cpp @@ -6,12 +6,12 @@ #include "Client/Application/ErrorDialog.h" #include "Client/Session.h" #include "Contents/Actors/RenderObject.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/ClientState.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Jobs/JobId.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/MapPropertyMgr.h" +#include "Contents/Map/MapPropertyMgr.h" #include "Contents/World/World.h" #include "File/File.h" #include "Network/TextEncoding.h" diff --git a/Source/Contents/Actors/GraffiSkill.cpp b/Source/Contents/Skills/GraffiSkill.cpp similarity index 99% rename from Source/Contents/Actors/GraffiSkill.cpp rename to Source/Contents/Skills/GraffiSkill.cpp index e59ef77c8..3721d02c3 100644 --- a/Source/Contents/Actors/GraffiSkill.cpp +++ b/Source/Contents/Skills/GraffiSkill.cpp @@ -1,4 +1,4 @@ -#include "Contents/Actors/GraffiSkill.h" +#include "Contents/Skills/GraffiSkill.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" diff --git a/Source/Contents/Actors/GraffiSkill.h b/Source/Contents/Skills/GraffiSkill.h similarity index 90% rename from Source/Contents/Actors/GraffiSkill.h rename to Source/Contents/Skills/GraffiSkill.h index 0b563a1dd..1f0f13f83 100644 --- a/Source/Contents/Actors/GraffiSkill.h +++ b/Source/Contents/Skills/GraffiSkill.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_ACTORS_GRAFFISKILL_H -#define RAGNAROK_SOURCE_CONTENTS_ACTORS_GRAFFISKILL_H +#ifndef RAGNAROK_SOURCE_CONTENTS_SKILLS_GRAFFISKILL_H +#define RAGNAROK_SOURCE_CONTENTS_SKILLS_GRAFFISKILL_H #include "Contents/Actors/Skill.h" diff --git a/Source/Contents/Skills/SkillActionAlitea.cpp b/Source/Contents/Skills/SkillActionAlitea.cpp index 00121409e..e3cf990db 100644 --- a/Source/Contents/Skills/SkillActionAlitea.cpp +++ b/Source/Contents/Skills/SkillActionAlitea.cpp @@ -5,13 +5,13 @@ #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionDruid.cpp b/Source/Contents/Skills/SkillActionDruid.cpp index f6b37cec6..30f489422 100644 --- a/Source/Contents/Skills/SkillActionDruid.cpp +++ b/Source/Contents/Skills/SkillActionDruid.cpp @@ -4,14 +4,14 @@ #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/BezierArcThrowEffect.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Skills/BezierArcThrowEffect.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionImperialGuard.cpp b/Source/Contents/Skills/SkillActionImperialGuard.cpp index 652ab26ac..c4e8aa351 100644 --- a/Source/Contents/Skills/SkillActionImperialGuard.cpp +++ b/Source/Contents/Skills/SkillActionImperialGuard.cpp @@ -3,12 +3,12 @@ #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/World/World.h" diff --git a/Source/Contents/Skills/SkillActionInfo.cpp b/Source/Contents/Skills/SkillActionInfo.cpp index 19c3cdfce..214f43f40 100644 --- a/Source/Contents/Skills/SkillActionInfo.cpp +++ b/Source/Contents/Skills/SkillActionInfo.cpp @@ -1,7 +1,7 @@ #include "Client/Session.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Skills/SkillId.h" #include "Contents/Skills/SkillInfo.h" diff --git a/Source/Contents/Skills/SkillActionKarnos.cpp b/Source/Contents/Skills/SkillActionKarnos.cpp index c25f734c0..0b7f103d4 100644 --- a/Source/Contents/Skills/SkillActionKarnos.cpp +++ b/Source/Contents/Skills/SkillActionKarnos.cpp @@ -3,15 +3,15 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/BezierArcThrowEffect.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/WhirlwindEffect.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Skills/BezierArcThrowEffect.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Skills/WhirlwindEffect.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionMeister.cpp b/Source/Contents/Skills/SkillActionMeister.cpp index 775928989..3380ca9df 100644 --- a/Source/Contents/Skills/SkillActionMeister.cpp +++ b/Source/Contents/Skills/SkillActionMeister.cpp @@ -5,12 +5,12 @@ #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionNightWatch.cpp b/Source/Contents/Skills/SkillActionNightWatch.cpp index a9e0f3160..d4ae8ca21 100644 --- a/Source/Contents/Skills/SkillActionNightWatch.cpp +++ b/Source/Contents/Skills/SkillActionNightWatch.cpp @@ -4,12 +4,12 @@ #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Math/AffineMatrix.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp index 09c3e2953..4b0631272 100644 --- a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp +++ b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp @@ -1,16 +1,16 @@ #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Camera/Camera.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Math/Vector3d.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Skills/SkillActionSkyEmperor.cpp b/Source/Contents/Skills/SkillActionSkyEmperor.cpp index 4ec904d25..56249f0a8 100644 --- a/Source/Contents/Skills/SkillActionSkyEmperor.cpp +++ b/Source/Contents/Skills/SkillActionSkyEmperor.cpp @@ -1,8 +1,8 @@ #include "Contents/Actors/GameActor.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionSoulAscetic.cpp b/Source/Contents/Skills/SkillActionSoulAscetic.cpp index d446e982a..921422b6f 100644 --- a/Source/Contents/Skills/SkillActionSoulAscetic.cpp +++ b/Source/Contents/Skills/SkillActionSoulAscetic.cpp @@ -1,10 +1,10 @@ #include "Contents/Actors/GameActor.h" #include "Contents/Actors/ActorEnums.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/TalismanMarkEffect.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Skills/TalismanMarkEffect.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionSpiritHandler.cpp b/Source/Contents/Skills/SkillActionSpiritHandler.cpp index d31dc18dc..659934fb1 100644 --- a/Source/Contents/Skills/SkillActionSpiritHandler.cpp +++ b/Source/Contents/Skills/SkillActionSpiritHandler.cpp @@ -2,11 +2,11 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Contents/Skills/SkillActionTroubadour.cpp b/Source/Contents/Skills/SkillActionTroubadour.cpp index 72881b1f1..2f92c6f16 100644 --- a/Source/Contents/Skills/SkillActionTroubadour.cpp +++ b/Source/Contents/Skills/SkillActionTroubadour.cpp @@ -2,12 +2,12 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillInfo.h" #include "Utility/Math/Vector3d.h" diff --git a/Source/Contents/Skills/SkillActionWindHawk.cpp b/Source/Contents/Skills/SkillActionWindHawk.cpp index 252c704e4..a0f76bc55 100644 --- a/Source/Contents/Skills/SkillActionWindHawk.cpp +++ b/Source/Contents/Skills/SkillActionWindHawk.cpp @@ -2,11 +2,11 @@ #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/GameActor.h" #include "Contents/Camera/Camera.h" -#include "Contents/EffectResourceSwitcher.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/Effect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/EffectResourceSwitcher.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/Effect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillInfo.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/Contents/Skills/SkillInfo.cpp b/Source/Contents/Skills/SkillInfo.cpp index d64772e00..0782b901b 100644 --- a/Source/Contents/Skills/SkillInfo.cpp +++ b/Source/Contents/Skills/SkillInfo.cpp @@ -5,16 +5,16 @@ #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EffectResourceSwitcher.h" +#include "Contents/Effects/EffectResourceSwitcher.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/ChargingPierceEffect.h" -#include "Contents/Effects/EffectActor.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectPrimitiveState.h" -#include "Contents/Effects/EZ2STREffectEx.h" -#include "Contents/Effects/RagEffect.h" -#include "Contents/Effects/ShowEffect.h" -#include "Contents/MessageTable.h" +#include "Contents/Effects/Skills/ChargingPierceEffect.h" +#include "Contents/Effects/Core/EffectActor.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Primitives/EffectPrimitiveState.h" +#include "Contents/Effects/Particles/EZ2STREffectEx.h" +#include "Contents/Effects/Core/RagEffect.h" +#include "Contents/Effects/Core/ShowEffect.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/SkillId.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Sound/SoundMgr.h" diff --git a/Source/Contents/SkinCatalog.cpp b/Source/Contents/Skin/SkinCatalog.cpp similarity index 98% rename from Source/Contents/SkinCatalog.cpp rename to Source/Contents/Skin/SkinCatalog.cpp index 8e7560eab..03ea4c9f5 100644 --- a/Source/Contents/SkinCatalog.cpp +++ b/Source/Contents/Skin/SkinCatalog.cpp @@ -1,4 +1,4 @@ -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Network/TextEncoding.h" #include "Utility/Text/GroupedInteger.h" diff --git a/Source/Contents/SkinInfo.cpp b/Source/Contents/Skin/SkinInfo.cpp similarity index 98% rename from Source/Contents/SkinInfo.cpp rename to Source/Contents/Skin/SkinInfo.cpp index 46bb785f9..b3e3fea44 100644 --- a/Source/Contents/SkinInfo.cpp +++ b/Source/Contents/Skin/SkinInfo.cpp @@ -1,4 +1,4 @@ -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Resource/ResourceMgr.h" #include diff --git a/Source/Contents/SkinMgr.cpp b/Source/Contents/Skin/SkinMgr.cpp similarity index 93% rename from Source/Contents/SkinMgr.cpp rename to Source/Contents/Skin/SkinMgr.cpp index edf0e3ff0..d027a3dce 100644 --- a/Source/Contents/SkinMgr.cpp +++ b/Source/Contents/Skin/SkinMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "File/DirectoryRemoval.h" #include diff --git a/Source/Contents/SkinMgr.h b/Source/Contents/Skin/SkinMgr.h similarity index 88% rename from Source/Contents/SkinMgr.h rename to Source/Contents/Skin/SkinMgr.h index 7ece54b53..bdb41ab17 100644 --- a/Source/Contents/SkinMgr.h +++ b/Source/Contents/Skin/SkinMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SKINMGR_H -#define RAGNAROK_SOURCE_CONTENTS_SKINMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_SKIN_SKINMGR_H +#define RAGNAROK_SOURCE_CONTENTS_SKIN_SKINMGR_H #include "Client/Application/Launcher.h" diff --git a/Source/Contents/HitSounds.cpp b/Source/Contents/Sound/HitSounds.cpp similarity index 100% rename from Source/Contents/HitSounds.cpp rename to Source/Contents/Sound/HitSounds.cpp diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index b30aeb60c..f2a7d21cf 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -9,10 +9,10 @@ #include "Contents/Actors/MercenaryAI.h" #include "Contents/Actors/Npc.h" #include "Contents/Actors/Pc.h" -#include "Contents/Effects/MsgEffect.h" +#include "Contents/Effects/Core/MsgEffect.h" #include "Contents/Ground/GroundGeometry.h" -#include "Contents/MessageTable.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" diff --git a/Source/Contents/SpriteLayerOrder.h b/Source/Contents/SpriteLayerOrder.h deleted file mode 100644 index c3e780ca7..000000000 --- a/Source/Contents/SpriteLayerOrder.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITELAYERORDER_H -#define RAGNAROK_SOURCE_CONTENTS_SPRITELAYERORDER_H - -class CImfRes; - -int GetSpriteLayerOrder(CImfRes* imfRes, int layer, int baseAction, int action, int motion); - -#endif diff --git a/Source/Contents/SpriteRidingPolicy.h b/Source/Contents/SpriteRidingPolicy.h deleted file mode 100644 index 1a86019cc..000000000 --- a/Source/Contents/SpriteRidingPolicy.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITERIDINGPOLICY_H -#define RAGNAROK_SOURCE_CONTENTS_SPRITERIDINGPOLICY_H - -bool IsIgnoredRidingState(int id, int job, int effectState, bool force); - -#endif diff --git a/Source/Contents/RobeOpacity.cpp b/Source/Contents/Sprites/RobeOpacity.cpp similarity index 100% rename from Source/Contents/RobeOpacity.cpp rename to Source/Contents/Sprites/RobeOpacity.cpp diff --git a/Source/Contents/RobeTopLayer.cpp b/Source/Contents/Sprites/RobeTopLayer.cpp similarity index 100% rename from Source/Contents/RobeTopLayer.cpp rename to Source/Contents/Sprites/RobeTopLayer.cpp diff --git a/Source/Contents/SpriteFrameSynchronization.cpp b/Source/Contents/Sprites/SpriteFrameSynchronization.cpp similarity index 100% rename from Source/Contents/SpriteFrameSynchronization.cpp rename to Source/Contents/Sprites/SpriteFrameSynchronization.cpp diff --git a/Source/Contents/SpriteJob.cpp b/Source/Contents/Sprites/SpriteJob.cpp similarity index 100% rename from Source/Contents/SpriteJob.cpp rename to Source/Contents/Sprites/SpriteJob.cpp diff --git a/Source/Contents/SpriteLayerDepth.cpp b/Source/Contents/Sprites/SpriteLayerDepth.cpp similarity index 100% rename from Source/Contents/SpriteLayerDepth.cpp rename to Source/Contents/Sprites/SpriteLayerDepth.cpp diff --git a/Source/Contents/SpriteLayerDrawing.cpp b/Source/Contents/Sprites/SpriteLayerDrawing.cpp similarity index 99% rename from Source/Contents/SpriteLayerDrawing.cpp rename to Source/Contents/Sprites/SpriteLayerDrawing.cpp index ddb690ff4..489343be0 100644 --- a/Source/Contents/SpriteLayerDrawing.cpp +++ b/Source/Contents/Sprites/SpriteLayerDrawing.cpp @@ -1,4 +1,4 @@ -#include "Contents/SpriteLayerDrawing.h" +#include "Contents/Sprites/SpriteLayerDrawing.h" #include "Contents/Actors/ActorEnums.h" #include "Client/Session.h" @@ -6,11 +6,11 @@ #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Skills/ClientSkills.h" -#include "Contents/SpriteLayerOrder.h" -#include "Contents/SpriteRidingOffset.h" -#include "Contents/SpriteRidingPolicy.h" +#include "Contents/Sprites/SpriteLayerOrder.h" +#include "Contents/Sprites/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingPolicy.h" #include "Render/Renderer.h" #include "Render/SpriteGeometry.h" #include "Resource/ImfResource.h" diff --git a/Source/Contents/SpriteLayerDrawing.h b/Source/Contents/Sprites/SpriteLayerDrawing.h similarity index 96% rename from Source/Contents/SpriteLayerDrawing.h rename to Source/Contents/Sprites/SpriteLayerDrawing.h index 7e60f9986..34f7785d9 100644 --- a/Source/Contents/SpriteLayerDrawing.h +++ b/Source/Contents/Sprites/SpriteLayerDrawing.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITELAYERDRAWING_H -#define RAGNAROK_SOURCE_CONTENTS_SPRITELAYERDRAWING_H +#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITELAYERDRAWING_H +#define RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITELAYERDRAWING_H #include "Contents/Actors/RenderObject.h" #include "Render/SpriteQuad.h" diff --git a/Source/Contents/SpriteLayerOrder.cpp b/Source/Contents/Sprites/SpriteLayerOrder.cpp similarity index 95% rename from Source/Contents/SpriteLayerOrder.cpp rename to Source/Contents/Sprites/SpriteLayerOrder.cpp index 76208f715..6e29763b7 100644 --- a/Source/Contents/SpriteLayerOrder.cpp +++ b/Source/Contents/Sprites/SpriteLayerOrder.cpp @@ -1,4 +1,4 @@ -#include "Contents/SpriteLayerOrder.h" +#include "Contents/Sprites/SpriteLayerOrder.h" #include "Resource/ImfResource.h" // OFFSET: 0x00DAAB00 diff --git a/Source/Contents/Sprites/SpriteLayerOrder.h b/Source/Contents/Sprites/SpriteLayerOrder.h new file mode 100644 index 000000000..1c2e6c8bc --- /dev/null +++ b/Source/Contents/Sprites/SpriteLayerOrder.h @@ -0,0 +1,8 @@ +#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITELAYERORDER_H +#define RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITELAYERORDER_H + +class CImfRes; + +int GetSpriteLayerOrder(CImfRes* imfRes, int layer, int baseAction, int action, int motion); + +#endif diff --git a/Source/Contents/SpriteRidingOffset.cpp b/Source/Contents/Sprites/SpriteRidingOffset.cpp similarity index 91% rename from Source/Contents/SpriteRidingOffset.cpp rename to Source/Contents/Sprites/SpriteRidingOffset.cpp index abce2332c..19327b823 100644 --- a/Source/Contents/SpriteRidingOffset.cpp +++ b/Source/Contents/Sprites/SpriteRidingOffset.cpp @@ -1,5 +1,5 @@ -#include "Contents/SpriteRidingOffset.h" -#include "Contents/EquipmentResourceMgr.h" +#include "Contents/Sprites/SpriteRidingOffset.h" +#include "Contents/Actors/Resources/EquipmentResourceMgr.h" #include "Contents/Jobs/JobNames.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" diff --git a/Source/Contents/SpriteRidingOffset.h b/Source/Contents/Sprites/SpriteRidingOffset.h similarity index 67% rename from Source/Contents/SpriteRidingOffset.h rename to Source/Contents/Sprites/SpriteRidingOffset.h index ecc094073..c26eda3b4 100644 --- a/Source/Contents/SpriteRidingOffset.h +++ b/Source/Contents/Sprites/SpriteRidingOffset.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITERIDINGOFFSET_H -#define RAGNAROK_SOURCE_CONTENTS_SPRITERIDINGOFFSET_H +#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITERIDINGOFFSET_H +#define RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITERIDINGOFFSET_H #include diff --git a/Source/Contents/SpriteRidingPolicy.cpp b/Source/Contents/Sprites/SpriteRidingPolicy.cpp similarity index 91% rename from Source/Contents/SpriteRidingPolicy.cpp rename to Source/Contents/Sprites/SpriteRidingPolicy.cpp index 1b33c2291..b6ec9ece3 100644 --- a/Source/Contents/SpriteRidingPolicy.cpp +++ b/Source/Contents/Sprites/SpriteRidingPolicy.cpp @@ -1,4 +1,4 @@ -#include "Contents/SpriteRidingPolicy.h" +#include "Contents/Sprites/SpriteRidingPolicy.h" #include "Client/Session.h" #include "Contents/Jobs/JobNames.h" #include "Script/LuaScript.h" diff --git a/Source/Contents/Sprites/SpriteRidingPolicy.h b/Source/Contents/Sprites/SpriteRidingPolicy.h new file mode 100644 index 000000000..55237d5a6 --- /dev/null +++ b/Source/Contents/Sprites/SpriteRidingPolicy.h @@ -0,0 +1,6 @@ +#ifndef RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITERIDINGPOLICY_H +#define RAGNAROK_SOURCE_CONTENTS_SPRITES_SPRITERIDINGPOLICY_H + +bool IsIgnoredRidingState(int id, int job, int effectState, bool force); + +#endif diff --git a/Source/Contents/SpriteRobe.cpp b/Source/Contents/Sprites/SpriteRobe.cpp similarity index 100% rename from Source/Contents/SpriteRobe.cpp rename to Source/Contents/Sprites/SpriteRobe.cpp diff --git a/Source/Contents/SpriteRobeCommands.cpp b/Source/Contents/Sprites/SpriteRobeCommands.cpp similarity index 100% rename from Source/Contents/SpriteRobeCommands.cpp rename to Source/Contents/Sprites/SpriteRobeCommands.cpp diff --git a/Source/Contents/SpriteShadow.cpp b/Source/Contents/Sprites/SpriteShadow.cpp similarity index 100% rename from Source/Contents/SpriteShadow.cpp rename to Source/Contents/Sprites/SpriteShadow.cpp diff --git a/Source/Contents/Store/MCStoreInfoBackup.cpp b/Source/Contents/Store/MCStoreInfoBackup.cpp index 14dbdf751..6be48ea32 100644 --- a/Source/Contents/Store/MCStoreInfoBackup.cpp +++ b/Source/Contents/Store/MCStoreInfoBackup.cpp @@ -2,7 +2,7 @@ #include "Contents/UserData/AccountService.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Store/MCStoreInfoBackup.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Session.h" #include "UI/Window/UIWindowMgr.h" #include "Utility/Async/AsyncDiagnostic.h" diff --git a/Source/Contents/ClientXmlTables.cpp b/Source/Contents/Tables/ClientXmlTables.cpp similarity index 100% rename from Source/Contents/ClientXmlTables.cpp rename to Source/Contents/Tables/ClientXmlTables.cpp diff --git a/Source/Contents/ForbiddenWords.cpp b/Source/Contents/Tables/ForbiddenWords.cpp similarity index 99% rename from Source/Contents/ForbiddenWords.cpp rename to Source/Contents/Tables/ForbiddenWords.cpp index 167e3a15b..c19aa4255 100644 --- a/Source/Contents/ForbiddenWords.cpp +++ b/Source/Contents/Tables/ForbiddenWords.cpp @@ -1,4 +1,4 @@ -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "File/CommonObject.h" #include "Network/TextEncoding.h" #include "Utility/StackAlloc.h" diff --git a/Source/Contents/ForbiddenWords.h b/Source/Contents/Tables/ForbiddenWords.h similarity index 77% rename from Source/Contents/ForbiddenWords.h rename to Source/Contents/Tables/ForbiddenWords.h index 4d5eadada..356205259 100644 --- a/Source/Contents/ForbiddenWords.h +++ b/Source/Contents/Tables/ForbiddenWords.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_FORBIDDENWORDS_H -#define RAGNAROK_SOURCE_CONTENTS_FORBIDDENWORDS_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TABLES_FORBIDDENWORDS_H +#define RAGNAROK_SOURCE_CONTENTS_TABLES_FORBIDDENWORDS_H #include #include diff --git a/Source/Contents/MessageTable.cpp b/Source/Contents/Tables/MessageTable.cpp similarity index 99% rename from Source/Contents/MessageTable.cpp rename to Source/Contents/Tables/MessageTable.cpp index f05e26c8a..e859130f2 100644 --- a/Source/Contents/MessageTable.cpp +++ b/Source/Contents/Tables/MessageTable.cpp @@ -1,6 +1,6 @@ #include "Client/Input/InputCharset.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/CommonObject.h" #include "File/File.h" #include "Network/TextEncoding.h" diff --git a/Source/Contents/MessageTable.h b/Source/Contents/Tables/MessageTable.h similarity index 84% rename from Source/Contents/MessageTable.h rename to Source/Contents/Tables/MessageTable.h index 7b46eb5c2..49ad8b8f1 100644 --- a/Source/Contents/MessageTable.h +++ b/Source/Contents/Tables/MessageTable.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_MESSAGETABLE_H -#define RAGNAROK_SOURCE_CONTENTS_MESSAGETABLE_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TABLES_MESSAGETABLE_H +#define RAGNAROK_SOURCE_CONTENTS_TABLES_MESSAGETABLE_H #include #include diff --git a/Source/Contents/SimpleStringMgr.cpp b/Source/Contents/Tables/SimpleStringMgr.cpp similarity index 98% rename from Source/Contents/SimpleStringMgr.cpp rename to Source/Contents/Tables/SimpleStringMgr.cpp index 98db02e96..307f06138 100644 --- a/Source/Contents/SimpleStringMgr.cpp +++ b/Source/Contents/Tables/SimpleStringMgr.cpp @@ -1,4 +1,4 @@ -#include "Contents/SimpleStringMgr.h" +#include "Contents/Tables/SimpleStringMgr.h" #include "File/CommonObject.h" #include "Utility/Text/StringUtil.h" diff --git a/Source/Contents/SimpleStringMgr.h b/Source/Contents/Tables/SimpleStringMgr.h similarity index 91% rename from Source/Contents/SimpleStringMgr.h rename to Source/Contents/Tables/SimpleStringMgr.h index 28547a6ad..712b308a5 100644 --- a/Source/Contents/SimpleStringMgr.h +++ b/Source/Contents/Tables/SimpleStringMgr.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SIMPLESTRINGMGR_H -#define RAGNAROK_SOURCE_CONTENTS_SIMPLESTRINGMGR_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TABLES_SIMPLESTRINGMGR_H +#define RAGNAROK_SOURCE_CONTENTS_TABLES_SIMPLESTRINGMGR_H #include #include diff --git a/Source/Contents/TableMng.cpp b/Source/Contents/Tables/TableMng.cpp similarity index 99% rename from Source/Contents/TableMng.cpp rename to Source/Contents/Tables/TableMng.cpp index bbdf13ed8..0f68b4e00 100644 --- a/Source/Contents/TableMng.cpp +++ b/Source/Contents/Tables/TableMng.cpp @@ -1,4 +1,4 @@ -#include "Contents/TableMng.h" +#include "Contents/Tables/TableMng.h" #include #include diff --git a/Source/Contents/TableMng.h b/Source/Contents/Tables/TableMng.h similarity index 93% rename from Source/Contents/TableMng.h rename to Source/Contents/Tables/TableMng.h index 48ea68606..500f22eee 100644 --- a/Source/Contents/TableMng.h +++ b/Source/Contents/Tables/TableMng.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_TABLEMNG_H -#define RAGNAROK_SOURCE_CONTENTS_TABLEMNG_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TABLES_TABLEMNG_H +#define RAGNAROK_SOURCE_CONTENTS_TABLES_TABLEMNG_H #include #include diff --git a/Source/Contents/TipBoxTitles.cpp b/Source/Contents/Tables/TipBoxTitles.cpp similarity index 99% rename from Source/Contents/TipBoxTitles.cpp rename to Source/Contents/Tables/TipBoxTitles.cpp index 994458bde..2dd21b419 100644 --- a/Source/Contents/TipBoxTitles.cpp +++ b/Source/Contents/Tables/TipBoxTitles.cpp @@ -1,4 +1,4 @@ -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/TipBoxTitles.h" #include "Client/Input/InputCharset.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/TipBoxTitles.h b/Source/Contents/Tables/TipBoxTitles.h similarity index 96% rename from Source/Contents/TipBoxTitles.h rename to Source/Contents/Tables/TipBoxTitles.h index f70606dab..3e8502b3f 100644 --- a/Source/Contents/TipBoxTitles.h +++ b/Source/Contents/Tables/TipBoxTitles.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_TIPBOXTITLES_H -#define RAGNAROK_SOURCE_CONTENTS_TIPBOXTITLES_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TABLES_TIPBOXTITLES_H +#define RAGNAROK_SOURCE_CONTENTS_TABLES_TIPBOXTITLES_H #include #include diff --git a/Source/Contents/TipOfTheDay.cpp b/Source/Contents/Tables/TipOfTheDay.cpp similarity index 98% rename from Source/Contents/TipOfTheDay.cpp rename to Source/Contents/Tables/TipOfTheDay.cpp index a4b7766c5..1efb0b196 100644 --- a/Source/Contents/TipOfTheDay.cpp +++ b/Source/Contents/Tables/TipOfTheDay.cpp @@ -1,4 +1,4 @@ -#include "Contents/TipOfTheDay.h" +#include "Contents/Tables/TipOfTheDay.h" #include "Client/Input/InputCharset.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "File/File.h" diff --git a/Source/Contents/TipOfTheDay.h b/Source/Contents/Tables/TipOfTheDay.h similarity index 82% rename from Source/Contents/TipOfTheDay.h rename to Source/Contents/Tables/TipOfTheDay.h index c4a6c4761..ca2135681 100644 --- a/Source/Contents/TipOfTheDay.h +++ b/Source/Contents/Tables/TipOfTheDay.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_TIPOFTHEDAY_H -#define RAGNAROK_SOURCE_CONTENTS_TIPOFTHEDAY_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TABLES_TIPOFTHEDAY_H +#define RAGNAROK_SOURCE_CONTENTS_TABLES_TIPOFTHEDAY_H #include #include diff --git a/Source/Contents/ClientTiming.cpp b/Source/Contents/Time/ClientTiming.cpp similarity index 99% rename from Source/Contents/ClientTiming.cpp rename to Source/Contents/Time/ClientTiming.cpp index baa0b3068..3176fd321 100644 --- a/Source/Contents/ClientTiming.cpp +++ b/Source/Contents/Time/ClientTiming.cpp @@ -2,10 +2,10 @@ #include "UI/Window/WindowId.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Session.h" -#include "Contents/AchievementMgr.h" +#include "Contents/Achievement/AchievementMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MapInfoMgr.h" -#include "Contents/NavigationManager.h" +#include "Contents/Map/MapInfoMgr.h" +#include "Contents/Navigation/NavigationManager.h" #include "File/CommonObject.h" #include "File/File.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/Contents/ServerTimeManager.cpp b/Source/Contents/Time/ServerTimeManager.cpp similarity index 97% rename from Source/Contents/ServerTimeManager.cpp rename to Source/Contents/Time/ServerTimeManager.cpp index c19465963..e9d5b4e4f 100644 --- a/Source/Contents/ServerTimeManager.cpp +++ b/Source/Contents/Time/ServerTimeManager.cpp @@ -1,4 +1,4 @@ -#include "Contents/ServerTimeManager.h" +#include "Contents/Time/ServerTimeManager.h" #include diff --git a/Source/Contents/ServerTimeManager.h b/Source/Contents/Time/ServerTimeManager.h similarity index 88% rename from Source/Contents/ServerTimeManager.h rename to Source/Contents/Time/ServerTimeManager.h index 89160e0f0..617334756 100644 --- a/Source/Contents/ServerTimeManager.h +++ b/Source/Contents/Time/ServerTimeManager.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_SERVERTIMEMANAGER_H -#define RAGNAROK_SOURCE_CONTENTS_SERVERTIMEMANAGER_H +#ifndef RAGNAROK_SOURCE_CONTENTS_TIME_SERVERTIMEMANAGER_H +#define RAGNAROK_SOURCE_CONTENTS_TIME_SERVERTIMEMANAGER_H #include "Utility/Singleton.h" diff --git a/Source/Contents/UserData/NormalItemSlots.cpp b/Source/Contents/UserData/NormalItemSlots.cpp index 08bd34eb0..2c17077fd 100644 --- a/Source/Contents/UserData/NormalItemSlots.cpp +++ b/Source/Contents/UserData/NormalItemSlots.cpp @@ -1,7 +1,7 @@ #include "Contents/UserData/NormalItemSlots.h" #include "Client/Session.h" #include "Contents/UserData/CharacterLinkedUserDataMgr.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Render/Renderer.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/Contents/World/SkyBox.cpp b/Source/Contents/World/SkyBox.cpp index 416eac3e1..17756e35e 100644 --- a/Source/Contents/World/SkyBox.cpp +++ b/Source/Contents/World/SkyBox.cpp @@ -1,6 +1,6 @@ #include "Contents/World/SkyBox.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Models/ModelActor.h" #include "Render/Renderer.h" #include "Render/TextureQuad.h" diff --git a/Source/Contents/World/WorldEffects.cpp b/Source/Contents/World/WorldEffects.cpp index c7d431a99..e97c7c615 100644 --- a/Source/Contents/World/WorldEffects.cpp +++ b/Source/Contents/World/WorldEffects.cpp @@ -3,8 +3,8 @@ #include "Contents/Actors/ActorEnums.h" #include "Client/Mode/CGameMode.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectMaker.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectMaker.h" #include "Contents/Sound/SoundConfiguration.h" #include "Contents/Sound/SoundMaker.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Contents/World/WorldModelView.cpp b/Source/Contents/World/WorldModelView.cpp index ad0576817..85eeda946 100644 --- a/Source/Contents/World/WorldModelView.cpp +++ b/Source/Contents/World/WorldModelView.cpp @@ -1,11 +1,11 @@ #include "Client/Session.h" #include "Contents/Actors/GroundScope.h" #include "Contents/Camera/Camera.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Ground/GroundRendering.h" #include "Contents/Models/ModelActor.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Contents/Sound/SoundMaker.h" #include "Contents/World/World.h" #include "Contents/World/WorldModelView.h" diff --git a/Source/Contents/World/WorldObjects.cpp b/Source/Contents/World/WorldObjects.cpp index 36205a01a..41d6d57ab 100644 --- a/Source/Contents/World/WorldObjects.cpp +++ b/Source/Contents/World/WorldObjects.cpp @@ -12,13 +12,13 @@ #include "Contents/Actors/GameActor.h" #include "Client/Mode/ModeMgr.h" #include "Contents/World/World.h" -#include "Contents/Effects/ArrowEffect.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/RagEffect.h" +#include "Contents/Effects/Skills/ArrowEffect.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/RagEffect.h" #include "Contents/Actors/ActorStateFlags.h" -#include "Contents/CashEmotionMgr.h" -#include "Contents/Effects/MandraAttackEffect.h" -#include "Contents/Effects/MsgEffect.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" +#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" @@ -37,13 +37,13 @@ #include "Client/Input/Mouse.h" #include "Client/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/WhisperBlockMgr.h" #include "File/ShortcutFilename.h" -#include "Contents/ClanInfo.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Clan/ClanInfo.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Configuration/ServiceOptions.h" #include "UI/Text/UINameBalloonText.h" @@ -55,7 +55,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" #include "Resource/MSGSTRINGID.h" // GLOBAL: gl_24371 diff --git a/Source/Contents/World/WorldProximity.cpp b/Source/Contents/World/WorldProximity.cpp index 17b45f8e5..71acb635f 100644 --- a/Source/Contents/World/WorldProximity.cpp +++ b/Source/Contents/World/WorldProximity.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" #pragma pack(push, 1) struct PACKET_CZ_APPROXIMATE_ACTOR { diff --git a/Source/Contents/World/WorldSpatialTree.cpp b/Source/Contents/World/WorldSpatialTree.cpp index f209f75bc..932650827 100644 --- a/Source/Contents/World/WorldSpatialTree.cpp +++ b/Source/Contents/World/WorldSpatialTree.cpp @@ -1,7 +1,7 @@ #include "Client/Session.h" #include "Contents/Ground/GroundGeometry.h" #include "Contents/Ground/GroundGeometry.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Models/ModelActor.h" #include "Contents/Movies/BinkMovies.h" #include "Contents/World/World.h" diff --git a/Source/Contents/WorldView/WorldViewData.cpp b/Source/Contents/World/WorldViewData.cpp similarity index 99% rename from Source/Contents/WorldView/WorldViewData.cpp rename to Source/Contents/World/WorldViewData.cpp index 23600cba8..6b8cd6b64 100644 --- a/Source/Contents/WorldView/WorldViewData.cpp +++ b/Source/Contents/World/WorldViewData.cpp @@ -1,10 +1,10 @@ #include "Client/Mode/ModeMessage.h" -#include "Contents/WorldView/WorldViewData.h" +#include "Contents/World/WorldViewData.h" #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Render/Textures/Texture.h" #include "Render/Textures/TextureCache.h" diff --git a/Source/Contents/WorldView/WorldViewData.h b/Source/Contents/World/WorldViewData.h similarity index 97% rename from Source/Contents/WorldView/WorldViewData.h rename to Source/Contents/World/WorldViewData.h index aff6b26e4..501356e81 100644 --- a/Source/Contents/WorldView/WorldViewData.h +++ b/Source/Contents/World/WorldViewData.h @@ -1,5 +1,5 @@ -#ifndef RAGNAROK_SOURCE_CONTENTS_WORLDVIEW_WORLDVIEWDATA_H -#define RAGNAROK_SOURCE_CONTENTS_WORLDVIEW_WORLDVIEWDATA_H +#ifndef RAGNAROK_SOURCE_CONTENTS_WORLD_WORLDVIEWDATA_H +#define RAGNAROK_SOURCE_CONTENTS_WORLD_WORLDVIEWDATA_H #include #include diff --git a/Source/EntityInit.cpp b/Source/EntityInit.cpp index 3ce175a55..fa0ab3e04 100644 --- a/Source/EntityInit.cpp +++ b/Source/EntityInit.cpp @@ -1,7 +1,7 @@ #include "Client/Mode/CGameMode.h" #include "Contents/Actors/GameActor.h" #include "Contents/Actors/Pc.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include #include diff --git a/Source/File/FileCreation.cpp b/Source/File/FileCreation.cpp index 53452fe0b..e4f7e42f0 100644 --- a/Source/File/FileCreation.cpp +++ b/Source/File/FileCreation.cpp @@ -1,5 +1,5 @@ #include "File/FileCreation.h" -#include "Contents/EffectResourceSwitcher.h" +#include "Contents/Effects/EffectResourceSwitcher.h" #include "Utility/JsonCppLoader.h" #include "Utility/Text/FormatString.h" diff --git a/Source/Network/ActorNamePacket.cpp b/Source/Network/ActorNamePacket.cpp index c8a15149c..fb112e879 100644 --- a/Source/Network/ActorNamePacket.cpp +++ b/Source/Network/ActorNamePacket.cpp @@ -1,6 +1,6 @@ #include "Client/Mode/CGameMode.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/ActorNamePacket.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Window/UIPetInfoWnd.h" diff --git a/Source/Render/DX9/RendererFrameDX9.cpp b/Source/Render/DX9/RendererFrameDX9.cpp index 2ed2c82c1..372769e47 100644 --- a/Source/Render/DX9/RendererFrameDX9.cpp +++ b/Source/Render/DX9/RendererFrameDX9.cpp @@ -1,4 +1,4 @@ -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Render/DX9/DeviceOwnerDX9.h" #include "Render/DX9/RendererDX9.h" #include "Render/Primitives/LightmappedPrimitive.h" diff --git a/Source/Render/Primitives/ScreenLine.cpp b/Source/Render/Primitives/ScreenLine.cpp index f0a1eb5bb..e117645df 100644 --- a/Source/Render/Primitives/ScreenLine.cpp +++ b/Source/Render/Primitives/ScreenLine.cpp @@ -8,7 +8,7 @@ #include "UI/Text/ColoredText.h" #include "UI/Window/WindowBorder.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" #include "Render/ScreenGeometry.h" diff --git a/Source/Resource/EmblemResource.cpp b/Source/Resource/EmblemResource.cpp index 4f2b94ebc..c742c1574 100644 --- a/Source/Resource/EmblemResource.cpp +++ b/Source/Resource/EmblemResource.cpp @@ -1,6 +1,6 @@ #include "Resource/EmblemResource.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "File/File.h" #include "Resource/ResourceMgr.h" diff --git a/Source/Resource/TextureNames.cpp b/Source/Resource/TextureNames.cpp index e92c2c748..925cc9d0b 100644 --- a/Source/Resource/TextureNames.cpp +++ b/Source/Resource/TextureNames.cpp @@ -1,7 +1,7 @@ #include "Client/Input/InputCharset.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Resource/ResourceMgr.h" #include "File/ResourcePath.h" #include "Resource/TextureNames.h" diff --git a/Source/Script/LuaScript.cpp b/Source/Script/LuaScript.cpp index 9728ce873..524464fe3 100644 --- a/Source/Script/LuaScript.cpp +++ b/Source/Script/LuaScript.cpp @@ -1,16 +1,16 @@ #include "UI/Window/WindowId.h" -#include "Contents/Effects/EffectMessageId.h" +#include "Contents/Effects/Core/EffectMessageId.h" #include "Script/LuaScript.h" #include "Archive/PakRegistry.h" #include "Client/Session.h" #include "Contents/Configuration/GameSettingsMgr.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/EntryQueueMgr.h" -#include "Contents/Effects/EffectLists.h" -#include "Contents/Effects/EffectTypes.h" -#include "Contents/Effects/EmitterEffect.h" -#include "Contents/Effects/EvilsPawEffect.h" -#include "Contents/Effects/WindEffect.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" +#include "Contents/Effects/Core/EffectLists.h" +#include "Contents/Effects/Core/EffectTypes.h" +#include "Contents/Effects/Particles/EmitterEffect.h" +#include "Contents/Effects/Skills/EvilsPawEffect.h" +#include "Contents/Effects/Skills/WindEffect.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Skills/SkillTreeScript.h" #include "File/File.h" diff --git a/Source/Security/NProtectGameGuardMgr.cpp b/Source/Security/NProtectGameGuardMgr.cpp index f16be772e..7a5d1ab75 100644 --- a/Source/Security/NProtectGameGuardMgr.cpp +++ b/Source/Security/NProtectGameGuardMgr.cpp @@ -3,7 +3,7 @@ #include "Client/Application/Launcher.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" #include "Utility/Threading/NSyncObject.h" diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 1dafa7b99..c3d69878b 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -11,7 +11,7 @@ #include "Contents/Actors/ActorStateFlags.h" #include "Contents/Skills/SkillInfo.h" #include "Contents/Jobs/JobId.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "File/File.h" #include "File/ShortcutFilename.h" #include "Render/DeviceContext/DCSurface.h" @@ -25,17 +25,17 @@ #include "Contents/Items/SelectPackageItemMgr.h" #include "UI/ProbabilityTable/UIProbabilityTable.h" #include "UI/Buttons/UIBasicButton.h" -#include "Contents/MessageTable.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Jobs/JobInheritance.h" #include "UI/Chat/UINewChatWnd.h" #include "UI/Rodex/UIRodexComposeWnd.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/GuildInfo.h" -#include "Contents/TipBoxTitles.h" -#include "Contents/TipOfTheDay.h" -#include "Contents/SkinMgr.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Tables/TipBoxTitles.h" +#include "Contents/Tables/TipOfTheDay.h" +#include "Contents/Skin/SkinMgr.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/CGameMode.h" #include "Client/Input/Mouse.h" @@ -137,16 +137,16 @@ #include "UI/Window/WindowManagerWindows.h" #include "Utility/Text/FormatString.h" #include "Utility/Text/TextTokens.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/TextEncoding.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" -#include "Contents/TownInfoMgr.h" +#include "Contents/Map/TownInfoMgr.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "UI/Text/NavigationLink.h" #include "Utility/Text/GroupedInteger.h" #include "Utility/Math/Int64Math.h" diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp index e26379507..5c9bb41ff 100644 --- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp @@ -6,7 +6,7 @@ #include "Client/Mode/ModeMgr.h" #include "Render/Renderer.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Mode/ModeEvents.h" #include "Client/Replay.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp index 9c4b712e6..3cd8e9b2a 100644 --- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp @@ -3,7 +3,7 @@ #include "Client/Mode/CMode.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Mode/ModeEvents.h" #include "Client/Replay.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp index 41eee2d0d..c236357b5 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp +++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp @@ -1,12 +1,12 @@ #include "Client/Session.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" -#include "Contents/AdventureGuideMgr.h" +#include "Contents/AdventureGuide/AdventureGuideMgr.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/RenewQuestMgr.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Quest/RenewQuestMgr.h" +#include "Contents/Tables/TipBoxTitles.h" #include "Resource/ResourceMgr.h" #include "Resource/Sprites/ActionResource.h" #include "Resource/Sprites/SpriteResource.h" diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index e0aa40717..9eabaff48 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -4,7 +4,7 @@ #include "Client/Session.h" #include "UI/Window/WindowPolicy.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/ModeEvents.h" diff --git a/Source/UI/Buttons/UINaviLinkButton.cpp b/Source/UI/Buttons/UINaviLinkButton.cpp index ea9ac845d..eedb9be2f 100644 --- a/Source/UI/Buttons/UINaviLinkButton.cpp +++ b/Source/UI/Buttons/UINaviLinkButton.cpp @@ -1,4 +1,4 @@ -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "UI/Text/NavigationLink.h" #include "UI/Buttons/UINaviLinkButton.h" diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index 27bdf7510..14f06544a 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -25,7 +25,7 @@ #include "Client/Session.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/ClientSkills.h" #include "UI/UIBasicCtrl.h" #include "Utility/Text/FormatString.h" @@ -3411,7 +3411,7 @@ UITVTextButton::UITVTextButton() : UIButton() { } #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/TipOfTheDay.h" +#include "Contents/Tables/TipOfTheDay.h" // OFFSET: 0x0086DE10 // FUNCTION: fn_11060 diff --git a/Source/UI/Buttons/UITextureButton.cpp b/Source/UI/Buttons/UITextureButton.cpp index 7c146e865..bc2eb9786 100644 --- a/Source/UI/Buttons/UITextureButton.cpp +++ b/Source/UI/Buttons/UITextureButton.cpp @@ -3,7 +3,7 @@ #include "Client/Replay.h" #include "UI/Window/WindowPolicy.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Mode/ModeEvents.h" diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp index 8905ba8a3..bb66570c7 100644 --- a/Source/UI/CashShop/UICashShopWnd.cpp +++ b/Source/UI/CashShop/UICashShopWnd.cpp @@ -12,7 +12,7 @@ #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/Chat/UIChatRoomMakeWnd.cpp b/Source/UI/Chat/UIChatRoomMakeWnd.cpp index 9b0492b83..0a5d1f6a4 100644 --- a/Source/UI/Chat/UIChatRoomMakeWnd.cpp +++ b/Source/UI/Chat/UIChatRoomMakeWnd.cpp @@ -1,6 +1,6 @@ #include "UI/Chat/UIChatRoomMakeWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/MSGSTRINGID.h" // OFFSET: 0x008C7280 diff --git a/Source/UI/Chat/UIChatRoomTitle.cpp b/Source/UI/Chat/UIChatRoomTitle.cpp index a18267465..f3962249f 100644 --- a/Source/UI/Chat/UIChatRoomTitle.cpp +++ b/Source/UI/Chat/UIChatRoomTitle.cpp @@ -3,8 +3,8 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/ForbiddenWords.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/ForbiddenWords.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/Chat/UINewChatWnd.cpp b/Source/UI/Chat/UINewChatWnd.cpp index 76ceaee0c..35d4e2583 100644 --- a/Source/UI/Chat/UINewChatWnd.cpp +++ b/Source/UI/Chat/UINewChatWnd.cpp @@ -10,7 +10,7 @@ #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/TextEncoding.h" #include "Render/Renderer.h" #include "UI/Buttons/UITextButton.h" diff --git a/Source/UI/Clan/UIClanWnd.cpp b/Source/UI/Clan/UIClanWnd.cpp index 69cafc864..f9f541295 100644 --- a/Source/UI/Clan/UIClanWnd.cpp +++ b/Source/UI/Clan/UIClanWnd.cpp @@ -3,9 +3,9 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Contents/ClanInfo.h" -#include "Contents/MapInfoMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Clan/ClanInfo.h" +#include "Contents/Map/MapInfoMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp index 0fb3c8219..eea4d9ec7 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.cpp +++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp @@ -13,9 +13,9 @@ #include "Resource/TextureNames.h" #include "Resource/Sprites/SpriteResource.h" #include "Render/Textures/SpritePixels.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/TownInfoMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Map/TownInfoMgr.h" #include "Contents/UserData/NormalItemSlots.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Dialogs/UIPasswordWnd.cpp b/Source/UI/Dialogs/UIPasswordWnd.cpp index a0f7c4b26..016d10934 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.cpp +++ b/Source/UI/Dialogs/UIPasswordWnd.cpp @@ -1,7 +1,7 @@ #include "UI/Dialogs/UIPasswordWnd.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Security/SecondPwdRandom.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 59699ee80..3f31b4c08 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -15,12 +15,12 @@ #include "Resource/SkinPalette.h" #include "Contents/Configuration/GameSettingsMgr.h" #include "UI/Layout/SnapMgr.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Resource/TextureNames.h" #include "Resource/Bitmap/BitmapImage.h" #include "Resource/Bitmap/BitmapResource.h" #include "Contents/Items/ItemDescription.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Shop/ItemDrawing.h" #include "Utility/Text/FormatString.h" #include "UI/Window/InputFocus.h" @@ -92,12 +92,12 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/ForbiddenWords.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/ForbiddenWords.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "UI/Edit/UIItemTagCtrl.h" #include "UI/Window/WindowBorder.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/TipBoxTitles.h" #include #include #include diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index 4a720e347..5a94ac0f2 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -2,7 +2,7 @@ #include "Client/Input/InputCharset.h" #include "UI/Window/UIEnums.h" #include "Client/Input/Language.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/Emotion/UIEmotionWnd.cpp b/Source/UI/Emotion/UIEmotionWnd.cpp index cc0cb9d95..06f713b9d 100644 --- a/Source/UI/Emotion/UIEmotionWnd.cpp +++ b/Source/UI/Emotion/UIEmotionWnd.cpp @@ -4,11 +4,11 @@ #include "UI/Window/UIEnums.h" #include "Client/Session.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "UI/CashEmotion/UICashEmotionListWnd.h" #include "Contents/Hotkeys/EmotionHotkeys.h" #include "Contents/Hotkeys/HotkeyInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/AccountLinkedUserDataMgr.h" #include "Contents/UserData/NormalItemSlots.h" #include "Render/Text/FontCache.h" diff --git a/Source/UI/Enchant/UIEnchantUI.cpp b/Source/UI/Enchant/UIEnchantUI.cpp index c3bb97864..b89e0e67d 100644 --- a/Source/UI/Enchant/UIEnchantUI.cpp +++ b/Source/UI/Enchant/UIEnchantUI.cpp @@ -1,7 +1,7 @@ #include "UI/Enchant/EnchantUI.h" #include "UI/Window/WindowId.h" #include "Client/Session.h" -#include "Contents/EnchantMgr.h" +#include "Contents/Items/EnchantMgr.h" #include "Render/Renderer.h" #include "UI/Buttons/UIRadioButton.h" #include "UI/Lists/UIVScrollBar.h" diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index 4670fe7c9..ef5f06a7b 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -6,10 +6,10 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Replay.h" #include "Client/Session.h" -#include "Contents/GuildInfo.h" -#include "Contents/GuildMgr.h" -#include "Contents/EntryQueueMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" diff --git a/Source/UI/Exchange/UIExchangeUI.cpp b/Source/UI/Exchange/UIExchangeUI.cpp index 09c44b2ec..3913cc3ff 100644 --- a/Source/UI/Exchange/UIExchangeUI.cpp +++ b/Source/UI/Exchange/UIExchangeUI.cpp @@ -9,7 +9,7 @@ #include "Client/Mode/ModeDragState.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/ShortcutFilename.h" #include "Render/Renderer.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index f29eb7f51..0405fcc48 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -8,8 +8,8 @@ #include "Contents/Configuration/GameSettingsMgr.h" #include "Contents/Configuration/ServiceOptions.h" #include "Contents/Hotkeys/HotkeyInfo.h" -#include "Contents/MessageTable.h" -#include "Contents/SkinMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Skin/SkinMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/Guild/UIAgitWnd.cpp b/Source/UI/Guild/UIAgitWnd.cpp index d5f2cd07d..f8795a7d9 100644 --- a/Source/UI/Guild/UIAgitWnd.cpp +++ b/Source/UI/Guild/UIAgitWnd.cpp @@ -5,9 +5,9 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Replay.h" #include "Client/Session.h" -#include "Contents/GuildInfo.h" -#include "Contents/GuildMgr.h" -#include "Contents/MessageTable.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" diff --git a/Source/UI/Guild/UIGuildHelperWnd.cpp b/Source/UI/Guild/UIGuildHelperWnd.cpp index 11f889cf9..a431cdee2 100644 --- a/Source/UI/Guild/UIGuildHelperWnd.cpp +++ b/Source/UI/Guild/UIGuildHelperWnd.cpp @@ -4,7 +4,7 @@ #include "UI/Window/UIEnums.h" #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" @@ -13,7 +13,7 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" #include "UI/Text/UIStaticText.h" -#include "Contents/GuildTip.h" +#include "Contents/Guild/GuildTip.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" #include "UI/Text/UITextViewer.h" diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index 2f7abfabe..f3c09d0ea 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -9,8 +9,8 @@ #include "Client/Replay.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/GuildMgr.h" -#include "Contents/MessageTable.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" @@ -35,7 +35,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" #include "Resource/MSGSTRINGID.h" // GLOBAL: gl_24999 diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index 0ceeaa5c3..fe95bbf27 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -6,9 +6,9 @@ #include "Client/Application/Launcher.h" #include "Client/Input/Mouse.h" #include "Contents/Emblems/EmblemDataMgr.h" -#include "Contents/ForbiddenWords.h" -#include "Contents/GuildInfo.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/ForbiddenWords.h" +#include "Contents/Guild/GuildInfo.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Contents/Skills/SkillInfo.h" #include "File/File.h" #include "File/FileEnumeration.h" diff --git a/Source/UI/Guild/UIGuild_Storage_Log.cpp b/Source/UI/Guild/UIGuild_Storage_Log.cpp index 94a1ac794..ffcf409e1 100644 --- a/Source/UI/Guild/UIGuild_Storage_Log.cpp +++ b/Source/UI/Guild/UIGuild_Storage_Log.cpp @@ -1,7 +1,7 @@ #include "UI/Guild/UIGuild_Storage_Log.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp index f92172c80..76d363291 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/WindowId.h" #include "UI/Item/UIEquipmentPropertiesWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/Item/UIMerchantItemLogWnd.cpp b/Source/UI/Item/UIMerchantItemLogWnd.cpp index 170c7946f..b287b7143 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.cpp +++ b/Source/UI/Item/UIMerchantItemLogWnd.cpp @@ -7,8 +7,8 @@ #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Client/Mode/ModeMgr.h" #include "UI/Window/UIWindowMgr.h" #include "Client/Input/InputCharset.h" diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Item/UIParaItemShopWnd.cpp index 17a1309a3..7825d745c 100644 --- a/Source/UI/Item/UIParaItemShopWnd.cpp +++ b/Source/UI/Item/UIParaItemShopWnd.cpp @@ -17,8 +17,8 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/Items/MergeItemWnd.cpp b/Source/UI/Items/MergeItemWnd.cpp index 681720b17..a2be0aee9 100644 --- a/Source/UI/Items/MergeItemWnd.cpp +++ b/Source/UI/Items/MergeItemWnd.cpp @@ -11,8 +11,8 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/Items/UIGameItem.cpp b/Source/UI/Items/UIGameItem.cpp index 776471a5d..199d95000 100644 --- a/Source/UI/Items/UIGameItem.cpp +++ b/Source/UI/Items/UIGameItem.cpp @@ -8,8 +8,8 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Resource/ResourceMgr.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UINewSelectCharWnd.h" diff --git a/Source/UI/Items/UIItemRepairWnd.cpp b/Source/UI/Items/UIItemRepairWnd.cpp index be63c44f1..f508d4435 100644 --- a/Source/UI/Items/UIItemRepairWnd.cpp +++ b/Source/UI/Items/UIItemRepairWnd.cpp @@ -11,9 +11,9 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "UI/Window/WindowManagerWindows.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Items/UIMakeTargetListWnd.h" #include "UI/Items/UIMakeTargetProcessWnd.h" #include "UI/Items/UIMakeTargetResultWnd.h" diff --git a/Source/UI/Items/UIMakeTargetListWnd.cpp b/Source/UI/Items/UIMakeTargetListWnd.cpp index db10c0d5d..2791f0f0a 100644 --- a/Source/UI/Items/UIMakeTargetListWnd.cpp +++ b/Source/UI/Items/UIMakeTargetListWnd.cpp @@ -13,8 +13,8 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "UI/Buttons/UIButton.h" #include "UI/Lists/UIListBox.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Items/UIMakeTargetProcessWnd.cpp b/Source/UI/Items/UIMakeTargetProcessWnd.cpp index 150c337f9..927bc2cc9 100644 --- a/Source/UI/Items/UIMakeTargetProcessWnd.cpp +++ b/Source/UI/Items/UIMakeTargetProcessWnd.cpp @@ -9,7 +9,7 @@ #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemId.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/Items/UISwapEquipmentWnd.cpp b/Source/UI/Items/UISwapEquipmentWnd.cpp index 143fb8f18..14611992a 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.cpp +++ b/Source/UI/Items/UISwapEquipmentWnd.cpp @@ -14,8 +14,8 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Contents/World/World.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/Items/UIWeaponRefineWnd.cpp b/Source/UI/Items/UIWeaponRefineWnd.cpp index 4d2c128be..60383dafe 100644 --- a/Source/UI/Items/UIWeaponRefineWnd.cpp +++ b/Source/UI/Items/UIWeaponRefineWnd.cpp @@ -10,8 +10,8 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "UI/Buttons/UIButton.h" #include "UI/Lists/UIListBox.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Lists/UIChatHisBox.cpp b/Source/UI/Lists/UIChatHisBox.cpp index 9ad44b0d0..08e5eb326 100644 --- a/Source/UI/Lists/UIChatHisBox.cpp +++ b/Source/UI/Lists/UIChatHisBox.cpp @@ -5,9 +5,9 @@ #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemLink.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Tables/TipBoxTitles.h" #include "Network/TextEncoding.h" #include "UI/Buttons/UIItemTagButton.h" #include "UI/Lists/UIChatHisBox.h" diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index 89039b00b..950dcc52b 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -14,12 +14,12 @@ #include "UI/Text/UITextViewer.h" #include "UI/Text/UIString.h" #include "UI/Buttons/UIDescriptRace.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Input/InputCharset.h" #include "Client/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Render/DeviceContext/DCSurface.h" #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index bd9d9e334..33eb16ed8 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -6,7 +6,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Contents/Items/ItemLink.h" #include "UI/Text/ColoredText.h" #include "UI/Lists/UIChatHisBox.h" diff --git a/Source/UI/Lists/UIListBoxEx.cpp b/Source/UI/Lists/UIListBoxEx.cpp index 5c905a3ac..8cf009ce9 100644 --- a/Source/UI/Lists/UIListBoxEx.cpp +++ b/Source/UI/Lists/UIListBoxEx.cpp @@ -4,7 +4,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "UI/Text/ColoredText.h" #include "UI/Lists/UIListBox.h" #include "UI/Lists/UIListBoxEx.h" diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index 98329ccfd..cda568831 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -30,8 +30,8 @@ #include "UI/Buttons/UINaviLinkButton.h" #include "UI/Buttons/UIItemTagButton.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/TipOfTheDay.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/TipOfTheDay.h" +#include "Contents/Tables/MessageTable.h" #include #include #include @@ -44,7 +44,7 @@ #include "UI/Window/UINewSelectCharWnd.h" #include "Client/Input/InputCharset.h" #include "Client/Input/Language.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include #include #include @@ -1881,8 +1881,8 @@ bool UIItemTagCtrl::RemoveInvalidTag(std::list::iterator& entry) #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemLink.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Tables/TipBoxTitles.h" #include "UI/Text/NavigationLink.h" #include diff --git a/Source/UI/Lists/UIScrollBarVariants.h b/Source/UI/Lists/UIScrollBarVariants.h index de272dbb3..e91c931d2 100644 --- a/Source/UI/Lists/UIScrollBarVariants.h +++ b/Source/UI/Lists/UIScrollBarVariants.h @@ -6,7 +6,7 @@ #include -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Resource/SkinPalette.h" #include "UI/Lists/UIListBoxID.h" diff --git a/Source/UI/Lists/UITagListBox.cpp b/Source/UI/Lists/UITagListBox.cpp index bc42f7700..39e3469da 100644 --- a/Source/UI/Lists/UITagListBox.cpp +++ b/Source/UI/Lists/UITagListBox.cpp @@ -5,7 +5,7 @@ #include "Client/Input/InputCharset.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Network/TextEncoding.h" #include "UI/Buttons/UITagButton.h" #include "UI/Lists/UIScrollBar.h" diff --git a/Source/UI/Menu/UIMenuIconWnd.cpp b/Source/UI/Menu/UIMenuIconWnd.cpp index c6692b68c..528ab481b 100644 --- a/Source/UI/Menu/UIMenuIconWnd.cpp +++ b/Source/UI/Menu/UIMenuIconWnd.cpp @@ -9,9 +9,9 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Replay.h" #include "Client/Session.h" -#include "Contents/EntryQueueMgr.h" -#include "Contents/GuildMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/EntryQueue/EntryQueueMgr.h" +#include "Contents/Guild/GuildMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" @@ -27,7 +27,7 @@ #include #include #include -#include "Contents/GuildInfo.h" +#include "Contents/Guild/GuildInfo.h" #include "Resource/MSGSTRINGID.h" #pragma pack(push, 1) diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index da1e1a402..65c23bc10 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -1,4 +1,4 @@ -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" diff --git a/Source/UI/Party/UIApplyForPartyWnd.cpp b/Source/UI/Party/UIApplyForPartyWnd.cpp index d6a6fb69d..a9ad29c17 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.cpp +++ b/Source/UI/Party/UIApplyForPartyWnd.cpp @@ -5,7 +5,7 @@ #include "File/ShortcutFilename.h" #include "Render/Renderer.h" #include "UI/Window/UINewSelectCharWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Window/UIWindowMgr.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Render/DeviceContext/DeviceContext.h" diff --git a/Source/UI/Party/UIMiniPartyWnd.cpp b/Source/UI/Party/UIMiniPartyWnd.cpp index 8b4bb0a6c..43f290610 100644 --- a/Source/UI/Party/UIMiniPartyWnd.cpp +++ b/Source/UI/Party/UIMiniPartyWnd.cpp @@ -6,7 +6,7 @@ #include "Client/Input/Mouse.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MapInfoMgr.h" +#include "Contents/Map/MapInfoMgr.h" #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" #include "File/ShortcutFilename.h" @@ -14,7 +14,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "UI/Buttons/UITextButton.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Messenger/ClientMessenger.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/Party/UIPartyInfoWnd.cpp b/Source/UI/Party/UIPartyInfoWnd.cpp index 716031bd1..3d7d52faf 100644 --- a/Source/UI/Party/UIPartyInfoWnd.cpp +++ b/Source/UI/Party/UIPartyInfoWnd.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UIEnums.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/ShortcutFilename.h" #include "Render/DeviceContext/DeviceContext.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index 75cf96497..e373e6096 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -2,11 +2,11 @@ #include "UI/Window/UIWindowMgr.h" #include "UI/Window/UIEnums.h" #include "Client/Input/InputCharset.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/TextureNames.h" #include "Contents/Party/AdventurerAgencyMgr.h" #include "Client/Session.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp index b14d761a3..30a228f97 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp +++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp @@ -2,7 +2,7 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Mode/ModeEvents.h" #include "Client/Session.h" #include "Render/DeviceContext/DeviceContext.h" diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp index 239666d0e..227225041 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp @@ -8,7 +8,7 @@ #include "UI/Window/WindowBorder.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Text/UIStaticTextControl.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Utility/Cipher/XorBytes.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/ProbabilityTable/UIProbabilityTableEvents.cpp b/Source/UI/ProbabilityTable/UIProbabilityTableEvents.cpp index eb3c2c30b..767553951 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTableEvents.cpp +++ b/Source/UI/ProbabilityTable/UIProbabilityTableEvents.cpp @@ -6,7 +6,7 @@ #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Items/NeoPackageItemMgr.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/TextEncoding.h" #include "UI/Edit/UIEditBoxEx.h" #include "UI/Text/UIStaticTextControl.h" diff --git a/Source/UI/Quest/UIOngoingQuestInfo.cpp b/Source/UI/Quest/UIOngoingQuestInfo.cpp index 39ccc3187..c0b155b0a 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.cpp +++ b/Source/UI/Quest/UIOngoingQuestInfo.cpp @@ -6,9 +6,9 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Render/Renderer.h" #include "UI/Items/UIGameItem.h" #include "UI/Lists/UIVScrollBar.h" diff --git a/Source/UI/Quest/UIQuestDisplay.cpp b/Source/UI/Quest/UIQuestDisplay.cpp index cd415ea5f..cda6f3df4 100644 --- a/Source/UI/Quest/UIQuestDisplay.cpp +++ b/Source/UI/Quest/UIQuestDisplay.cpp @@ -4,8 +4,8 @@ #include "UI/Window/UIEnums.h" #include "UI/Quest/UIQuestDisplay.h" #include "Client/Input/Mouse.h" -#include "Contents/MessageTable.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.cpp b/Source/UI/Quest/UIRecommendedQuestInfo.cpp index 5d1bffe77..3f12ff042 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.cpp +++ b/Source/UI/Quest/UIRecommendedQuestInfo.cpp @@ -1,8 +1,8 @@ #include "UI/Quest/UIRecommendedQuestInfo.h" #include "UI/Window/WindowId.h" -#include "Contents/MessageTable.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Render/Renderer.h" #include "UI/Quest/UIRenewQuestWnd.h" #include "UI/Text/UIStaticTextControl.h" diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index 72ba175b2..11051a6fd 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -4,8 +4,8 @@ #include "UI/Window/UIEnums.h" #include "Utility/EncryptedName.h" #include "Client/Replay.h" -#include "Contents/MessageTable.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Network/TextEncoding.h" diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index 0ee28cf61..e9ef2b243 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -9,9 +9,9 @@ #include "Client/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/RenewQuestMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Quest/RenewQuestMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Render/DeviceContext/DeviceContext.h" diff --git a/Source/UI/Rodex/UIRodexComposeWnd.cpp b/Source/UI/Rodex/UIRodexComposeWnd.cpp index a475cc1eb..5133c9333 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.cpp +++ b/Source/UI/Rodex/UIRodexComposeWnd.cpp @@ -25,8 +25,8 @@ #include "Client/Input/InputCharset.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Text/NavigationLink.h" @@ -35,8 +35,8 @@ #include "Utility/Text/GroupedInteger.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Window/InputFocus.h" -#include "Contents/SkinMgr.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Skin/SkinMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Resource/SkinPalette.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Rodex/UIRodexInboxWnd.cpp b/Source/UI/Rodex/UIRodexInboxWnd.cpp index a28762434..e3f76ee54 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.cpp +++ b/Source/UI/Rodex/UIRodexInboxWnd.cpp @@ -3,7 +3,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Network/Connection/Connection.h" @@ -22,7 +22,7 @@ #include "UI/Buttons/UITextButton.h" #include "UI/Text/NavigationLink.h" #include "UI/Edit/UIEditCtrl.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Utility/Text/FormatString.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Rodex/UIRodexInboxWnd.h b/Source/UI/Rodex/UIRodexInboxWnd.h index 74adecf0e..356e34a7c 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.h +++ b/Source/UI/Rodex/UIRodexInboxWnd.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_RODEX_UIRODEXINBOXWND_H #define RAGNAROK_SOURCE_UI_RODEX_UIRODEXINBOXWND_H -#include "Contents/RodexMailStore.h" +#include "Contents/Rodex/RodexMailStore.h" #include "UI/Item/UIItemWnd.h" #include diff --git a/Source/UI/RuneSystem/UIRuneSystemWindows.h b/Source/UI/RuneSystem/UIRuneSystemWindows.h index 64a421933..9f76d8140 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWindows.h +++ b/Source/UI/RuneSystem/UIRuneSystemWindows.h @@ -4,11 +4,11 @@ #include "Client/Input/InputCharset.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Render/DeviceContext/DeviceContext.h" diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp index 4460d6875..64d40c205 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp @@ -1,8 +1,8 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/Items/RuneSystem.h" -#include "Contents/MessageTable.h" +#include "Contents/RuneSystem/RuneSystem.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.h b/Source/UI/RuneSystem/UIRuneSystemWnd.h index a1d9d7782..7de61f8c6 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.h +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.h @@ -4,11 +4,11 @@ #include "Client/Input/InputCharset.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/Effects/EffectLists.h" +#include "Contents/Effects/Core/EffectLists.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Render/DeviceContext/DeviceContext.h" diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index 110a7c1c5..906adacc7 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -8,8 +8,8 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" #include "Contents/Items/SelectPackageItemMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Render/Renderer.h" #include "UI/Items/UIGameItem.h" #include "UI/Text/UIStaticTextControl.h" diff --git a/Source/UI/Shop/UIMerchantShopTitle.cpp b/Source/UI/Shop/UIMerchantShopTitle.cpp index b429f32bb..4346441f4 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.cpp +++ b/Source/UI/Shop/UIMerchantShopTitle.cpp @@ -4,7 +4,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/Shortcuts/ShortcutControls.cpp b/Source/UI/Shortcuts/ShortcutControls.cpp index 7a4b1f037..8e5137d19 100644 --- a/Source/UI/Shortcuts/ShortcutControls.cpp +++ b/Source/UI/Shortcuts/ShortcutControls.cpp @@ -1,5 +1,5 @@ #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Client/Session.h" #include "UI/Shortcuts/UIShortCutWnd.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Shortcuts/ShortcutCooldowns.cpp b/Source/UI/Shortcuts/ShortcutCooldowns.cpp index 7e226f0e5..b927e6fc6 100644 --- a/Source/UI/Shortcuts/ShortcutCooldowns.cpp +++ b/Source/UI/Shortcuts/ShortcutCooldowns.cpp @@ -12,7 +12,7 @@ #include "Contents/Items/ItemInfo.h" #include "Contents/Skills/AutomaticSkills.h" #include "Contents/Skills/ClientSkills.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "UI/Buttons/UIButton.h" #include "UI/Shop/ItemDrawing.h" #include "UI/Shortcuts/UIQuickSlotWnd.h" @@ -52,7 +52,7 @@ #include "UI/Edit/UIEditCtrl.h" #include "UI/Text/ColoredText.h" #include "Contents/Items/ItemDescription.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Utility/Text/GroupedInteger.h" #include "Resource/MSGSTRINGID.h" diff --git a/Source/UI/Shortcuts/ShortcutPainting.cpp b/Source/UI/Shortcuts/ShortcutPainting.cpp index c868dc9ac..98654ad44 100644 --- a/Source/UI/Shortcuts/ShortcutPainting.cpp +++ b/Source/UI/Shortcuts/ShortcutPainting.cpp @@ -9,7 +9,7 @@ #include "Contents/Skills/PlayerSkillBundle.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/SkinMgr.h" +#include "Contents/Skin/SkinMgr.h" #include "Contents/UserData/NormalItemSlots.h" #include "UI/Shortcuts/ShortcutCooldowns.h" #include "UI/Shortcuts/ShortcutGrid.h" diff --git a/Source/UI/Shortcuts/ShortcutTooltip.cpp b/Source/UI/Shortcuts/ShortcutTooltip.cpp index d17e56e5a..94f7823bc 100644 --- a/Source/UI/Shortcuts/ShortcutTooltip.cpp +++ b/Source/UI/Shortcuts/ShortcutTooltip.cpp @@ -1,6 +1,6 @@ #include "Client/Session.h" #include "Contents/Hotkeys/HotkeyInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/Skills/PlayerSkillBundle.h" #include "UI/Shortcuts/UIShortCutWnd.h" diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp index 0026d1f7d..7d8095f1d 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp @@ -9,7 +9,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Replay.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Skills/ClientSkills.h" #include "Render/DX7/RenderSystemDX7.h" #include "Resource/ResourceMgr.h" @@ -20,8 +20,8 @@ #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "UI/UIBasicCtrl.h" #include "UI/Window/UINewSelectCharWnd.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index bf6718665..b47f7d75e 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -33,16 +33,16 @@ #include "UI/Window/UIRoMapWnd.h" #include "UI/Window/UINavigationWnd.h" #include "UI/Navigation/UINavigationV4Wnd.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" #include "UI/Window/WindowManagerWindows.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Client/Application/Launcher.h" #include "Client/Replay.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "UI/Window/UINavigationWnd.h" #include "Utility/Text/FormatString.h" #include "UI/Text/ColoredText.h" diff --git a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp index b2f320986..9863f4efe 100644 --- a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp +++ b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/SkillDelayInfo/SkillDelayInfo.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" #include "Script/LuaScript.h" diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index a3f9a4cf9..36caf12e0 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -10,7 +10,7 @@ #include "Client/Mode/ModeEvents.h" #include "Client/Session.h" #include "Contents/Jobs/JobId.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "Network/Connection/Connection.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/Text/ItemLinkDisplay.cpp b/Source/UI/Text/ItemLinkDisplay.cpp index 1502e9d33..4072676f0 100644 --- a/Source/UI/Text/ItemLinkDisplay.cpp +++ b/Source/UI/Text/ItemLinkDisplay.cpp @@ -1,7 +1,7 @@ #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemLink.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/TipBoxTitles.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Text/TextFitting.h" diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index bc7b088e5..bca08dfbb 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -23,16 +23,16 @@ #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" -#include "Contents/CashEmotionMgr.h" +#include "Contents/CashEmotion/CashEmotionMgr.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemLink.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Tables/TipBoxTitles.h" #include "Network/TextEncoding.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" diff --git a/Source/UI/Text/UIAchWnd.cpp b/Source/UI/Text/UIAchWnd.cpp index cad764a31..f17af091e 100644 --- a/Source/UI/Text/UIAchWnd.cpp +++ b/Source/UI/Text/UIAchWnd.cpp @@ -4,7 +4,7 @@ #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Text/UIAchWnd.h b/Source/UI/Text/UIAchWnd.h index b9c694665..73bae8b4e 100644 --- a/Source/UI/Text/UIAchWnd.h +++ b/Source/UI/Text/UIAchWnd.h @@ -1,7 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_TEXT_UIACHWND_H #define RAGNAROK_SOURCE_UI_TEXT_UIACHWND_H -#include "Contents/AchievementMgr.h" +#include "Contents/Achievement/AchievementMgr.h" #include "Contents/Jobs/JobInheritance.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index 0feb5bc74..bec8b5315 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -1,8 +1,8 @@ #include "Contents/Items/ItemDescription.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/ActorNameCard.h" +#include "Contents/Actors/ActorNameCard.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Text/TextContext.h" #include "Resource/EmblemResource.h" diff --git a/Source/UI/Text/UITagTextViewer.cpp b/Source/UI/Text/UITagTextViewer.cpp index 99c726d08..76e58c678 100644 --- a/Source/UI/Text/UITagTextViewer.cpp +++ b/Source/UI/Text/UITagTextViewer.cpp @@ -3,7 +3,7 @@ #include -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "UI/Buttons/UITextButton.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Text/CreateLineInfo.h" diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index dd7a82bfa..bdb95e4dc 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -7,7 +7,7 @@ #include "UI/Text/ColoredText.h" #include "UI/Lists/UIChatHisBox.h" #include "UI/Text/TextMarkup.h" -#include "Contents/TipBoxTitles.h" +#include "Contents/Tables/TipBoxTitles.h" #include "Network/TextEncoding.h" #include "UI/Buttons/UIItemTagButton.h" #include "UI/Edit/UIItemTagCtrl.h" diff --git a/Source/UI/Text/UITextViewerMessages.cpp b/Source/UI/Text/UITextViewerMessages.cpp index 45f7fd9a6..da0403881 100644 --- a/Source/UI/Text/UITextViewerMessages.cpp +++ b/Source/UI/Text/UITextViewerMessages.cpp @@ -4,7 +4,7 @@ #include "Client/Application/ApplicationWindow.h" #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "UI/Dialogs/UITipboxWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Contents/Items/ItemInfo.h" diff --git a/Source/UI/UIBartermarketWnd.cpp b/Source/UI/UIBartermarketWnd.cpp index 2a9746d9b..ab8da87b5 100644 --- a/Source/UI/UIBartermarketWnd.cpp +++ b/Source/UI/UIBartermarketWnd.cpp @@ -11,7 +11,7 @@ #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/UICaptchaPreviewWnd.cpp b/Source/UI/UICaptchaPreviewWnd.cpp index c5af067b1..c974d3e52 100644 --- a/Source/UI/UICaptchaPreviewWnd.cpp +++ b/Source/UI/UICaptchaPreviewWnd.cpp @@ -6,7 +6,7 @@ #include "UI/Window/InputFocus.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Utility/Text/FormatString.h" diff --git a/Source/UI/UICaptchaRegisterWnd.cpp b/Source/UI/UICaptchaRegisterWnd.cpp index 075116841..cec3d34f3 100644 --- a/Source/UI/UICaptchaRegisterWnd.cpp +++ b/Source/UI/UICaptchaRegisterWnd.cpp @@ -5,7 +5,7 @@ #include "Client/Application/Launcher.h" #include "Client/Input/InputCharset.h" #include "Client/Input/Language.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/File.h" #include "File/FileEnumeration.h" #include "Network/Connection/Connection.h" diff --git a/Source/UI/UIChangeMaterialWnd.cpp b/Source/UI/UIChangeMaterialWnd.cpp index bee427084..e0f1fdf87 100644 --- a/Source/UI/UIChangeMaterialWnd.cpp +++ b/Source/UI/UIChangeMaterialWnd.cpp @@ -12,8 +12,8 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" diff --git a/Source/UI/UICheckAttendanceWnd.cpp b/Source/UI/UICheckAttendanceWnd.cpp index 905869f34..5d8dacb39 100644 --- a/Source/UI/UICheckAttendanceWnd.cpp +++ b/Source/UI/UICheckAttendanceWnd.cpp @@ -8,7 +8,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" -#include "Contents/CheckAttendanceMgr.h" +#include "Contents/Events/CheckAttendanceMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Render/Renderer.h" @@ -19,7 +19,7 @@ #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Script/LuaScript.h" diff --git a/Source/UI/UIGradeEnchantWnd.cpp b/Source/UI/UIGradeEnchantWnd.cpp index f969b68e0..128f98109 100644 --- a/Source/UI/UIGradeEnchantWnd.cpp +++ b/Source/UI/UIGradeEnchantWnd.cpp @@ -15,7 +15,7 @@ #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Network/Packets/ModeResultEnums.h" diff --git a/Source/UI/UIHotkeyGuideWnd.cpp b/Source/UI/UIHotkeyGuideWnd.cpp index 1d798363d..ad895f64e 100644 --- a/Source/UI/UIHotkeyGuideWnd.cpp +++ b/Source/UI/UIHotkeyGuideWnd.cpp @@ -6,8 +6,8 @@ #include "UI/UIHotkeyGuideWnd.h" #include "Contents/Hotkeys/HotkeyInfo.h" -#include "Contents/MapSkyMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Map/MapSkyMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/UIItemReformWnd.cpp b/Source/UI/UIItemReformWnd.cpp index b9acb50bb..432d09a19 100644 --- a/Source/UI/UIItemReformWnd.cpp +++ b/Source/UI/UIItemReformWnd.cpp @@ -12,8 +12,8 @@ #include "Contents/Items/ItemNaming.h" #include "Contents/Items/ItemReformMgr.h" #include "Contents/Items/SelectPackageItemMgr.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/UILapineBoxWnd.cpp b/Source/UI/UILapineBoxWnd.cpp index 1b34264b5..58691a578 100644 --- a/Source/UI/UILapineBoxWnd.cpp +++ b/Source/UI/UILapineBoxWnd.cpp @@ -9,7 +9,7 @@ #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Script/LuaScript.h" diff --git a/Source/UI/UILapineScrollBar.cpp b/Source/UI/UILapineScrollBar.cpp index cb6ef9237..07895bff1 100644 --- a/Source/UI/UILapineScrollBar.cpp +++ b/Source/UI/UILapineScrollBar.cpp @@ -10,7 +10,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/UILapineUpgradeBoxWnd.cpp b/Source/UI/UILapineUpgradeBoxWnd.cpp index dc7383ef7..7a8f208e1 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.cpp +++ b/Source/UI/UILapineUpgradeBoxWnd.cpp @@ -12,7 +12,7 @@ #include "Client/Session.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/UIMacroBlackListCheckWnd.cpp b/Source/UI/UIMacroBlackListCheckWnd.cpp index d6837dc77..d6f051e84 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.cpp +++ b/Source/UI/UIMacroBlackListCheckWnd.cpp @@ -1,7 +1,7 @@ #include "UI/UIMacroBlackListCheckWnd.h" #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/UIMacroDetectorWnd.cpp b/Source/UI/UIMacroDetectorWnd.cpp index beceb6ec7..aa8204235 100644 --- a/Source/UI/UIMacroDetectorWnd.cpp +++ b/Source/UI/UIMacroDetectorWnd.cpp @@ -3,7 +3,7 @@ #include "Client/Input/InputCharset.h" #include "UI/UIMacroDetectorWnd.h" #include "Client/Input/Language.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Edit/UIEditCtrl.h" diff --git a/Source/UI/UIMacroUserInfoWnd.cpp b/Source/UI/UIMacroUserInfoWnd.cpp index f1d4f0fe1..071bd012d 100644 --- a/Source/UI/UIMacroUserInfoWnd.cpp +++ b/Source/UI/UIMacroUserInfoWnd.cpp @@ -10,8 +10,8 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Actors/GameActor.h" -#include "Contents/MapInfoMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Map/MapInfoMgr.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/World/World.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/UIPreviewEquipWnd.cpp b/Source/UI/UIPreviewEquipWnd.cpp index 44401b406..5400bb9fe 100644 --- a/Source/UI/UIPreviewEquipWnd.cpp +++ b/Source/UI/UIPreviewEquipWnd.cpp @@ -8,8 +8,8 @@ #include "Contents/Actors/CharacterRender.h" #include "Contents/Actors/Pc.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/Combat/CombatTypes.h" -#include "Contents/MessageTable.h" +#include "Contents/CombatTypes.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "Render/Renderer.h" #include "UI/Buttons/UIBasicButton.h" diff --git a/Source/UI/UIRefiningWnd.cpp b/Source/UI/UIRefiningWnd.cpp index 6d753069d..93ca19639 100644 --- a/Source/UI/UIRefiningWnd.cpp +++ b/Source/UI/UIRefiningWnd.cpp @@ -14,7 +14,7 @@ #include "Contents/Sound/SoundMgr.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemId.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/UIReputeWnd.cpp b/Source/UI/UIReputeWnd.cpp index 97318f60c..46c881643 100644 --- a/Source/UI/UIReputeWnd.cpp +++ b/Source/UI/UIReputeWnd.cpp @@ -3,8 +3,8 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIWindowMgr.h" #include "UI/UIReputeWnd.h" -#include "Contents/MessageTable.h" -#include "Contents/ReputeMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Repute/ReputeMgr.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" diff --git a/Source/UI/UIReputeWnd.h b/Source/UI/UIReputeWnd.h index 7df69638f..ba7ee7890 100644 --- a/Source/UI/UIReputeWnd.h +++ b/Source/UI/UIReputeWnd.h @@ -2,7 +2,7 @@ #define RAGNAROK_SOURCE_UI_UIREPUTEWND_H #include "UI/Window/UIFrameWnd.h" -#include "Contents/ReputeMgr.h" +#include "Contents/Repute/ReputeMgr.h" #include #include diff --git a/Source/UI/UIRoundBoxTooltipWnd.cpp b/Source/UI/UIRoundBoxTooltipWnd.cpp index 4e1ee7e34..681ce704b 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.cpp +++ b/Source/UI/UIRoundBoxTooltipWnd.cpp @@ -5,7 +5,7 @@ #include "Client/Input/Mouse.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" #include "UI/Buttons/UITextButton.h" diff --git a/Source/UI/Window/FuncDrawWNDChar.cpp b/Source/UI/Window/FuncDrawWNDChar.cpp index 0a3819dfc..7f35dbc42 100644 --- a/Source/UI/Window/FuncDrawWNDChar.cpp +++ b/Source/UI/Window/FuncDrawWNDChar.cpp @@ -1,8 +1,8 @@ #include "UI/Window/FuncDrawWNDChar.h" #include "Client/Session.h" #include "Script/LuaScript.h" -#include "Contents/SpriteRidingOffset.h" -#include "Contents/SpriteRidingPolicy.h" +#include "Contents/Sprites/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingPolicy.h" #include "Resource/Sprites/ActionResource.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Skills/ClientSkills.h" diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.cpp b/Source/UI/Window/UIAccountLimitedToolWnd.cpp index 74b64ccc7..77f1ff6e7 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.cpp +++ b/Source/UI/Window/UIAccountLimitedToolWnd.cpp @@ -4,7 +4,7 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMessage.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Buttons/UIBitmapButton.h" diff --git a/Source/UI/Window/UIBalloonOpenBtn.cpp b/Source/UI/Window/UIBalloonOpenBtn.cpp index 01fa2cfa1..8a72c1786 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.cpp +++ b/Source/UI/Window/UIBalloonOpenBtn.cpp @@ -3,7 +3,7 @@ #include "UI/Window/WindowId.h" #include "Client/Session.h" -#include "Contents/SpecialPopupMgr.h" +#include "Contents/Events/SpecialPopupMgr.h" #include "Render/Renderer.h" #include "UI/Text/UITransBalloonText.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/UIBasicInfoWnd.cpp b/Source/UI/Window/UIBasicInfoWnd.cpp index 29bfed239..a0c13b751 100644 --- a/Source/UI/Window/UIBasicInfoWnd.cpp +++ b/Source/UI/Window/UIBasicInfoWnd.cpp @@ -19,7 +19,7 @@ #include "UI/UIBarGraph.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowBorder.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Items/UIEquipWnd.h" #include "UI/Layout/SnapMgr.h" #include "UI/Lists/UITabControl.h" diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.cpp b/Source/UI/Window/UIBattleMsgOptionWnd.cpp index 28da7fffc..358f21593 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.cpp +++ b/Source/UI/Window/UIBattleMsgOptionWnd.cpp @@ -4,7 +4,7 @@ #include "UI/Window/UIBattleMsgOptionWnd.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Window/UIChangeNameWnd.cpp index d2ea4e7e8..a6658fd2e 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Window/UIChangeNameWnd.cpp @@ -14,9 +14,9 @@ #include "UI/Text/NavigationLink.h" #include "Client/Session.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Jobs/JobInheritance.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/Window/UIEmblemWnd.cpp b/Source/UI/Window/UIEmblemWnd.cpp index e98801e1c..9a0511e8c 100644 --- a/Source/UI/Window/UIEmblemWnd.cpp +++ b/Source/UI/Window/UIEmblemWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "Contents/Actors/RenderObject.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/GuildMgr.h" +#include "Contents/Guild/GuildMgr.h" #include "Render/Renderer.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/EmblemResource.h" diff --git a/Source/UI/Window/UIEscOptionWnd.cpp b/Source/UI/Window/UIEscOptionWnd.cpp index d2c649e33..9dfd9b724 100644 --- a/Source/UI/Window/UIEscOptionWnd.cpp +++ b/Source/UI/Window/UIEscOptionWnd.cpp @@ -4,7 +4,7 @@ #include "UI/Window/UIEnums.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "File/ShortcutFilename.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index d61bcdd67..5b7357d6e 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -4,7 +4,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/UIWindowMgr.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "UI/Window/InputFocus.h" @@ -35,10 +35,10 @@ #include "UI/Window/WindowManagerWindows.h" #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Configuration/ServiceOptions.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Jobs/JobInheritance.h" #include "Contents/Sound/SoundMgr.h" -#include "Contents/TipOfTheDay.h" +#include "Contents/Tables/TipOfTheDay.h" #include "Network/TextEncoding.h" #include "Render/Renderer.h" #include "UI/Chat/UIChatRoomTitle.h" diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index 29c9a4853..1ff05a737 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -11,7 +11,7 @@ #include "Client/Session.h" #include "Contents/Hotkeys/UserHotkeyMgr.h" #include "Contents/Skills/AutomaticSkills.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UIButton.h" diff --git a/Source/UI/Window/UIJobListWnd.cpp b/Source/UI/Window/UIJobListWnd.cpp index c2f6a1e46..a44c2b1af 100644 --- a/Source/UI/Window/UIJobListWnd.cpp +++ b/Source/UI/Window/UIJobListWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIJobListWnd.h" #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 20ab05067..ce21cf7f9 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -5,7 +5,7 @@ #include "UI/Window/UIEnums.h" #include "Render/Text/FontCache.h" #include "Contents/Items/ItemDescription.h" -#include "Contents/Combat/CombatTypes.h" +#include "Contents/CombatTypes.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/TextureNames.h" @@ -44,7 +44,7 @@ #include "UI/Window/InputFocus.h" #include "UI/Buttons/UIButton.h" #include "Render/Text/TextContext.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Text/ColoredText.h" #include "Client/Mode/CMode.h" #include "UI/Window/UIPayConfirmWnd.h" @@ -82,15 +82,15 @@ #include "Contents/Sound/SoundMaker.h" #include "UI/Buttons/UICheckBox.h" #include "Contents/ClientState.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "UI/Window/UINormalMB.h" #include "UI/Buttons/UINoneVisibleButton.h" -#include "Contents/PetEvolutionMgr.h" +#include "Contents/Pet/PetEvolutionMgr.h" #include "Contents/Items/ItemInfo.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include #include "Contents/Actors/Pc.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" diff --git a/Source/UI/Window/UIMileageWnd.cpp b/Source/UI/Window/UIMileageWnd.cpp index 6d8ca62e4..3b863f398 100644 --- a/Source/UI/Window/UIMileageWnd.cpp +++ b/Source/UI/Window/UIMileageWnd.cpp @@ -3,7 +3,7 @@ #include "UI/Window/UIMileageWnd.h" #include "Client/Session.h" #include "Client/Mode/ModeMgr.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Configuration/ServiceOptions.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Window/UINavigationHelpWnd.cpp b/Source/UI/Window/UINavigationHelpWnd.cpp index a408a4a73..1185cbdf5 100644 --- a/Source/UI/Window/UINavigationHelpWnd.cpp +++ b/Source/UI/Window/UINavigationHelpWnd.cpp @@ -3,7 +3,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UINavigationHelpWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIButton.h" #include "UI/Text/UITextViewer.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp index f168f6452..c2b7966ca 100644 --- a/Source/UI/Window/UINavigationWnd.cpp +++ b/Source/UI/Window/UINavigationWnd.cpp @@ -5,8 +5,8 @@ #include "Client/Application/Launcher.h" #include "Client/Replay.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" #include "File/FileEnumeration.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" diff --git a/Source/UI/Window/UINewMakeCharWnd.cpp b/Source/UI/Window/UINewMakeCharWnd.cpp index 5269d0efd..a05f5f3fc 100644 --- a/Source/UI/Window/UINewMakeCharWnd.cpp +++ b/Source/UI/Window/UINewMakeCharWnd.cpp @@ -8,8 +8,8 @@ #include "Client/Session.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Renderer.h" #include "Render/Textures/SpriteAtlas.h" diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h index 3064ecee4..dff064659 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Window/UINewMakeCharWnd.h @@ -11,7 +11,7 @@ #include "UI/Window/UIFrameWnd.h" #include "UI/Window/UIWindowMgr.h" #include "Client/Mode/CLoginMode.h" -#include "Contents/ForbiddenWords.h" +#include "Contents/Tables/ForbiddenWords.h" #include "Contents/Jobs/JobInheritance.h" #include diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Window/UINewSelectCharWnd.cpp index 2ae477a92..62e65769f 100644 --- a/Source/UI/Window/UINewSelectCharWnd.cpp +++ b/Source/UI/Window/UINewSelectCharWnd.cpp @@ -1,6 +1,6 @@ #include "Client/Mode/ModeMessage.h" #include "UI/Window/WindowId.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Window/UIEnums.h" #include "Client/Mode/CMode.h" #include "Client/Input/Mouse.h" @@ -21,7 +21,7 @@ #include "Render/Text/FontCache.h" #include "Render/Text/TextContext.h" #include "Contents/Actors/Pc.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "UI/UIStaticBitmap.h" #include "Contents/Async/AsyncWorkMgr.h" #include "Contents/Hotkeys/EmotionHotkeys.h" diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp index 25fcd4115..253a04a1f 100644 --- a/Source/UI/Window/UINewSkillListWnd.cpp +++ b/Source/UI/Window/UINewSkillListWnd.cpp @@ -10,7 +10,7 @@ #include "Client/Replay.h" #include "Client/Session.h" #include "Contents/Jobs/JobNames.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Skills/AutomaticSkills.h" #include "Contents/Hotkeys/HotkeyInfo.h" #include "Contents/Skills/SkillId.h" @@ -35,7 +35,7 @@ #include "Utility/Text/FormatString.h" #include "Contents/Actors/Pc.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Render/DeviceContext/DeviceContext.h" #include "Render/Textures/SpriteAtlas.h" #include "Render/Textures/SpritePixels.h" diff --git a/Source/UI/Window/UINormalMB.cpp b/Source/UI/Window/UINormalMB.cpp index e02d837bc..61eeca8bf 100644 --- a/Source/UI/Window/UINormalMB.cpp +++ b/Source/UI/Window/UINormalMB.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/UINormalMB.h" #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Render/Renderer.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" diff --git a/Source/UI/Window/UINoteWnd.cpp b/Source/UI/Window/UINoteWnd.cpp index e6c7843b3..79580b77d 100644 --- a/Source/UI/Window/UINoteWnd.cpp +++ b/Source/UI/Window/UINoteWnd.cpp @@ -1,6 +1,6 @@ #include "UI/Window/UINoteWnd.h" #include "UI/Window/UIEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Lists/UIScrollBar.h" #include "UI/Text/UIStaticText_LF.h" diff --git a/Source/UI/Window/UIOpenMailBoxWnd.cpp b/Source/UI/Window/UIOpenMailBoxWnd.cpp index 0b397d123..beb1c6ae5 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.cpp +++ b/Source/UI/Window/UIOpenMailBoxWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/WindowId.h" #include "UI/Buttons/UIBitmapButton.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Window/WindowManagerWindows.h" diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.cpp b/Source/UI/Window/UIPartyBookingHelpWnd.cpp index d0416e7b3..b22a8c573 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.cpp +++ b/Source/UI/Window/UIPartyBookingHelpWnd.cpp @@ -4,7 +4,7 @@ #include "Client/Session.h" #include "Client/Input/InputCharset.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Script/LuaScript.h" #include "UI/Buttons/UIButton.h" #include "UI/Text/UITextViewer.h" diff --git a/Source/UI/Window/UIPetEvolutionWnd.cpp b/Source/UI/Window/UIPetEvolutionWnd.cpp index 489292405..03a6577f6 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.cpp +++ b/Source/UI/Window/UIPetEvolutionWnd.cpp @@ -4,8 +4,8 @@ #include "Client/Session.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" -#include "Contents/PetEvolutionMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Pet/PetEvolutionMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Resource/Bitmap/BitmapResource.h" diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Window/UIRoMapWnd.cpp index 9319d104c..42f1f9ba5 100644 --- a/Source/UI/Window/UIRoMapWnd.cpp +++ b/Source/UI/Window/UIRoMapWnd.cpp @@ -6,8 +6,8 @@ #include "Client/Mode/CMode.h" #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" -#include "Contents/MapSkyMgr.h" -#include "Contents/NavigationManager.h" +#include "Contents/Map/MapSkyMgr.h" +#include "Contents/Navigation/NavigationManager.h" #include "Render/Primitives/AlphaRectangle.h" #include "Render/Renderer.h" #include "Render/ScreenGeometry.h" @@ -24,7 +24,7 @@ #include "UI/Window/WindowManagerWindows.h" #include "Contents/Messenger/ClientMessenger.h" #include "Client/Replay.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Edit/UIEditCtrl.h" diff --git a/Source/UI/Window/UIRoMapWnd.h b/Source/UI/Window/UIRoMapWnd.h index 86ee306f2..a6c5e17fc 100644 --- a/Source/UI/Window/UIRoMapWnd.h +++ b/Source/UI/Window/UIRoMapWnd.h @@ -1,8 +1,8 @@ #ifndef RAGNAROK_SOURCE_UI_WINDOW_UIROMAPWND_H #define RAGNAROK_SOURCE_UI_WINDOW_UIROMAPWND_H -#include "Contents/FlyingShipRouteInfo.h" -#include "Contents/WorldView/WorldViewData.h" +#include "Contents/Map/FlyingShipRouteInfo.h" +#include "Contents/World/WorldViewData.h" #include "UI/Window/UIFrameWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Navigation/UINavigationV4Wnd.h" diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp index 47750eb24..3a3554911 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Window/UIRodexContentsWnd.cpp @@ -13,13 +13,13 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RodexMailStore.h" -#include "Contents/SkinMgr.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Rodex/RodexMailStore.h" +#include "Contents/Skin/SkinMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Network/Packets/NoticeEnums.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" diff --git a/Source/UI/Window/UIRoulletteWnd.cpp b/Source/UI/Window/UIRoulletteWnd.cpp index 109cff6dc..55b17125f 100644 --- a/Source/UI/Window/UIRoulletteWnd.cpp +++ b/Source/UI/Window/UIRoulletteWnd.cpp @@ -8,9 +8,9 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemNaming.h" -#include "Contents/MessageTable.h" -#include "Contents/PlayerNameDictionary.h" -#include "Contents/RouletteMgr.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Actors/PlayerNameDictionary.h" +#include "Contents/Events/RouletteMgr.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/Window/UISecondCostumeWnd.cpp b/Source/UI/Window/UISecondCostumeWnd.cpp index 307a4616d..11431d551 100644 --- a/Source/UI/Window/UISecondCostumeWnd.cpp +++ b/Source/UI/Window/UISecondCostumeWnd.cpp @@ -8,7 +8,7 @@ #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" #include "UI/Window/FuncDrawWNDChar.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Lists/UIComboBoxDefWnd.h" #include "UI/Lists/UIListBoxNavi.h" diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp index cdb483544..2cebde1db 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Window/UISeekPartyListWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Party/PartyBookingMgr.h" #include "Contents/Sound/SoundMgr.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Window/UISeekPartyMBWnd.cpp index 77ec0d1bb..8078e730a 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.cpp +++ b/Source/UI/Window/UISeekPartyMBWnd.cpp @@ -2,7 +2,7 @@ #include "UI/Window/WindowId.h" #include "UI/Window/UIEnums.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/UserData/NormalItemSlots.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketId.h" diff --git a/Source/UI/Window/UISeekPartyWnd.cpp b/Source/UI/Window/UISeekPartyWnd.cpp index 18376197e..9eb997a3e 100644 --- a/Source/UI/Window/UISeekPartyWnd.cpp +++ b/Source/UI/Window/UISeekPartyWnd.cpp @@ -1,7 +1,7 @@ #include "UI/Window/UISeekPartyWnd.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Text/UIStaticText.h" #include "UI/Window/UIJobListWnd.h" diff --git a/Source/UI/Window/UISelCharForUServerWnd.cpp b/Source/UI/Window/UISelCharForUServerWnd.cpp index c7777d955..c50f17035 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.cpp +++ b/Source/UI/Window/UISelCharForUServerWnd.cpp @@ -5,7 +5,7 @@ #include "Client/Mode/CMode.h" #include "Client/Session.h" #include "Contents/Actors/Pc.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Client/Session.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Window/UISerachStoreInfoWnd.cpp index 85e95d8ef..b748fd7a3 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.cpp +++ b/Source/UI/Window/UISerachStoreInfoWnd.cpp @@ -6,7 +6,7 @@ #include "Client/Mode/ModeMgr.h" #include "Client/Session.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Network/Connection/Connection.h" #include "Network/Packets/PacketLengths.h" #include "Network/Packets/NoticeEnums.h" diff --git a/Source/UI/Window/UIShowWarpWnd.cpp b/Source/UI/Window/UIShowWarpWnd.cpp index 868558c8c..0d6323e51 100644 --- a/Source/UI/Window/UIShowWarpWnd.cpp +++ b/Source/UI/Window/UIShowWarpWnd.cpp @@ -4,7 +4,7 @@ #include "UI/Buttons/UIBitmapButton.h" #include "Client/Replay.h" #include "Client/Session.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Lists/UIListBox.h" #include "UI/Window/UIWindowMgr.h" diff --git a/Source/UI/Window/UIVideoWnd.cpp b/Source/UI/Window/UIVideoWnd.cpp index 0e76a946e..38e70d761 100644 --- a/Source/UI/Window/UIVideoWnd.cpp +++ b/Source/UI/Window/UIVideoWnd.cpp @@ -4,7 +4,7 @@ #include "UI/Window/UIEnums.h" #include "UI/Window/UIVideoWnd.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "Contents/Movies/BinkMovie.h" #include "Contents/Sound/SoundMgr.h" #include "Render/Textures/Texture.h" diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 2de0e0dca..bdf6c2d62 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -17,9 +17,9 @@ #include "Client/Mode/CGameMode.h" #include "Client/Replay.h" #include "Contents/Configuration/ServiceConfiguration.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/SpriteRidingOffset.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/Sprites/SpriteRidingOffset.h" #include "Client/Session.h" #include "Client/Mode/ModeEvents.h" #include "Network/TextEncoding.h" @@ -70,8 +70,8 @@ #include "Utility/Text/StringUtil.h" #include "Contents/Items/ItemDescription.h" #include "Contents/Items/ItemInfo.h" -#include "Contents/PrivateAirplaneMgr.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/Map/PrivateAirplaneMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Resource/MSGSTRINGID.h" #include #include diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index 55687e33c..ea1d9bc5f 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -30,9 +30,9 @@ #include "UI/Window/UIRoMapWnd.h" #include "UI/Navigation/UINavigationV4Wnd.h" #include "Client/Mode/CLoginMode.h" -#include "Contents/MessageTable.h" -#include "Contents/NavigationManager.h" -#include "Contents/WorldView/WorldViewData.h" +#include "Contents/Tables/MessageTable.h" +#include "Contents/Navigation/NavigationManager.h" +#include "Contents/World/WorldViewData.h" #include "Resource/ResourceMgr.h" #include "File/ShortcutFilename.h" #include "Contents/Sound/SoundMgr.h" @@ -44,7 +44,7 @@ #include "Client/Mode/CGameMode.h" #include "Contents/Actors/Pc.h" #include "Contents/World/World.h" -#include "Contents/RouletteMgr.h" +#include "Contents/Events/RouletteMgr.h" #include "UI/Item/UIItemStoreWnd.h" #include "UI/Item/UIItemWnd.h" #include "UI/Lists/UIComboBox.h" @@ -61,8 +61,8 @@ #include "Render/Textures/Surface.h" #include "UI/FrameSkin.h" #include "UI/Window/UIRegisterMgr.h" -#include "Contents/ClanInfo.h" -#include "Contents/GuildMgr.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" @@ -76,15 +76,15 @@ #include "UI/Chat/UINewChatWnd.h" #include "UI/Lists/UITabControl.h" #include "UI/Window/UIChatRoomWnd.h" -#include "Contents/GuildInfo.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 "Contents/Items/RuneSystem.h" -#include "Contents/MapPropertyMgr.h" -#include "Contents/MapSkyMgr.h" +#include "Contents/RuneSystem/RuneSystem.h" +#include "Contents/Map/MapPropertyMgr.h" +#include "Contents/Map/MapSkyMgr.h" #include "Contents/Messenger/MessengerWindows.h" #include "Contents/Skills/ClientSkills.h" #include "Contents/UserData/NormalItemSlots.h" diff --git a/Source/UI/Window/UIZeroChatWnd.cpp b/Source/UI/Window/UIZeroChatWnd.cpp index ccf0a02c8..ef628721e 100644 --- a/Source/UI/Window/UIZeroChatWnd.cpp +++ b/Source/UI/Window/UIZeroChatWnd.cpp @@ -1,5 +1,5 @@ #include "UI/Window/UIBalloonOpenBtn.h" -#include "Contents/MessageTable.h" +#include "Contents/Tables/MessageTable.h" #include "UI/Buttons/UIBasicButton.h" #include "UI/Buttons/UIBitmapButton.h" #include "UI/Guild/UIGuild_Storage_Log.h" diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp index 2924556f1..98ededd41 100644 --- a/Source/UI/Window/WindowMgrState.cpp +++ b/Source/UI/Window/WindowMgrState.cpp @@ -12,7 +12,7 @@ #include "Contents/Configuration/ServiceConfiguration.h" #include "Contents/Messenger/ClientMessenger.h" #include "Contents/Messenger/MessengerMember.h" -#include "Contents/NavigationManager.h" +#include "Contents/Navigation/NavigationManager.h" #include "Contents/UserData/NormalItemSlots.h" #include "Contents/World/World.h" #include "Render/DeviceContext/DCSurface.h" diff --git a/Source/Utility/JsonCppLoader.h b/Source/Utility/JsonCppLoader.h index f4cba52cf..829ece43e 100644 --- a/Source/Utility/JsonCppLoader.h +++ b/Source/Utility/JsonCppLoader.h @@ -10,7 +10,7 @@ #include #include -#include "Contents/ReputeRecords.h" +#include "Contents/Repute/ReputeRecords.h" struct EZ2STREffectRecord; diff --git a/data/compile.json b/data/compile.json index a20f0f2fa..078856f1f 100644 --- a/data/compile.json +++ b/data/compile.json @@ -342,179 +342,180 @@ "Source/Client/SessionState.cpp": 0, "Source/Client/Stove/StoveMgr.cpp": 0, "Source/Client/Timer.cpp": 0, - "Source/Contents/AchievementMgr.cpp": 4, - "Source/Contents/ActorGeometry.cpp": 4, - "Source/Contents/ActorMovementRoute.cpp": 4, - "Source/Contents/ActorNameCache.cpp": 4, - "Source/Contents/ActorNameCard.cpp": 4, - "Source/Contents/ActorNameDirectory.cpp": 4, - "Source/Contents/ActorNameRequests.cpp": 4, + "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/ActorStateFlags.cpp": 4, "Source/Contents/Actors/AttackMotion.cpp": 4, "Source/Contents/Actors/CharacterRender.cpp": 4, "Source/Contents/Actors/GameActor.cpp": 4, "Source/Contents/Actors/GameObject.cpp": 4, - "Source/Contents/Actors/GraffiSkill.cpp": 4, "Source/Contents/Actors/GroundScope.cpp": 4, "Source/Contents/Actors/Item.cpp": 4, "Source/Contents/Actors/MercenaryAI.cpp": 4, "Source/Contents/Actors/MousePointer.cpp": 4, "Source/Contents/Actors/Player.cpp": 4, + "Source/Contents/Actors/PlayerNameDictionary.cpp": 4, "Source/Contents/Actors/RenderObject.cpp": 4, "Source/Contents/Actors/RenderObjectState.cpp": 4, + "Source/Contents/Actors/Resources/BodyResources.cpp": 4, + "Source/Contents/Actors/Resources/EquipmentResources.cpp": 4, + "Source/Contents/Actors/Resources/HeadResources.cpp": 4, + "Source/Contents/Actors/Resources/MonsterResources.cpp": 4, + "Source/Contents/Actors/Resources/RobeResources.cpp": 4, + "Source/Contents/Actors/Resources/StatusIconImages.cpp": 4, "Source/Contents/Actors/Skill.cpp": 4, "Source/Contents/Actors/SpriteDrawingPolicy.cpp": 4, - "Source/Contents/AdventureGuideMgr.cpp": 4, + "Source/Contents/AdventureGuide/AdventureGuideMgr.cpp": 4, "Source/Contents/Async/AsyncWorkMgr.cpp": 4, "Source/Contents/Async/AsyncWorkRecycleObjectPoolMgr.cpp": 4, - "Source/Contents/BodyResources.cpp": 4, "Source/Contents/Camera/CameraFrame.cpp": 3, "Source/Contents/Camera/CameraQueries.cpp": 3, "Source/Contents/Camera/CameraShake.cpp": 3, "Source/Contents/Camera/CameraSmoothing.cpp": 3, - "Source/Contents/CashEmotionMgr.cpp": 4, - "Source/Contents/ChampionMonsterMgr.cpp": 4, - "Source/Contents/CheckAttendanceMgr.cpp": 4, - "Source/Contents/ClanInfo.cpp": 4, - "Source/Contents/ClientItemLists.cpp": 4, + "Source/Contents/CashEmotion/CashEmotionMgr.cpp": 4, + "Source/Contents/Clan/ClanInfo.cpp": 4, "Source/Contents/ClientState.cpp": 4, - "Source/Contents/ClientTiming.cpp": 4, - "Source/Contents/ClientXmlTables.cpp": 4, - "Source/Contents/ConfigMgr.cpp": 4, + "Source/Contents/Configuration/ConfigMgr.cpp": 4, "Source/Contents/Configuration/OptionWriter.cpp": 4, "Source/Contents/Configuration/ScriptOptions.cpp": 4, "Source/Contents/Configuration/ServiceConfiguration.cpp": 4, "Source/Contents/Configuration/ServiceOptions.cpp": 4, - "Source/Contents/EffectResourceSwitcher.cpp": 4, - "Source/Contents/Effects/AMachineEffect.cpp": 4, - "Source/Contents/Effects/AcidifiedThrow.cpp": 4, - "Source/Contents/Effects/AnimatedEmitterEffect.cpp": 4, - "Source/Contents/Effects/ArrowEffect.cpp": 4, - "Source/Contents/Effects/AstralStrikeEffect.cpp": 4, - "Source/Contents/Effects/AxeBoomerang.cpp": 4, - "Source/Contents/Effects/Bash.cpp": 4, - "Source/Contents/Effects/BezierArcThrowEffect.cpp": 4, - "Source/Contents/Effects/BindTrapEffect.cpp": 4, - "Source/Contents/Effects/BlastForge.cpp": 4, - "Source/Contents/Effects/CaneOfEvilEyeEffect.cpp": 4, - "Source/Contents/Effects/CartCannon.cpp": 4, - "Source/Contents/Effects/CellRangeEffect.cpp": 4, - "Source/Contents/Effects/ChangeSizeEffect.cpp": 4, - "Source/Contents/Effects/CharacterParticleBundle.cpp": 4, - "Source/Contents/Effects/ChargingPierceEffect.cpp": 4, - "Source/Contents/Effects/CherryBlossomEffect.cpp": 4, - "Source/Contents/Effects/ClimaxEffect.cpp": 4, - "Source/Contents/Effects/CloudEffect.cpp": 4, - "Source/Contents/Effects/CloudKillEffect.cpp": 4, - "Source/Contents/Effects/CommonFloorEffect.cpp": 4, - "Source/Contents/Effects/Competentia.cpp": 4, - "Source/Contents/Effects/CresciveBolt.cpp": 4, - "Source/Contents/Effects/DummyEffectLauncher.cpp": 4, - "Source/Contents/Effects/EZ2STREffect.cpp": 4, - "Source/Contents/Effects/EZ2STREffectEx.cpp": 4, - "Source/Contents/Effects/Effect.cpp": 0, - "Source/Contents/Effects/EffectActor.cpp": 4, - "Source/Contents/Effects/EffectAttachments.cpp": 4, - "Source/Contents/Effects/EffectForceRender.cpp": 4, - "Source/Contents/Effects/EffectLists.cpp": 0, - "Source/Contents/Effects/EffectMaker.cpp": 4, - "Source/Contents/Effects/EffectMemoryMgr.cpp": 4, - "Source/Contents/Effects/EffectPrim.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveArcs.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveColor.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveGlowSquares.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveMotion.cpp": 4, - "Source/Contents/Effects/EffectPrimitivePanels.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveRecords.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveRendering.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveSprites.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveState.cpp": 4, - "Source/Contents/Effects/EffectPrimitiveSweeps.cpp": 4, - "Source/Contents/Effects/EffectTypes.cpp": 4, - "Source/Contents/Effects/EffectVisibility.cpp": 4, - "Source/Contents/Effects/ElectricEffect.cpp": 4, - "Source/Contents/Effects/EmitterEffect.cpp": 4, - "Source/Contents/Effects/EnergyOrbEffect.cpp": 4, - "Source/Contents/Effects/EvilLandEffect.cpp": 4, - "Source/Contents/Effects/EvilsPawEffect.cpp": 4, - "Source/Contents/Effects/FlowerCastingEffect.cpp": 4, - "Source/Contents/Effects/FortuneKissEffect.cpp": 4, - "Source/Contents/Effects/FriggSongEffect.cpp": 4, - "Source/Contents/Effects/FuumaShouakuEffect.cpp": 4, - "Source/Contents/Effects/GlassWallEffect.cpp": 4, - "Source/Contents/Effects/HealEffect.cpp": 4, - "Source/Contents/Effects/HealSpEffect.cpp": 4, - "Source/Contents/Effects/HitLineEffect.cpp": 4, - "Source/Contents/Effects/JupitelThunderStormEffect.cpp": 4, - "Source/Contents/Effects/Level150Effect.cpp": 4, - "Source/Contents/Effects/Level99Effect.cpp": 4, - "Source/Contents/Effects/Level99Orb1Effect.cpp": 4, - "Source/Contents/Effects/Level99Orb2Effect.cpp": 4, - "Source/Contents/Effects/LightSphereEffect.cpp": 4, - "Source/Contents/Effects/MagicFloorEffect.cpp": 4, - "Source/Contents/Effects/MagnumBreak.cpp": 4, - "Source/Contents/Effects/MandraAttackEffect.cpp": 4, - "Source/Contents/Effects/MapChainEffect.cpp": 4, - "Source/Contents/Effects/MapMagicZoneEffect.cpp": 4, - "Source/Contents/Effects/MappillarEffect.cpp": 4, - "Source/Contents/Effects/MeteorEffect.cpp": 4, - "Source/Contents/Effects/MonsterSkillEffects.cpp": 4, - "Source/Contents/Effects/MsgEffect.cpp": 4, - "Source/Contents/Effects/NyanggrassEffect.cpp": 4, - "Source/Contents/Effects/Particle.cpp": 4, - "Source/Contents/Effects/ParticlePool.cpp": 4, - "Source/Contents/Effects/PartyMemberEffects.cpp": 4, - "Source/Contents/Effects/PokJukEffect.cpp": 4, - "Source/Contents/Effects/PowderingEffect.cpp": 4, - "Source/Contents/Effects/RagEffect.cpp": 4, - "Source/Contents/Effects/RagEffectInitialization.cpp": 4, - "Source/Contents/Effects/RainbowEffect.cpp": 4, - "Source/Contents/Effects/RectUpEffect.cpp": 4, - "Source/Contents/Effects/RedLineEffect.cpp": 4, - "Source/Contents/Effects/RichManKim.cpp": 4, - "Source/Contents/Effects/RotateBgEffect.cpp": 4, - "Source/Contents/Effects/RotateItemEffect.cpp": 4, - "Source/Contents/Effects/RotateLineEffect.cpp": 4, - "Source/Contents/Effects/SaintCastingEffect.cpp": 4, - "Source/Contents/Effects/ScatterEffect.cpp": 4, - "Source/Contents/Effects/ShadowExceedEffect.cpp": 4, - "Source/Contents/Effects/ShadowExceedNewEffect.cpp": 4, - "Source/Contents/Effects/ShowEffect.cpp": 4, - "Source/Contents/Effects/SmokeEffect.cpp": 4, - "Source/Contents/Effects/SoulCollectEffect.cpp": 4, - "Source/Contents/Effects/SoulUnityEffect.cpp": 4, - "Source/Contents/Effects/SphereWind2Effect.cpp": 4, - "Source/Contents/Effects/SphereWindEffect.cpp": 4, - "Source/Contents/Effects/SpriteEffect.cpp": 4, - "Source/Contents/Effects/SpriteParticle.cpp": 4, - "Source/Contents/Effects/SquareRangeEffect.cpp": 4, - "Source/Contents/Effects/StarEffect.cpp": 4, - "Source/Contents/Effects/StarEmperorEffect.cpp": 4, - "Source/Contents/Effects/StealEffect.cpp": 4, - "Source/Contents/Effects/StormCannonEffect.cpp": 4, - "Source/Contents/Effects/StormGustEffect.cpp": 4, - "Source/Contents/Effects/StormKickEffect.cpp": 4, - "Source/Contents/Effects/SunStanceEffect.cpp": 4, - "Source/Contents/Effects/TalismanMarkEffect.cpp": 4, - "Source/Contents/Effects/TetraBallEffect.cpp": 4, - "Source/Contents/Effects/ThrowEffects.cpp": 4, - "Source/Contents/Effects/TriangleShotArrow.cpp": 4, - "Source/Contents/Effects/ViolentQuakeEffect.cpp": 4, - "Source/Contents/Effects/WindEffect.cpp": 4, - "Source/Contents/EmblemCacheRaw.cpp": 4, + "Source/Contents/Effects/Core/CellRangeEffect.cpp": 4, + "Source/Contents/Effects/Core/ChangeSizeEffect.cpp": 4, + "Source/Contents/Effects/Core/DummyEffectLauncher.cpp": 4, + "Source/Contents/Effects/Core/Effect.cpp": 0, + "Source/Contents/Effects/Core/EffectActor.cpp": 4, + "Source/Contents/Effects/Core/EffectAttachments.cpp": 4, + "Source/Contents/Effects/Core/EffectForceRender.cpp": 4, + "Source/Contents/Effects/Core/EffectLists.cpp": 0, + "Source/Contents/Effects/Core/EffectMaker.cpp": 4, + "Source/Contents/Effects/Core/EffectMemoryMgr.cpp": 4, + "Source/Contents/Effects/Core/EffectTypes.cpp": 4, + "Source/Contents/Effects/Core/EffectVisibility.cpp": 4, + "Source/Contents/Effects/Core/MsgEffect.cpp": 4, + "Source/Contents/Effects/Core/RagEffect.cpp": 4, + "Source/Contents/Effects/Core/RagEffectInitialization.cpp": 4, + "Source/Contents/Effects/Core/ShowEffect.cpp": 4, + "Source/Contents/Effects/Core/SquareRangeEffect.cpp": 4, + "Source/Contents/Effects/EffectResourceSwitcher.cpp": 4, + "Source/Contents/Effects/Particles/AnimatedEmitterEffect.cpp": 4, + "Source/Contents/Effects/Particles/CharacterParticleBundle.cpp": 4, + "Source/Contents/Effects/Particles/EZ2STREffect.cpp": 4, + "Source/Contents/Effects/Particles/EZ2STREffectEx.cpp": 4, + "Source/Contents/Effects/Particles/EmitterEffect.cpp": 4, + "Source/Contents/Effects/Particles/Particle.cpp": 4, + "Source/Contents/Effects/Particles/ParticlePool.cpp": 4, + "Source/Contents/Effects/Particles/SpriteEffect.cpp": 4, + "Source/Contents/Effects/Particles/SpriteParticle.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrim.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveArcs.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveColor.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveGlowSquares.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveMotion.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitivePanels.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveRecords.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveSprites.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveState.cpp": 4, + "Source/Contents/Effects/Primitives/EffectPrimitiveSweeps.cpp": 4, + "Source/Contents/Effects/RDamageVar.cpp": 4, + "Source/Contents/Effects/Skills/AMachineEffect.cpp": 4, + "Source/Contents/Effects/Skills/AcidifiedThrow.cpp": 4, + "Source/Contents/Effects/Skills/ArrowEffect.cpp": 4, + "Source/Contents/Effects/Skills/AstralStrikeEffect.cpp": 4, + "Source/Contents/Effects/Skills/AxeBoomerang.cpp": 4, + "Source/Contents/Effects/Skills/Bash.cpp": 4, + "Source/Contents/Effects/Skills/BezierArcThrowEffect.cpp": 4, + "Source/Contents/Effects/Skills/BindTrapEffect.cpp": 4, + "Source/Contents/Effects/Skills/BlastForge.cpp": 4, + "Source/Contents/Effects/Skills/CaneOfEvilEyeEffect.cpp": 4, + "Source/Contents/Effects/Skills/CartCannon.cpp": 4, + "Source/Contents/Effects/Skills/ChargingPierceEffect.cpp": 4, + "Source/Contents/Effects/Skills/CherryBlossomEffect.cpp": 4, + "Source/Contents/Effects/Skills/ClimaxEffect.cpp": 4, + "Source/Contents/Effects/Skills/CloudEffect.cpp": 4, + "Source/Contents/Effects/Skills/CloudKillEffect.cpp": 4, + "Source/Contents/Effects/Skills/CommonFloorEffect.cpp": 4, + "Source/Contents/Effects/Skills/Competentia.cpp": 4, + "Source/Contents/Effects/Skills/CresciveBolt.cpp": 4, + "Source/Contents/Effects/Skills/ElectricEffect.cpp": 4, + "Source/Contents/Effects/Skills/EnergyOrbEffect.cpp": 4, + "Source/Contents/Effects/Skills/EvilLandEffect.cpp": 4, + "Source/Contents/Effects/Skills/EvilsPawEffect.cpp": 4, + "Source/Contents/Effects/Skills/FlowerCastingEffect.cpp": 4, + "Source/Contents/Effects/Skills/FortuneKissEffect.cpp": 4, + "Source/Contents/Effects/Skills/FriggSongEffect.cpp": 4, + "Source/Contents/Effects/Skills/FuumaShouakuEffect.cpp": 4, + "Source/Contents/Effects/Skills/GlassWallEffect.cpp": 4, + "Source/Contents/Effects/Skills/HealEffect.cpp": 4, + "Source/Contents/Effects/Skills/HealSpEffect.cpp": 4, + "Source/Contents/Effects/Skills/HitLineEffect.cpp": 4, + "Source/Contents/Effects/Skills/JupitelThunderStormEffect.cpp": 4, + "Source/Contents/Effects/Skills/Level150Effect.cpp": 4, + "Source/Contents/Effects/Skills/Level99Effect.cpp": 4, + "Source/Contents/Effects/Skills/Level99Orb1Effect.cpp": 4, + "Source/Contents/Effects/Skills/Level99Orb2Effect.cpp": 4, + "Source/Contents/Effects/Skills/LightSphereEffect.cpp": 4, + "Source/Contents/Effects/Skills/MagicFloorEffect.cpp": 4, + "Source/Contents/Effects/Skills/MagnumBreak.cpp": 4, + "Source/Contents/Effects/Skills/MandraAttackEffect.cpp": 4, + "Source/Contents/Effects/Skills/MapChainEffect.cpp": 4, + "Source/Contents/Effects/Skills/MapMagicZoneEffect.cpp": 4, + "Source/Contents/Effects/Skills/MappillarEffect.cpp": 4, + "Source/Contents/Effects/Skills/MeteorEffect.cpp": 4, + "Source/Contents/Effects/Skills/MonsterSkillEffects.cpp": 4, + "Source/Contents/Effects/Skills/NyanggrassEffect.cpp": 4, + "Source/Contents/Effects/Skills/PartyMemberEffects.cpp": 4, + "Source/Contents/Effects/Skills/PokJukEffect.cpp": 4, + "Source/Contents/Effects/Skills/PowderingEffect.cpp": 4, + "Source/Contents/Effects/Skills/RainbowEffect.cpp": 4, + "Source/Contents/Effects/Skills/RectUpEffect.cpp": 4, + "Source/Contents/Effects/Skills/RedLineEffect.cpp": 4, + "Source/Contents/Effects/Skills/RichManKim.cpp": 4, + "Source/Contents/Effects/Skills/RotateBgEffect.cpp": 4, + "Source/Contents/Effects/Skills/RotateItemEffect.cpp": 4, + "Source/Contents/Effects/Skills/RotateLineEffect.cpp": 4, + "Source/Contents/Effects/Skills/SaintCastingEffect.cpp": 4, + "Source/Contents/Effects/Skills/ScatterEffect.cpp": 4, + "Source/Contents/Effects/Skills/ShadowExceedEffect.cpp": 4, + "Source/Contents/Effects/Skills/ShadowExceedNewEffect.cpp": 4, + "Source/Contents/Effects/Skills/SmokeEffect.cpp": 4, + "Source/Contents/Effects/Skills/SoulCollectEffect.cpp": 4, + "Source/Contents/Effects/Skills/SoulUnityEffect.cpp": 4, + "Source/Contents/Effects/Skills/SphereWind2Effect.cpp": 4, + "Source/Contents/Effects/Skills/SphereWindEffect.cpp": 4, + "Source/Contents/Effects/Skills/StarEffect.cpp": 4, + "Source/Contents/Effects/Skills/StarEmperorEffect.cpp": 4, + "Source/Contents/Effects/Skills/StealEffect.cpp": 4, + "Source/Contents/Effects/Skills/StormCannonEffect.cpp": 4, + "Source/Contents/Effects/Skills/StormGustEffect.cpp": 4, + "Source/Contents/Effects/Skills/StormKickEffect.cpp": 4, + "Source/Contents/Effects/Skills/SunStanceEffect.cpp": 4, + "Source/Contents/Effects/Skills/TalismanMarkEffect.cpp": 4, + "Source/Contents/Effects/Skills/TetraBallEffect.cpp": 4, + "Source/Contents/Effects/Skills/ThrowEffects.cpp": 4, + "Source/Contents/Effects/Skills/TriangleShotArrow.cpp": 4, + "Source/Contents/Effects/Skills/ViolentQuakeEffect.cpp": 4, + "Source/Contents/Effects/Skills/WindEffect.cpp": 4, "Source/Contents/Emblems/EmblemCache.cpp": 2, + "Source/Contents/Emblems/EmblemCacheRaw.cpp": 4, "Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp": 4, "Source/Contents/Emblems/EmblemDataMgr.cpp": 4, "Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp": 4, "Source/Contents/Emblems/EmblemDownload.cpp": 4, "Source/Contents/Emblems/EmblemUpload.cpp": 2, + "Source/Contents/Emblems/GuildEmblemLookup.cpp": 4, "Source/Contents/Emblems/GuildEmblemReqBundle.cpp": 4, - "Source/Contents/EnchantMgr.cpp": 4, - "Source/Contents/EnemyMonsterTalk.cpp": 4, - "Source/Contents/EntryQueueMgr.cpp": 4, - "Source/Contents/EquipmentResources.cpp": 4, - "Source/Contents/FlyingShipRouteInfo.cpp": 4, - "Source/Contents/ForbiddenWords.cpp": 4, + "Source/Contents/Emblems/GuildEmblemState.cpp": 4, + "Source/Contents/EntryQueue/EntryQueueMgr.cpp": 4, + "Source/Contents/Events/CheckAttendanceMgr.cpp": 4, + "Source/Contents/Events/RouletteMgr.cpp": 4, + "Source/Contents/Events/ShowRankingScheduler.cpp": 4, + "Source/Contents/Events/SpecialPopupMgr.cpp": 4, "Source/Contents/Ground/GroundDecals.cpp": 3, "Source/Contents/Ground/GroundGeometry.cpp": 3, "Source/Contents/Ground/GroundLighting.cpp": 3, @@ -530,21 +531,19 @@ "Source/Contents/Ground/TerrainHeight.cpp": 4, "Source/Contents/Ground/TerrainPicking.cpp": 4, "Source/Contents/Ground/TerrainPlane.cpp": 4, - "Source/Contents/GuildEmblemLookup.cpp": 4, - "Source/Contents/GuildEmblemState.cpp": 4, - "Source/Contents/GuildInfo.cpp": 4, - "Source/Contents/GuildMgr.cpp": 4, - "Source/Contents/GuildTip.cpp": 4, - "Source/Contents/HeadResources.cpp": 4, - "Source/Contents/HitSounds.cpp": 4, + "Source/Contents/Guild/GuildInfo.cpp": 4, + "Source/Contents/Guild/GuildMgr.cpp": 4, + "Source/Contents/Guild/GuildTip.cpp": 4, "Source/Contents/Hotkeys/EmotionHotkeys.cpp": 4, "Source/Contents/Hotkeys/HotkeyInfo.cpp": 4, "Source/Contents/Hotkeys/UserHotkeyMgr.cpp": 4, "Source/Contents/Hotkeys/UserHotkeyScript.cpp": 4, "Source/Contents/InstantVar.cpp": 0, - "Source/Contents/ItemDBToIDMgr.cpp": 4, "Source/Contents/Items/BarterMarketItemMgr.cpp": 4, "Source/Contents/Items/ChangeMaterialMgr.cpp": 4, + "Source/Contents/Items/ClientItemLists.cpp": 4, + "Source/Contents/Items/EnchantMgr.cpp": 4, + "Source/Contents/Items/ItemDBToIDMgr.cpp": 4, "Source/Contents/Items/ItemDescription.cpp": 4, "Source/Contents/Items/ItemInfo.cpp": 4, "Source/Contents/Items/ItemInfoMgr.cpp": 4, @@ -552,25 +551,26 @@ "Source/Contents/Items/ItemNaming.cpp": 4, "Source/Contents/Items/ItemReformMgr.cpp": 4, "Source/Contents/Items/ItemResources.cpp": 4, + "Source/Contents/Items/JobCodeForItem.cpp": 4, "Source/Contents/Items/NeoPackageItemMgr.cpp": 4, - "Source/Contents/Items/RuneSystem.cpp": 4, "Source/Contents/Items/SelectPackageItemMgr.cpp": 4, - "Source/Contents/JobCodeForItem.cpp": 4, "Source/Contents/Jobs/JobInheritance.cpp": 4, "Source/Contents/Jobs/JobNameInitialization.cpp": 4, "Source/Contents/Jobs/JobNames.cpp": 4, - "Source/Contents/MapInfoMgr.cpp": 4, - "Source/Contents/MapNameTable.cpp": 4, - "Source/Contents/MapPropertyMgr.cpp": 4, - "Source/Contents/MapSkyMgr.cpp": 4, - "Source/Contents/MessageTable.cpp": 4, + "Source/Contents/Map/FlyingShipRouteInfo.cpp": 4, + "Source/Contents/Map/MapInfoMgr.cpp": 4, + "Source/Contents/Map/MapNameTable.cpp": 4, + "Source/Contents/Map/MapPropertyMgr.cpp": 4, + "Source/Contents/Map/MapSkyMgr.cpp": 4, + "Source/Contents/Map/PrivateAirplaneMgr.cpp": 4, + "Source/Contents/Map/TownInfoMgr.cpp": 4, "Source/Contents/Messenger/ClientMessenger.cpp": 4, "Source/Contents/Messenger/MessengerMember.cpp": 4, "Source/Contents/Messenger/WhisperBlockMgr.cpp": 4, - "Source/Contents/ModelKeyframes.cpp": 4, "Source/Contents/Models/ModelActor.cpp": 3, "Source/Contents/Models/ModelActorBounds.cpp": 3, "Source/Contents/Models/ModelAnimation.cpp": 3, + "Source/Contents/Models/ModelKeyframes.cpp": 4, "Source/Contents/Models/ModelLighting.cpp": 3, "Source/Contents/Models/ModelMovies.cpp": 3, "Source/Contents/Models/ModelNode.cpp": 3, @@ -581,22 +581,27 @@ "Source/Contents/Models/ModelRendering.cpp": 3, "Source/Contents/Models/ModelSpatial.cpp": 3, "Source/Contents/Models/ModelTextureAnimation.cpp": 3, - "Source/Contents/MonsterResources.cpp": 4, - "Source/Contents/MonsterSpeech.cpp": 4, - "Source/Contents/MonsterXmlActions.cpp": 4, - "Source/Contents/MovementRoute.cpp": 4, - "Source/Contents/MovementRouteInterpolation.cpp": 4, - "Source/Contents/MovementTraversal.cpp": 4, + "Source/Contents/Monster/ChampionMonsterMgr.cpp": 4, + "Source/Contents/Monster/EnemyMonsterTalk.cpp": 4, + "Source/Contents/Monster/MonsterSpeech.cpp": 4, + "Source/Contents/Monster/MonsterXmlActions.cpp": 4, + "Source/Contents/Movement/ActorMovementRoute.cpp": 4, + "Source/Contents/Movement/MovementRoute.cpp": 4, + "Source/Contents/Movement/MovementRouteInterpolation.cpp": 4, + "Source/Contents/Movement/MovementTraversal.cpp": 4, + "Source/Contents/Movement/Pathfinding.cpp": 4, + "Source/Contents/Movement/TerrainPathSearch.cpp": 4, "Source/Contents/Movies/BinkMovie.cpp": 3, "Source/Contents/Movies/BinkMovies.cpp": 3, - "Source/Contents/NavigationCandidates.cpp": 4, - "Source/Contents/NavigationDestinations.cpp": 4, - "Source/Contents/NavigationGraph.cpp": 4, - "Source/Contents/NavigationLink.cpp": 4, - "Source/Contents/NavigationRequest.cpp": 4, - "Source/Contents/NavigationRoute.cpp": 4, - "Source/Contents/NavigationSource.cpp": 4, - "Source/Contents/NpcLocationRadius.cpp": 4, + "Source/Contents/Navigation/NavigationCandidates.cpp": 4, + "Source/Contents/Navigation/NavigationDestinations.cpp": 4, + "Source/Contents/Navigation/NavigationGraph.cpp": 4, + "Source/Contents/Navigation/NavigationLink.cpp": 4, + "Source/Contents/Navigation/NavigationRequest.cpp": 4, + "Source/Contents/Navigation/NavigationRoute.cpp": 4, + "Source/Contents/Navigation/NavigationSource.cpp": 4, + "Source/Contents/Navigation/NpcLocationRadius.cpp": 4, + "Source/Contents/Navigation/WorldNavigation.cpp": 4, "Source/Contents/Party/AdvenPartyInfo.cpp": 4, "Source/Contents/Party/AdventurerAgencyMgr.cpp": 4, "Source/Contents/Party/AgencyRequests.cpp": 4, @@ -614,22 +619,15 @@ "Source/Contents/Party/RegisterPartyAsyncWork.cpp": 4, "Source/Contents/Party/StopRecruitingAsyncWork.cpp": 4, "Source/Contents/Party/StopRecruitingCompletion.cpp": 2, - "Source/Contents/Pathfinding.cpp": 4, - "Source/Contents/PetEvolutionMgr.cpp": 4, - "Source/Contents/PetStatus.cpp": 4, - "Source/Contents/PetStrings.cpp": 4, - "Source/Contents/PetTalk.cpp": 4, - "Source/Contents/PetTalkNames.cpp": 4, - "Source/Contents/PlayerNameDictionary.cpp": 4, - "Source/Contents/PrivateAirplaneMgr.cpp": 4, - "Source/Contents/RDamageVar.cpp": 4, - "Source/Contents/RenewQuestMgr.cpp": 4, - "Source/Contents/ReputeMgr.cpp": 4, - "Source/Contents/RobeOpacity.cpp": 4, - "Source/Contents/RobeResources.cpp": 4, - "Source/Contents/RobeTopLayer.cpp": 4, - "Source/Contents/RodexMailStore.cpp": 4, - "Source/Contents/RouletteMgr.cpp": 4, + "Source/Contents/Pet/PetEvolutionMgr.cpp": 4, + "Source/Contents/Pet/PetStatus.cpp": 4, + "Source/Contents/Pet/PetStrings.cpp": 4, + "Source/Contents/Pet/PetTalk.cpp": 4, + "Source/Contents/Pet/PetTalkNames.cpp": 4, + "Source/Contents/Quest/RenewQuestMgr.cpp": 4, + "Source/Contents/Repute/ReputeMgr.cpp": 4, + "Source/Contents/Rodex/RodexMailStore.cpp": 4, + "Source/Contents/RuneSystem/RuneSystem.cpp": 4, "Source/Contents/Schedule/CaptchaUploadSchedule.cpp": 4, "Source/Contents/Schedule/CheckGDISchedule.cpp": 4, "Source/Contents/Schedule/EmotionSchedule.cpp": 4, @@ -637,12 +635,10 @@ "Source/Contents/Schedule/Schedule.cpp": 4, "Source/Contents/Schedule/ShutDownSchedule.cpp": 4, "Source/Contents/Schedule/TimeScheduler.cpp": 4, - "Source/Contents/ServerTimeManager.cpp": 4, - "Source/Contents/ShowRankingScheduler.cpp": 4, "Source/Contents/SignBoard/SignBoard.cpp": 4, - "Source/Contents/SimpleStringMgr.cpp": 4, "Source/Contents/Skills/AutomaticSkills.cpp": 4, "Source/Contents/Skills/ClientSkills.cpp": 4, + "Source/Contents/Skills/GraffiSkill.cpp": 4, "Source/Contents/Skills/PlayerSkillBundle.cpp": 4, "Source/Contents/Skills/SkillActionAlitea.cpp": 4, "Source/Contents/Skills/SkillActionDruid.cpp": 4, @@ -662,32 +658,37 @@ "Source/Contents/Skills/SkillLevelConfig.cpp": 4, "Source/Contents/Skills/SkillLevelRegistry.cpp": 4, "Source/Contents/Skills/SkillTreeScript.cpp": 4, - "Source/Contents/SkinCatalog.cpp": 4, - "Source/Contents/SkinInfo.cpp": 3, - "Source/Contents/SkinMgr.cpp": 4, + "Source/Contents/Skin/SkinCatalog.cpp": 4, + "Source/Contents/Skin/SkinInfo.cpp": 3, + "Source/Contents/Skin/SkinMgr.cpp": 4, + "Source/Contents/Sound/HitSounds.cpp": 4, "Source/Contents/Sound/SoundConfiguration.cpp": 4, "Source/Contents/Sound/SoundMaker.cpp": 4, "Source/Contents/Sound/SoundMgr.cpp": 4, - "Source/Contents/SpecialPopupMgr.cpp": 4, - "Source/Contents/SpriteFrameSynchronization.cpp": 4, - "Source/Contents/SpriteJob.cpp": 4, - "Source/Contents/SpriteLayerDepth.cpp": 4, - "Source/Contents/SpriteLayerDrawing.cpp": 4, - "Source/Contents/SpriteLayerOrder.cpp": 4, - "Source/Contents/SpriteRidingOffset.cpp": 4, - "Source/Contents/SpriteRidingPolicy.cpp": 4, - "Source/Contents/SpriteRobe.cpp": 4, - "Source/Contents/SpriteRobeCommands.cpp": 4, - "Source/Contents/SpriteShadow.cpp": 4, - "Source/Contents/StatusIconImages.cpp": 4, + "Source/Contents/Sprites/RobeOpacity.cpp": 4, + "Source/Contents/Sprites/RobeTopLayer.cpp": 4, + "Source/Contents/Sprites/SpriteFrameSynchronization.cpp": 4, + "Source/Contents/Sprites/SpriteJob.cpp": 4, + "Source/Contents/Sprites/SpriteLayerDepth.cpp": 4, + "Source/Contents/Sprites/SpriteLayerDrawing.cpp": 4, + "Source/Contents/Sprites/SpriteLayerOrder.cpp": 4, + "Source/Contents/Sprites/SpriteRidingOffset.cpp": 4, + "Source/Contents/Sprites/SpriteRidingPolicy.cpp": 4, + "Source/Contents/Sprites/SpriteRobe.cpp": 4, + "Source/Contents/Sprites/SpriteRobeCommands.cpp": 4, + "Source/Contents/Sprites/SpriteShadow.cpp": 4, "Source/Contents/Store/MCStoreInfoBackup.cpp": 4, "Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp": 4, "Source/Contents/Store/StoreBackupData.cpp": 4, - "Source/Contents/TableMng.cpp": 4, - "Source/Contents/TerrainPathSearch.cpp": 4, - "Source/Contents/TipBoxTitles.cpp": 4, - "Source/Contents/TipOfTheDay.cpp": 4, - "Source/Contents/TownInfoMgr.cpp": 4, + "Source/Contents/Tables/ClientXmlTables.cpp": 4, + "Source/Contents/Tables/ForbiddenWords.cpp": 4, + "Source/Contents/Tables/MessageTable.cpp": 4, + "Source/Contents/Tables/SimpleStringMgr.cpp": 4, + "Source/Contents/Tables/TableMng.cpp": 4, + "Source/Contents/Tables/TipBoxTitles.cpp": 4, + "Source/Contents/Tables/TipOfTheDay.cpp": 4, + "Source/Contents/Time/ClientTiming.cpp": 4, + "Source/Contents/Time/ServerTimeManager.cpp": 4, "Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp": 4, "Source/Contents/UserData/AccountLinkedUserDataMgr.cpp": 4, "Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp": 4, @@ -711,9 +712,8 @@ "Source/Contents/World/WorldSpatialInitialization.cpp": 3, "Source/Contents/World/WorldSpatialTree.cpp": 3, "Source/Contents/World/WorldTerrainPicking.cpp": 4, + "Source/Contents/World/WorldViewData.cpp": 4, "Source/Contents/World/WorldViewSpatial.cpp": 3, - "Source/Contents/WorldNavigation.cpp": 4, - "Source/Contents/WorldView/WorldViewData.cpp": 4, "Source/EntityInit.cpp": 4, "Source/File/CommonObject.cpp": 1, "Source/File/DirectoryRemoval.cpp": 1,