From a418f8616d52747ad765ba07ff38f762057bee5a Mon Sep 17 00:00:00 2001 From: d1str4ught <> Date: Thu, 28 Aug 2025 20:50:20 +0200 Subject: [PATCH] include paths normalized --- src/AudioLib/SoundEngine.h | 2 +- src/AudioLib/Stdafx.h | 6 +-- src/AudioLib/Type.cpp | 2 +- src/EffectLib/EffectData.h | 2 +- src/EffectLib/EffectInstance.cpp | 6 +-- src/EffectLib/EffectInstance.h | 6 +-- src/EffectLib/EffectManager.cpp | 6 +-- src/EffectLib/EffectMesh.cpp | 6 +-- src/EffectLib/EffectMesh.h | 8 ++-- src/EffectLib/EffectMeshInstance.cpp | 6 +-- src/EffectLib/EffectMeshInstance.h | 4 +- src/EffectLib/ParticleProperty.cpp | 2 +- src/EffectLib/ParticleProperty.h | 2 +- src/EffectLib/ParticleSystemData.h | 2 +- src/EffectLib/ParticleSystemInstance.cpp | 4 +- src/EffectLib/ParticleSystemInstance.h | 7 ++- src/EffectLib/SimpleLightInstance.cpp | 2 +- src/EffectLib/SimpleLightInstance.h | 2 +- src/EffectLib/StdAfx.h | 20 ++++----- src/EterBase/CPostIt.cpp | 2 +- src/EterGrnLib/Material.h | 6 +-- src/EterGrnLib/Model.h | 4 +- src/EterGrnLib/ModelInstance.cpp | 2 +- src/EterGrnLib/ModelInstance.h | 4 +- .../ModelInstanceCollisionDetection.cpp | 2 +- src/EterGrnLib/ModelInstanceRender.cpp | 4 +- src/EterGrnLib/ModelInstanceUpdate.cpp | 2 +- src/EterGrnLib/StdAfx.h | 6 +-- src/EterGrnLib/Thing.cpp | 2 +- src/EterGrnLib/ThingInstance.cpp | 6 +-- src/EterGrnLib/ThingInstance.h | 6 +-- src/EterImageLib/TGAImage.cpp | 2 +- src/EterLib/AttributeData.cpp | 2 +- src/EterLib/AttributeInstance.cpp | 2 +- src/EterLib/BlockTexture.cpp | 4 +- src/EterLib/Camera.cpp | 2 +- src/EterLib/Camera.h | 2 +- src/EterLib/CullingManager.h | 4 +- src/EterLib/FileLoaderThread.cpp | 2 +- src/EterLib/FileLoaderThread.h | 2 +- src/EterLib/GrpBase.cpp | 4 +- src/EterLib/GrpColorInstance.cpp | 2 +- src/EterLib/GrpD3DXBuffer.cpp | 2 +- src/EterLib/GrpDevice.cpp | 4 +- src/EterLib/GrpExpandedImageInstance.cpp | 2 +- src/EterLib/GrpFontTexture.cpp | 2 +- src/EterLib/GrpImageInstance.cpp | 2 +- src/EterLib/GrpIndexBuffer.cpp | 2 +- src/EterLib/GrpLightManager.cpp | 2 +- src/EterLib/GrpLightManager.h | 2 +- src/EterLib/GrpMarkInstance.cpp | 2 +- src/EterLib/GrpObjectInstance.cpp | 2 +- src/EterLib/GrpRatioInstance.cpp | 2 +- src/EterLib/GrpScreen.h | 2 +- src/EterLib/GrpSubImage.cpp | 4 +- src/EterLib/GrpText.cpp | 2 +- src/EterLib/GrpTexture.cpp | 2 +- src/EterLib/GrpVertexBuffer.cpp | 2 +- src/EterLib/IME.cpp | 2 +- src/EterLib/MSWindow.h | 2 +- src/EterLib/NetStream.cpp | 2 +- src/EterLib/NetStream.h | 4 +- src/EterLib/Profiler.h | 4 +- src/EterLib/Resource.cpp | 6 +-- src/EterLib/ResourceManager.cpp | 8 ++-- src/EterLib/SkyBox.cpp | 2 +- src/EterLib/StateManager.h | 2 +- src/EterLib/TargaResource.h | 2 +- src/EterLib/TextBar.cpp | 2 +- src/EterLib/TextFileLoader.cpp | 4 +- src/EterLib/TextFileLoader.h | 8 ++-- src/EterLib/Util.cpp | 2 +- src/EterLib/Util.h | 2 +- src/EterPack/EterPackManager.cpp | 4 +- src/EterPack/EterPackManager.h | 4 +- src/EterPack/StdAfx.h | 2 +- src/EterPythonLib/PythonGraphic.cpp | 4 +- src/EterPythonLib/PythonGraphic.h | 10 ++--- src/EterPythonLib/PythonGraphicModule.cpp | 4 +- src/EterPythonLib/PythonGridSlotWindow.cpp | 2 +- src/EterPythonLib/PythonSlotWindow.cpp | 4 +- src/EterPythonLib/PythonWindow.cpp | 2 +- src/EterPythonLib/PythonWindow.h | 2 +- src/EterPythonLib/StdAfx.h | 4 +- src/GameLib/ActorInstance.cpp | 4 +- src/GameLib/ActorInstance.h | 4 +- src/GameLib/ActorInstanceAttach.cpp | 2 +- src/GameLib/ActorInstanceBattle.cpp | 4 +- .../ActorInstanceCollisionDetection.cpp | 2 +- src/GameLib/ActorInstanceData.cpp | 4 +- src/GameLib/ActorInstanceInterface.h | 2 +- src/GameLib/ActorInstanceMotionEvent.cpp | 4 +- src/GameLib/ActorInstanceRender.cpp | 2 +- src/GameLib/Area.cpp | 10 ++--- src/GameLib/Area.h | 6 +-- src/GameLib/AreaLoaderThread.cpp | 2 +- src/GameLib/AreaLoaderThread.h | 2 +- src/GameLib/AreaTerrain.cpp | 8 ++-- src/GameLib/AreaTerrain.h | 2 +- src/GameLib/DungeonBlock.cpp | 2 +- src/GameLib/DungeonBlock.h | 8 ++-- src/GameLib/FlyTrace.cpp | 4 +- src/GameLib/FlyingData.cpp | 2 +- src/GameLib/FlyingInstance.cpp | 4 +- src/GameLib/GameType.cpp | 2 +- src/GameLib/GameType.h | 4 +- src/GameLib/GameUtil.cpp | 2 +- src/GameLib/ItemData.cpp | 2 +- src/GameLib/ItemData.h | 4 +- src/GameLib/ItemManager.cpp | 4 +- src/GameLib/MapManager.cpp | 4 +- src/GameLib/MapOutdoor.cpp | 8 ++-- src/GameLib/MapOutdoor.h | 12 ++--- src/GameLib/MapOutdoorCharacterShadow.cpp | 4 +- src/GameLib/MapOutdoorLoad.cpp | 4 +- src/GameLib/MapOutdoorRender.cpp | 4 +- src/GameLib/MapOutdoorRenderHTP.cpp | 2 +- src/GameLib/MapOutdoorRenderSTP.cpp | 4 +- src/GameLib/MapOutdoorUpdate.cpp | 4 +- src/GameLib/MapOutdoorWater.cpp | 4 +- src/GameLib/MapType.cpp | 2 +- src/GameLib/MapType.h | 4 +- src/GameLib/Property.cpp | 2 +- src/GameLib/PropertyLoader.h | 2 +- src/GameLib/PropertyManager.cpp | 2 +- src/GameLib/PropertyManager.h | 2 +- src/GameLib/RaceData.cpp | 8 ++-- src/GameLib/RaceData.h | 2 +- src/GameLib/RaceDataFile.cpp | 2 +- src/GameLib/RaceManager.cpp | 2 +- src/GameLib/RaceMotionData.cpp | 2 +- src/GameLib/RaceMotionDataEvent.h | 2 +- src/GameLib/SnowEnvironment.cpp | 6 +-- src/GameLib/SnowEnvironment.h | 2 +- src/GameLib/StdAfx.h | 12 ++--- src/GameLib/TerrainDecal.cpp | 4 +- src/GameLib/TerrainDecal.h | 2 +- src/GameLib/TerrainPatch.h | 4 +- src/GameLib/WeaponTrace.cpp | 4 +- src/GameLib/WeaponTrace.h | 2 +- src/PRTerrainLib/StdAfx.h | 6 +-- src/PRTerrainLib/Terrain.cpp | 2 +- src/PRTerrainLib/Terrain.h | 2 +- src/PRTerrainLib/TerrainType.h | 4 +- src/PRTerrainLib/TextureSet.h | 2 +- src/ScriptLib/Resource.cpp | 44 +++++++++---------- src/ScriptLib/Resource.h | 6 +-- src/ScriptLib/StdAfx.h | 4 +- src/SpeedTreeLib/BoundaryShapeManager.cpp | 2 +- src/SpeedTreeLib/Constants.h | 7 --- src/SpeedTreeLib/SpeedGrassRT.h | 4 -- src/SpeedTreeLib/SpeedGrassWrapper.cpp | 6 --- src/SpeedTreeLib/SpeedGrassWrapper.h | 3 -- src/SpeedTreeLib/SpeedTreeForest.cpp | 2 +- src/SpeedTreeLib/SpeedTreeForest.h | 2 +- src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp | 6 +-- src/SpeedTreeLib/SpeedTreeWrapper.cpp | 12 ++--- src/SpeedTreeLib/StdAfx.h | 2 +- src/SphereLib/spherepack.cpp | 2 +- src/UserInterface/AccountConnector.cpp | 4 +- src/UserInterface/AccountConnector.h | 4 +- src/UserInterface/CameraProcedure.cpp | 2 +- src/UserInterface/GameType.h | 2 +- src/UserInterface/GuildMarkDownloader.h | 2 +- src/UserInterface/GuildMarkUploader.h | 2 +- src/UserInterface/InstanceBase.cpp | 4 +- src/UserInterface/InstanceBase.h | 4 +- src/UserInterface/InstanceBaseBattle.cpp | 2 +- src/UserInterface/InstanceBaseEffect.cpp | 6 +-- src/UserInterface/InstanceBaseMotion.cpp | 2 +- src/UserInterface/InstanceBaseMovement.cpp | 2 +- src/UserInterface/Locale.cpp | 6 +-- src/UserInterface/Packet.h | 2 +- src/UserInterface/PythonApplicationCamera.cpp | 4 +- src/UserInterface/PythonApplicationEvent.cpp | 2 +- src/UserInterface/PythonApplicationModule.cpp | 4 +- src/UserInterface/PythonBackground.cpp | 10 ++--- src/UserInterface/PythonBackground.h | 6 +-- src/UserInterface/PythonBackgroundModule.cpp | 4 +- src/UserInterface/PythonCharacterManager.cpp | 2 +- src/UserInterface/PythonCharacterManager.h | 2 +- .../PythonCharacterManagerModule.cpp | 2 +- src/UserInterface/PythonChat.cpp | 2 +- src/UserInterface/PythonChatModule.cpp | 2 +- src/UserInterface/PythonEffectModule.cpp | 2 +- src/UserInterface/PythonEventManager.cpp | 10 ++--- src/UserInterface/PythonEventManager.h | 2 +- src/UserInterface/PythonFlyModule.cpp | 3 +- .../PythonGameEventManagerModule.cpp | 2 +- src/UserInterface/PythonIME.h | 4 +- src/UserInterface/PythonItem.cpp | 6 +-- src/UserInterface/PythonItem.h | 2 +- src/UserInterface/PythonItemModule.cpp | 2 +- src/UserInterface/PythonMiniMap.cpp | 10 ++--- src/UserInterface/PythonNetworkDatagram.h | 4 +- src/UserInterface/PythonNetworkStream.cpp | 2 +- src/UserInterface/PythonNetworkStream.h | 6 +-- .../PythonNetworkStreamPhaseGame.cpp | 4 +- .../PythonNetworkStreamPhaseGameActor.cpp | 6 +-- .../PythonNetworkStreamPhaseHandShake.cpp | 2 +- .../PythonNetworkStreamPhaseLoading.cpp | 2 +- src/UserInterface/PythonNonPlayer.cpp | 2 +- src/UserInterface/PythonPackModule.cpp | 4 +- src/UserInterface/PythonPlayer.cpp | 2 +- src/UserInterface/PythonPlayerEventHandler.h | 4 +- src/UserInterface/PythonPlayerInput.cpp | 4 +- src/UserInterface/PythonPlayerInputMouse.cpp | 2 +- src/UserInterface/PythonPlayerSkill.cpp | 2 +- src/UserInterface/PythonProfilerModule.cpp | 2 +- src/UserInterface/PythonSkill.cpp | 4 +- src/UserInterface/PythonSkill.h | 5 +-- src/UserInterface/PythonTextTail.h | 2 +- src/UserInterface/ServerStateChecker.cpp | 2 +- src/UserInterface/ServerStateChecker.h | 2 +- src/UserInterface/StdAfx.h | 9 ++-- 215 files changed, 400 insertions(+), 430 deletions(-) diff --git a/src/AudioLib/SoundEngine.h b/src/AudioLib/SoundEngine.h index 6684026..6a06672 100644 --- a/src/AudioLib/SoundEngine.h +++ b/src/AudioLib/SoundEngine.h @@ -1,5 +1,5 @@ #pragma once -#include "../eterBase/Singleton.h" +#include "EterBase/Singleton.h" #include "Type.h" #include "MaSoundInstance.h" diff --git a/src/AudioLib/Stdafx.h b/src/AudioLib/Stdafx.h index 7c450e2..9e152d0 100644 --- a/src/AudioLib/Stdafx.h +++ b/src/AudioLib/Stdafx.h @@ -2,8 +2,8 @@ //#include -#include "../eterBase/CRC32.h" -#include "../eterBase/Utils.h" -#include "../eterBase/Debug.h" +#include "EterBase/CRC32.h" +#include "EterBase/Utils.h" +#include "EterBase/Debug.h" #include diff --git a/src/AudioLib/Type.cpp b/src/AudioLib/Type.cpp index 2509665..8db5a49 100644 --- a/src/AudioLib/Type.cpp +++ b/src/AudioLib/Type.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "Type.h" -#include "../EterLib/TextFileLoader.h" +#include "EterLib/TextFileLoader.h" std::string NSound::strResult; diff --git a/src/EffectLib/EffectData.h b/src/EffectLib/EffectData.h index d227a27..f1c8239 100644 --- a/src/EffectLib/EffectData.h +++ b/src/EffectLib/EffectData.h @@ -1,6 +1,6 @@ #pragma once -#include "../AudioLib/Type.h" +#include "AudioLib/Type.h" #include "ParticleSystemData.h" #include "EffectMesh.h" diff --git a/src/EffectLib/EffectInstance.cpp b/src/EffectLib/EffectInstance.cpp index 1e898e7..2da4355 100644 --- a/src/EffectLib/EffectInstance.cpp +++ b/src/EffectLib/EffectInstance.cpp @@ -3,9 +3,9 @@ #include "ParticleSystemInstance.h" #include "SimpleLightInstance.h" -#include "../eterBase/Stl.h" -#include "../eterLib/StateManager.h" -#include "../AudioLib/SoundEngine.h" +#include "EterBase/Stl.h" +#include "EterLib/StateManager.h" +#include "AudioLib/SoundEngine.h" CDynamicPool CEffectInstance::ms_kPool; int CEffectInstance::ms_iRenderingEffectCount = 0; diff --git a/src/EffectLib/EffectInstance.h b/src/EffectLib/EffectInstance.h index 0f653dd..a382d49 100644 --- a/src/EffectLib/EffectInstance.h +++ b/src/EffectLib/EffectInstance.h @@ -1,8 +1,8 @@ #pragma once -#include "../eterlib/GrpObjectInstance.h" -#include "../eterlib/Pool.h" -#include "../AudioLib/Type.h" +#include "Eterlib/GrpObjectInstance.h" +#include "Eterlib/Pool.h" +#include "AudioLib/Type.h" #include "EffectElementBaseInstance.h" #include "EffectData.h" diff --git a/src/EffectLib/EffectManager.cpp b/src/EffectLib/EffectManager.cpp index 165ba3c..e180604 100644 --- a/src/EffectLib/EffectManager.cpp +++ b/src/EffectLib/EffectManager.cpp @@ -1,10 +1,8 @@ #include "StdAfx.h" -#include "../eterBase/Random.h" -#include "../eterlib/StateManager.h" +#include "EterBase/Random.h" +#include "Eterlib/StateManager.h" #include "EffectManager.h" - - void CEffectManager::GetInfo(std::string* pstInfo) { char szInfo[256]; diff --git a/src/EffectLib/EffectMesh.cpp b/src/EffectLib/EffectMesh.cpp index 91cae49..e522ac0 100644 --- a/src/EffectLib/EffectMesh.cpp +++ b/src/EffectLib/EffectMesh.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" -#include "../eterlib/StateManager.h" -#include "../eterlib/ResourceManager.h" -#include "../eterpack/EterPackManager.h" +#include "Eterlib/StateManager.h" +#include "Eterlib/ResourceManager.h" +#include "Eterpack/EterPackManager.h" #include "EffectMesh.h" CDynamicPool CEffectMesh::SEffectMeshData::ms_kPool; diff --git a/src/EffectLib/EffectMesh.h b/src/EffectLib/EffectMesh.h index a7dd860..3dc3f16 100644 --- a/src/EffectLib/EffectMesh.h +++ b/src/EffectLib/EffectMesh.h @@ -2,10 +2,10 @@ #include -#include "../eterlib/GrpScreen.h" -#include "../eterlib/Resource.h" -#include "../eterlib/GrpImageInstance.h" -#include "../eterLib/TextFileLoader.h" +#include "Eterlib/GrpScreen.h" +#include "Eterlib/Resource.h" +#include "Eterlib/GrpImageInstance.h" +#include "EterLib/TextFileLoader.h" #include "Type.h" #include "EffectElementBase.h" diff --git a/src/EffectLib/EffectMeshInstance.cpp b/src/EffectLib/EffectMeshInstance.cpp index e69cc69..8af7097 100644 --- a/src/EffectLib/EffectMeshInstance.cpp +++ b/src/EffectLib/EffectMeshInstance.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" -#include "../eterLib/ResourceManager.h" +#include "EterLib/StateManager.h" +#include "EterLib/ResourceManager.h" #include "EffectMeshInstance.h" -#include "../eterlib/GrpMath.h" +#include "Eterlib/GrpMath.h" CDynamicPool CEffectMeshInstance::ms_kPool; diff --git a/src/EffectLib/EffectMeshInstance.h b/src/EffectLib/EffectMeshInstance.h index 185d433..cff0188 100644 --- a/src/EffectLib/EffectMeshInstance.h +++ b/src/EffectLib/EffectMeshInstance.h @@ -1,7 +1,7 @@ #pragma once -#include "../eterlib/GrpScreen.h" -#include "../eterlib/GrpImageInstance.h" +#include "Eterlib/GrpScreen.h" +#include "Eterlib/GrpImageInstance.h" #include "EffectElementBaseInstance.h" #include "FrameController.h" #include "EffectMesh.h" diff --git a/src/EffectLib/ParticleProperty.cpp b/src/EffectLib/ParticleProperty.cpp index d2db34f..b8caa86 100644 --- a/src/EffectLib/ParticleProperty.cpp +++ b/src/EffectLib/ParticleProperty.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "ParticleProperty.h" -#include "../eterlib/ResourceManager.h" +#include "Eterlib/ResourceManager.h" void CParticleProperty::InsertTexture(const char * c_szFileName) { diff --git a/src/EffectLib/ParticleProperty.h b/src/EffectLib/ParticleProperty.h index 4bf9f77..a412616 100644 --- a/src/EffectLib/ParticleProperty.h +++ b/src/EffectLib/ParticleProperty.h @@ -1,7 +1,7 @@ #pragma once #include -#include "../eterlib/GrpImageInstance.h" +#include "Eterlib/GrpImageInstance.h" #include "Type.h" diff --git a/src/EffectLib/ParticleSystemData.h b/src/EffectLib/ParticleSystemData.h index 60f013b..17467c9 100644 --- a/src/EffectLib/ParticleSystemData.h +++ b/src/EffectLib/ParticleSystemData.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterLib/TextFileLoader.h" +#include "EterLib/TextFileLoader.h" #include "EffectElementBase.h" #include "EmitterProperty.h" diff --git a/src/EffectLib/ParticleSystemInstance.cpp b/src/EffectLib/ParticleSystemInstance.cpp index 4c04668..8c0d47b 100644 --- a/src/EffectLib/ParticleSystemInstance.cpp +++ b/src/EffectLib/ParticleSystemInstance.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterBase/Random.h" -#include "../eterLib/StateManager.h" +#include "EterBase/Random.h" +#include "EterLib/StateManager.h" #include "ParticleSystemData.h" #include "ParticleSystemInstance.h" #include "ParticleInstance.h" diff --git a/src/EffectLib/ParticleSystemInstance.h b/src/EffectLib/ParticleSystemInstance.h index 720a327..0fd6721 100644 --- a/src/EffectLib/ParticleSystemInstance.h +++ b/src/EffectLib/ParticleSystemInstance.h @@ -1,12 +1,11 @@ #pragma once - #include "EffectElementBaseInstance.h" #include "ParticleInstance.h" #include "ParticleProperty.h" -#include "../eterlib/GrpScreen.h" -#include "../eterlib/StateManager.h" -#include "../eterLib/GrpImageInstance.h" +#include "Eterlib/GrpScreen.h" +#include "Eterlib/StateManager.h" +#include "EterLib/GrpImageInstance.h" #include "EmitterProperty.h" class CParticleSystemInstance : public CEffectElementBaseInstance diff --git a/src/EffectLib/SimpleLightInstance.cpp b/src/EffectLib/SimpleLightInstance.cpp index 0fd214a..aa0d716 100644 --- a/src/EffectLib/SimpleLightInstance.cpp +++ b/src/EffectLib/SimpleLightInstance.cpp @@ -1,5 +1,5 @@ #include "Stdafx.h" -#include "../eterLib/GrpLightManager.h" +#include "EterLib/GrpLightManager.h" #include "SimpleLightInstance.h" diff --git a/src/EffectLib/SimpleLightInstance.h b/src/EffectLib/SimpleLightInstance.h index a7ad069..96eb23c 100644 --- a/src/EffectLib/SimpleLightInstance.h +++ b/src/EffectLib/SimpleLightInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterLib/GrpScreen.h" +#include "EterLib/GrpScreen.h" #include "EffectElementBaseInstance.h" #include "SimpleLightData.h" diff --git a/src/EffectLib/StdAfx.h b/src/EffectLib/StdAfx.h index 6ced80f..bacf045 100644 --- a/src/EffectLib/StdAfx.h +++ b/src/EffectLib/StdAfx.h @@ -2,17 +2,17 @@ //#include -#include "../eterBase/StdAfx.h" +#include "EterBase/StdAfx.h" + +#include "EterBase/Utils.h" +#include "EterBase/Timer.h" +#include "EterBase/CRC32.h" +#include "EterBase/Debug.h" + +#include "EterLib/StdAfx.h" +#include "EterLib/TextFileLoader.h" -#include "../eterBase/Utils.h" -#include "../eterBase/Timer.h" -#include "../eterBase/CRC32.h" -#include "../eterBase/Debug.h" - -#include "../eterLib/StdAfx.h" -#include "../eterLib/TextFileLoader.h" - -#include "../AudioLib/StdAfx.h" +#include "AudioLib/StdAfx.h" /* #include "FrameController.h" diff --git a/src/EterBase/CPostIt.cpp b/src/EterBase/CPostIt.cpp index 60c7f09..4628628 100644 --- a/src/EterBase/CPostIt.cpp +++ b/src/EterBase/CPostIt.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "CPostIt.h" -#include "../eterBase/utils.h" +#include "EterBase/utils.h" class _CPostItMemoryBlock { diff --git a/src/EterGrnLib/Material.h b/src/EterGrnLib/Material.h index 820c400..265666c 100644 --- a/src/EterGrnLib/Material.h +++ b/src/EterGrnLib/Material.h @@ -4,9 +4,9 @@ #include #include -#include "../eterlib/ReferenceObject.h" -#include "../eterlib/Ref.h" -#include "../eterlib/GrpImageInstance.h" +#include "Eterlib/ReferenceObject.h" +#include "Eterlib/Ref.h" +#include "Eterlib/GrpImageInstance.h" #include "Util.h" class CGrannyMaterial : public CReferenceObject diff --git a/src/EterGrnLib/Model.h b/src/EterGrnLib/Model.h index 54d603c..b61a0f3 100644 --- a/src/EterGrnLib/Model.h +++ b/src/EterGrnLib/Model.h @@ -1,7 +1,7 @@ #pragma once -#include "../eterlib/GrpVertexBuffer.h" -#include "../eterlib/GrpIndexBuffer.h" +#include "Eterlib/GrpVertexBuffer.h" +#include "Eterlib/GrpIndexBuffer.h" #include "Mesh.h" diff --git a/src/EterGrnLib/ModelInstance.cpp b/src/EterGrnLib/ModelInstance.cpp index da20138..610a571 100644 --- a/src/EterGrnLib/ModelInstance.cpp +++ b/src/EterGrnLib/ModelInstance.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "ModelInstance.h" #include "Model.h" -#include "../EterLib/ResourceManager.h" +#include "EterLib/ResourceManager.h" CGrannyModel* CGrannyModelInstance::GetModel() diff --git a/src/EterGrnLib/ModelInstance.h b/src/EterGrnLib/ModelInstance.h index a06a4a9..82687b2 100644 --- a/src/EterGrnLib/ModelInstance.h +++ b/src/EterGrnLib/ModelInstance.h @@ -1,8 +1,8 @@ #pragma once //#define CACHE_DEFORMED_VERTEX -#include "../eterlib/GrpImage.h" -#include "../eterlib/GrpCollisionObject.h" +#include "Eterlib/GrpImage.h" +#include "Eterlib/GrpCollisionObject.h" #include "Model.h" #include "Motion.h" diff --git a/src/EterGrnLib/ModelInstanceCollisionDetection.cpp b/src/EterGrnLib/ModelInstanceCollisionDetection.cpp index 14a78a1..44ff77e 100644 --- a/src/EterGrnLib/ModelInstanceCollisionDetection.cpp +++ b/src/EterGrnLib/ModelInstanceCollisionDetection.cpp @@ -176,7 +176,7 @@ bool CGrannyModelInstance::Intersect(const D3DXMATRIX * c_pMatrix, */ } -#include "../EterBase/Timer.h" +#include "EterBase/Timer.h" void CGrannyModelInstance::GetBoundBox(D3DXVECTOR3* vtMin, D3DXVECTOR3* vtMax) { diff --git a/src/EterGrnLib/ModelInstanceRender.cpp b/src/EterGrnLib/ModelInstanceRender.cpp index d539b8c..02ddb0a 100644 --- a/src/EterGrnLib/ModelInstanceRender.cpp +++ b/src/EterGrnLib/ModelInstanceRender.cpp @@ -1,11 +1,11 @@ #include "StdAfx.h" -#include "../eterlib/StateManager.h" +#include "Eterlib/StateManager.h" #include "ModelInstance.h" #include "Model.h" #ifdef _TEST -#include "../eterlib/GrpScreen.h" +#include "Eterlib/GrpScreen.h" void Granny_RenderBoxBones(const granny_skeleton* pkGrnSkeleton, const granny_world_pose* pkGrnWorldPose, const D3DXMATRIX& matBase) { diff --git a/src/EterGrnLib/ModelInstanceUpdate.cpp b/src/EterGrnLib/ModelInstanceUpdate.cpp index 1fe0037..3e634c6 100644 --- a/src/EterGrnLib/ModelInstanceUpdate.cpp +++ b/src/EterGrnLib/ModelInstanceUpdate.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterbase/Debug.h" +#include "Eterbase/Debug.h" #include "ModelInstance.h" #include "Model.h" diff --git a/src/EterGrnLib/StdAfx.h b/src/EterGrnLib/StdAfx.h index 86205b9..888382d 100644 --- a/src/EterGrnLib/StdAfx.h +++ b/src/EterGrnLib/StdAfx.h @@ -5,9 +5,9 @@ //#include #include -#include "../eterBase/Utils.h" -#include "../eterBase/Debug.h" -#include "../eterBase/Stl.h" +#include "EterBase/Utils.h" +#include "EterBase/Debug.h" +#include "EterBase/Stl.h" #include "Util.h" diff --git a/src/EterGrnLib/Thing.cpp b/src/EterGrnLib/Thing.cpp index 6fd5335..5eb7738 100644 --- a/src/EterGrnLib/Thing.cpp +++ b/src/EterGrnLib/Thing.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterbase/Debug.h" +#include "Eterbase/Debug.h" #include "Thing.h" #include "ThingInstance.h" diff --git a/src/EterGrnLib/ThingInstance.cpp b/src/EterGrnLib/ThingInstance.cpp index 78a449d..a418584 100644 --- a/src/EterGrnLib/ThingInstance.cpp +++ b/src/EterGrnLib/ThingInstance.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" -#include "../eterbase/Debug.h" -#include "../eterlib/Camera.h" -#include "../eterBase/Timer.h" +#include "Eterbase/Debug.h" +#include "Eterlib/Camera.h" +#include "EterBase/Timer.h" #include "ThingInstance.h" #include "Thing.h" #include "ModelInstance.h" diff --git a/src/EterGrnLib/ThingInstance.h b/src/EterGrnLib/ThingInstance.h index 1b896b9..d2f4f5d 100644 --- a/src/EterGrnLib/ThingInstance.h +++ b/src/EterGrnLib/ThingInstance.h @@ -1,8 +1,8 @@ #pragma once -#include "../eterbase/Stl.h" -#include "../eterlib/GrpObjectInstance.h" -#include "../eterlib/GrpShadowTexture.h" +#include "Eterbase/Stl.h" +#include "Eterlib/GrpObjectInstance.h" +#include "Eterlib/GrpShadowTexture.h" #include "LODController.h" diff --git a/src/EterImageLib/TGAImage.cpp b/src/EterImageLib/TGAImage.cpp index dfcbfc1..18ca0b3 100644 --- a/src/EterImageLib/TGAImage.cpp +++ b/src/EterImageLib/TGAImage.cpp @@ -2,7 +2,7 @@ #include -#include "../eterBase/MappedFile.h" +#include "EterBase/MappedFile.h" #include "TGAImage.h" CTGAImage::CTGAImage() : m_dwFlag(0) diff --git a/src/EterLib/AttributeData.cpp b/src/EterLib/AttributeData.cpp index 786f20b..74efd85 100644 --- a/src/EterLib/AttributeData.cpp +++ b/src/EterLib/AttributeData.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Utils.h" +#include "EterBase/Utils.h" #include "AttributeData.h" const char c_szAttributeDataFileHeader[] = "AttributeData"; diff --git a/src/EterLib/AttributeInstance.cpp b/src/EterLib/AttributeInstance.cpp index 3c96ddc..effec7f 100644 --- a/src/EterLib/AttributeInstance.cpp +++ b/src/EterLib/AttributeInstance.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Utils.h" +#include "EterBase/Utils.h" #include "AttributeInstance.h" #include "GrpMath.h" diff --git a/src/EterLib/BlockTexture.cpp b/src/EterLib/BlockTexture.cpp index 8465c80..b30e275 100644 --- a/src/EterLib/BlockTexture.cpp +++ b/src/EterLib/BlockTexture.cpp @@ -2,8 +2,8 @@ #include "BlockTexture.h" #include "GrpBase.h" #include "GrpDib.h" -#include "../eterbase/Stl.h" -#include "../eterlib/StateManager.h" +#include "Eterbase/Stl.h" +#include "Eterlib/StateManager.h" void CBlockTexture::SetClipRect(const RECT & c_rRect) { diff --git a/src/EterLib/Camera.cpp b/src/EterLib/Camera.cpp index 201f578..8cc6ebe 100644 --- a/src/EterLib/Camera.cpp +++ b/src/EterLib/Camera.cpp @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #include "StdAfx.h" -#include "../eterBase/Utils.h" +#include "EterBase/Utils.h" #include "Camera.h" #include diff --git a/src/EterLib/Camera.h b/src/EterLib/Camera.h index f557805..9dc4c27 100644 --- a/src/EterLib/Camera.h +++ b/src/EterLib/Camera.h @@ -11,7 +11,7 @@ #include -#include "../eterBase/Singleton.h" +#include "EterBase/Singleton.h" #include "Ray.h" const float CAMERA_TARGET_STANDARD = 100.0f; diff --git a/src/EterLib/CullingManager.h b/src/EterLib/CullingManager.h index 0891d77..fc3a9c5 100644 --- a/src/EterLib/CullingManager.h +++ b/src/EterLib/CullingManager.h @@ -2,8 +2,8 @@ #include "GrpScreen.h" -#include "../eterbase/Singleton.h" -#include "../SphereLib/spherepack.h" +#include "Eterbase/Singleton.h" +#include "SphereLib/spherepack.h" class CGraphicObjectInstance; template diff --git a/src/EterLib/FileLoaderThread.cpp b/src/EterLib/FileLoaderThread.cpp index e7fcb64..dd41160 100644 --- a/src/EterLib/FileLoaderThread.cpp +++ b/src/EterLib/FileLoaderThread.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../EterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" #include "FileLoaderThread.h" #include "ResourceManager.h" diff --git a/src/EterLib/FileLoaderThread.h b/src/EterLib/FileLoaderThread.h index e8f095b..1709a95 100644 --- a/src/EterLib/FileLoaderThread.h +++ b/src/EterLib/FileLoaderThread.h @@ -4,7 +4,7 @@ #include #include "Thread.h" #include "Mutex.h" -#include "../eterBase/MappedFile.h" +#include "EterBase/MappedFile.h" class CFileLoaderThread { diff --git a/src/EterLib/GrpBase.cpp b/src/EterLib/GrpBase.cpp index ca9f53e..5d45ba3 100644 --- a/src/EterLib/GrpBase.cpp +++ b/src/EterLib/GrpBase.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterBase/Utils.h" -#include "../eterBase/Timer.h" +#include "EterBase/Utils.h" +#include "EterBase/Timer.h" #include "GrpBase.h" #include "Camera.h" #include "StateManager.h" diff --git a/src/EterLib/GrpColorInstance.cpp b/src/EterLib/GrpColorInstance.cpp index f2a9026..538bec8 100644 --- a/src/EterLib/GrpColorInstance.cpp +++ b/src/EterLib/GrpColorInstance.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "GrpColorInstance.h" -#include "../eterBase/Timer.h" +#include "EterBase/Timer.h" CGraphicColorInstance::CGraphicColorInstance() { diff --git a/src/EterLib/GrpD3DXBuffer.cpp b/src/EterLib/GrpD3DXBuffer.cpp index 8abf31e..d27b0d2 100644 --- a/src/EterLib/GrpD3DXBuffer.cpp +++ b/src/EterLib/GrpD3DXBuffer.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "GrpD3DXBuffer.h" -#include "../eterBase/Stl.h" +#include "EterBase/Stl.h" CDirect3DXBuffer::CDirect3DXBuffer() { diff --git a/src/EterLib/GrpDevice.cpp b/src/EterLib/GrpDevice.cpp index 791bf80..afc185f 100644 --- a/src/EterLib/GrpDevice.cpp +++ b/src/EterLib/GrpDevice.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "GrpDevice.h" -#include "../eterBase/Stl.h" -#include "../eterBase/Debug.h" +#include "EterBase/Stl.h" +#include "EterBase/Debug.h" bool CPU_HAS_SSE2 = false; bool GRAPHICS_CAPS_CAN_NOT_DRAW_LINE = false; diff --git a/src/EterLib/GrpExpandedImageInstance.cpp b/src/EterLib/GrpExpandedImageInstance.cpp index 2b70b6b..6a26498 100644 --- a/src/EterLib/GrpExpandedImageInstance.cpp +++ b/src/EterLib/GrpExpandedImageInstance.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/CRC32.h" +#include "EterBase/CRC32.h" #include "GrpExpandedImageInstance.h" #include "StateManager.h" diff --git a/src/EterLib/GrpFontTexture.cpp b/src/EterLib/GrpFontTexture.cpp index a55ee5d..3e313ba 100644 --- a/src/EterLib/GrpFontTexture.cpp +++ b/src/EterLib/GrpFontTexture.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "GrpText.h" -#include "../eterBase/Stl.h" +#include "EterBase/Stl.h" #include "Util.h" diff --git a/src/EterLib/GrpImageInstance.cpp b/src/EterLib/GrpImageInstance.cpp index b682307..294f157 100644 --- a/src/EterLib/GrpImageInstance.cpp +++ b/src/EterLib/GrpImageInstance.cpp @@ -2,7 +2,7 @@ #include "GrpImageInstance.h" #include "StateManager.h" -#include "../eterBase/CRC32.h" +#include "EterBase/CRC32.h" //STATEMANAGER.SaveRenderState(D3DRS_SRCBLEND, D3DBLEND_INVDESTCOLOR); //STATEMANAGER.SaveRenderState(D3DRS_DESTBLEND, D3DBLEND_ONE); //STATEMANAGER.RestoreRenderState(D3DRS_SRCBLEND); diff --git a/src/EterLib/GrpIndexBuffer.cpp b/src/EterLib/GrpIndexBuffer.cpp index 66996f4..2b0ea1f 100644 --- a/src/EterLib/GrpIndexBuffer.cpp +++ b/src/EterLib/GrpIndexBuffer.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Stl.h" +#include "EterBase/Stl.h" #include "GrpIndexBuffer.h" #include "StateManager.h" diff --git a/src/EterLib/GrpLightManager.cpp b/src/EterLib/GrpLightManager.cpp index 9a469ff..787ee0b 100644 --- a/src/EterLib/GrpLightManager.cpp +++ b/src/EterLib/GrpLightManager.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include -#include "../eterBase/Timer.h" +#include "EterBase/Timer.h" #include "GrpLightManager.h" #include "StateManager.h" diff --git a/src/EterLib/GrpLightManager.h b/src/EterLib/GrpLightManager.h index eb1e839..c849604 100644 --- a/src/EterLib/GrpLightManager.h +++ b/src/EterLib/GrpLightManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterBase/Singleton.h" +#include "EterBase/Singleton.h" #include "GrpBase.h" #include "Util.h" diff --git a/src/EterLib/GrpMarkInstance.cpp b/src/EterLib/GrpMarkInstance.cpp index bc9db0f..727a2ed 100644 --- a/src/EterLib/GrpMarkInstance.cpp +++ b/src/EterLib/GrpMarkInstance.cpp @@ -3,7 +3,7 @@ #include "StateManager.h" #include "ResourceManager.h" -#include "../eterBase/CRC32.h" +#include "EterBase/CRC32.h" CDynamicPool CGraphicMarkInstance::ms_kPool; diff --git a/src/EterLib/GrpObjectInstance.cpp b/src/EterLib/GrpObjectInstance.cpp index 831e0ba..65af030 100644 --- a/src/EterLib/GrpObjectInstance.cpp +++ b/src/EterLib/GrpObjectInstance.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "GrpObjectInstance.h" -#include "../eterBase/Timer.h" +#include "EterBase/Timer.h" void CGraphicObjectInstance::OnInitialize() { diff --git a/src/EterLib/GrpRatioInstance.cpp b/src/EterLib/GrpRatioInstance.cpp index 5249467..053ade0 100644 --- a/src/EterLib/GrpRatioInstance.cpp +++ b/src/EterLib/GrpRatioInstance.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "GrpRatioInstance.h" -#include "../eterBase/Timer.h" +#include "EterBase/Timer.h" CGraphicRatioInstance::CGraphicRatioInstance() { diff --git a/src/EterLib/GrpScreen.h b/src/EterLib/GrpScreen.h index 61c4c19..3a83586 100644 --- a/src/EterLib/GrpScreen.h +++ b/src/EterLib/GrpScreen.h @@ -1,7 +1,7 @@ #pragma once #include "GrpCollisionObject.h" -#include "../SphereLib/frustum.h" +#include "SphereLib/frustum.h" class CScreen : public CGraphicCollisionObject diff --git a/src/EterLib/GrpSubImage.cpp b/src/EterLib/GrpSubImage.cpp index 1e01eda..2ef3916 100644 --- a/src/EterLib/GrpSubImage.cpp +++ b/src/EterLib/GrpSubImage.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterBase/Stl.h" -#include "../eterBase/FileLoader.h" +#include "EterBase/Stl.h" +#include "EterBase/FileLoader.h" #include "GrpSubImage.h" #include "ResourceManager.h" diff --git a/src/EterLib/GrpText.cpp b/src/EterLib/GrpText.cpp index 1c24ce0..6e4790e 100644 --- a/src/EterLib/GrpText.cpp +++ b/src/EterLib/GrpText.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Utils.h" +#include "EterBase/Utils.h" #include "GrpText.h" CGraphicText::CGraphicText(const char* c_szFileName) : CResource(c_szFileName) diff --git a/src/EterLib/GrpTexture.cpp b/src/EterLib/GrpTexture.cpp index 9214a4b..6ed36cf 100644 --- a/src/EterLib/GrpTexture.cpp +++ b/src/EterLib/GrpTexture.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Stl.h" +#include "EterBase/Stl.h" #include "GrpTexture.h" #include "StateManager.h" diff --git a/src/EterLib/GrpVertexBuffer.cpp b/src/EterLib/GrpVertexBuffer.cpp index f3d9fe2..04f13cf 100644 --- a/src/EterLib/GrpVertexBuffer.cpp +++ b/src/EterLib/GrpVertexBuffer.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Stl.h" +#include "EterBase/Stl.h" #include "GrpVertexBuffer.h" #include "StateManager.h" diff --git a/src/EterLib/IME.cpp b/src/EterLib/IME.cpp index 2507e90..781564b 100644 --- a/src/EterLib/IME.cpp +++ b/src/EterLib/IME.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "IME.h" #include "TextTag.h" -#include "../eterBase/Utils.h" +#include "EterBase/Utils.h" #include "msctf.h" #include diff --git a/src/EterLib/MSWindow.h b/src/EterLib/MSWindow.h index 9298af2..4c362bc 100644 --- a/src/EterLib/MSWindow.h +++ b/src/EterLib/MSWindow.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterBase/Stl.h" +#include "EterBase/Stl.h" class CMSWindow { diff --git a/src/EterLib/NetStream.cpp b/src/EterLib/NetStream.cpp index a0b0b92..f5c8e36 100644 --- a/src/EterLib/NetStream.cpp +++ b/src/EterLib/NetStream.cpp @@ -3,7 +3,7 @@ //#include "eterCrypt.h" #ifndef _IMPROVED_PACKET_ENCRYPTION_ -#include "../eterBase/tea.h" +#include "EterBase/tea.h" #endif //#define _PACKETDUMP diff --git a/src/EterLib/NetStream.h b/src/EterLib/NetStream.h index 11064a7..0c35a82 100644 --- a/src/EterLib/NetStream.h +++ b/src/EterLib/NetStream.h @@ -1,9 +1,9 @@ #pragma once #ifdef _IMPROVED_PACKET_ENCRYPTION_ -#include "../eterBase/cipher.h" +#include "EterBase/cipher.h" #endif -#include "../eterBase/tea.h" +#include "EterBase/tea.h" #include "NetAddress.h" #include diff --git a/src/EterLib/Profiler.h b/src/EterLib/Profiler.h index b89db87..d021217 100644 --- a/src/EterLib/Profiler.h +++ b/src/EterLib/Profiler.h @@ -1,7 +1,7 @@ #pragma once -#include "../eterBase/Timer.h" -#include "../eterBase/Debug.h" +#include "EterBase/Timer.h" +#include "EterBase/Debug.h" /* class CProfiler : public CSingleton diff --git a/src/EterLib/Resource.cpp b/src/EterLib/Resource.cpp index a37003c..02b0cfc 100644 --- a/src/EterLib/Resource.cpp +++ b/src/EterLib/Resource.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" -#include "../eterPack/EterPackManager.h" -#include "../eterBase/CRC32.h" -#include "../eterBase/Timer.h" +#include "EterPack/EterPackManager.h" +#include "EterBase/CRC32.h" +#include "EterBase/Timer.h" #include "Resource.h" #include "ResourceManager.h" diff --git a/src/EterLib/ResourceManager.cpp b/src/EterLib/ResourceManager.cpp index c917caa..5807788 100644 --- a/src/EterLib/ResourceManager.cpp +++ b/src/EterLib/ResourceManager.cpp @@ -1,9 +1,9 @@ #include "StdAfx.h" #include -#include "../eterBase/CRC32.h" -#include "../eterBase/Timer.h" -#include "../eterBase/Stl.h" -#include "../eterPack/EterPackManager.h" +#include "EterBase/CRC32.h" +#include "EterBase/Timer.h" +#include "EterBase/Stl.h" +#include "EterPack/EterPackManager.h" #include "ResourceManager.h" #include "GrpImage.h" diff --git a/src/EterLib/SkyBox.cpp b/src/EterLib/SkyBox.cpp index 80e2574..1ca5052 100644 --- a/src/EterLib/SkyBox.cpp +++ b/src/EterLib/SkyBox.cpp @@ -4,7 +4,7 @@ #include "StateManager.h" #include "ResourceManager.h" -#include "../eterBase/Timer.h" +#include "EterBase/Timer.h" ////////////////////////////////////////////////////////////////////////// // CSkyObjectQuad diff --git a/src/EterLib/StateManager.h b/src/EterLib/StateManager.h index 64c6f9b..9f655c2 100644 --- a/src/EterLib/StateManager.h +++ b/src/EterLib/StateManager.h @@ -47,7 +47,7 @@ #include #include -#include "../eterBase/Singleton.h" +#include "EterBase/Singleton.h" #define CHECK_D3DAPI(a) \ { \ diff --git a/src/EterLib/TargaResource.h b/src/EterLib/TargaResource.h index 833e7a6..750ae1e 100644 --- a/src/EterLib/TargaResource.h +++ b/src/EterLib/TargaResource.h @@ -2,7 +2,7 @@ #include "Ref.h" #include "Resource.h" -#include "../eterImageLib/TGAImage.h" +#include "EterImageLib/TGAImage.h" class CTargaResource : public CResource { diff --git a/src/EterLib/TextBar.cpp b/src/EterLib/TextBar.cpp index 1b4839f..1d8d2dc 100644 --- a/src/EterLib/TextBar.cpp +++ b/src/EterLib/TextBar.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "TextBar.h" -#include "../eterlib/Util.h" +#include "EterLib/Util.h" void CTextBar::__SetFont(int fontSize, bool isBold) { diff --git a/src/EterLib/TextFileLoader.cpp b/src/EterLib/TextFileLoader.cpp index d663901..cb76922 100644 --- a/src/EterLib/TextFileLoader.cpp +++ b/src/EterLib/TextFileLoader.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" -#include "../eterBase/CRC32.h" +#include "EterBase/CRC32.h" #include -#include "../eterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" #include "Pool.h" #include "TextFileLoader.h" diff --git a/src/EterLib/TextFileLoader.h b/src/EterLib/TextFileLoader.h index 6854e37..3585066 100644 --- a/src/EterLib/TextFileLoader.h +++ b/src/EterLib/TextFileLoader.h @@ -1,10 +1,10 @@ #ifndef __INC_METIN_II_TEXTFILELOADER_H__ #define __INC_METIN_II_TEXTFILELOADER_H__ -#include "../eterBase/FileLoader.h" -#include "../eterBase/MappedFile.h" -#include "../eterLib/Util.h" -#include "../eterLib/Pool.h" +#include "EterBase/FileLoader.h" +#include "EterBase/MappedFile.h" +#include "EterLib/Util.h" +#include "EterLib/Pool.h" class CTextFileLoader { diff --git a/src/EterLib/Util.cpp b/src/EterLib/Util.cpp index bcb6ced..9defd1f 100644 --- a/src/EterLib/Util.cpp +++ b/src/EterLib/Util.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" #include "TextFileLoader.h" diff --git a/src/EterLib/Util.h b/src/EterLib/Util.h index caa76f9..f1ec497 100644 --- a/src/EterLib/Util.h +++ b/src/EterLib/Util.h @@ -1,7 +1,7 @@ #pragma once -#include "../eterBase/FileLoader.h" +#include "EterBase/FileLoader.h" #include #include diff --git a/src/EterPack/EterPackManager.cpp b/src/EterPack/EterPackManager.cpp index 5531057..abcebe5 100644 --- a/src/EterPack/EterPackManager.cpp +++ b/src/EterPack/EterPackManager.cpp @@ -6,8 +6,8 @@ #include "EterPackManager.h" #include "EterPackPolicy_CSHybridCrypt.h" -#include "../eterBase/Debug.h" -#include "../eterBase/CRC32.h" +#include "EterBase/Debug.h" +#include "EterBase/CRC32.h" #define PATH_ABSOLUTE_YMIRWORK1 "d:/ymir work/" #define PATH_ABSOLUTE_YMIRWORK2 "d:\\ymir work\\" diff --git a/src/EterPack/EterPackManager.h b/src/EterPack/EterPackManager.h index 152efed..248b3c4 100644 --- a/src/EterPack/EterPackManager.h +++ b/src/EterPack/EterPackManager.h @@ -2,8 +2,8 @@ #include #include -#include "../eterBase/Singleton.h" -#include "../eterBase/Stl.h" +#include "EterBase/Singleton.h" +#include "EterBase/Stl.h" #include "EterPack.h" diff --git a/src/EterPack/StdAfx.h b/src/EterPack/StdAfx.h index a8fa6e9..04faaad 100644 --- a/src/EterPack/StdAfx.h +++ b/src/EterPack/StdAfx.h @@ -4,4 +4,4 @@ #include #include -#include "../eterBase/StdAfx.h" \ No newline at end of file +#include "EterBase/StdAfx.h" \ No newline at end of file diff --git a/src/EterPythonLib/PythonGraphic.cpp b/src/EterPythonLib/PythonGraphic.cpp index 98a9d66..c28e30a 100644 --- a/src/EterPythonLib/PythonGraphic.cpp +++ b/src/EterPythonLib/PythonGraphic.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" -#include "../eterLib/JpegFile.h" +#include "EterLib/StateManager.h" +#include "EterLib/JpegFile.h" #include "PythonGraphic.h" bool g_isScreenShotKey = false; diff --git a/src/EterPythonLib/PythonGraphic.h b/src/EterPythonLib/PythonGraphic.h index 2d7ae22..a6f7597 100644 --- a/src/EterPythonLib/PythonGraphic.h +++ b/src/EterPythonLib/PythonGraphic.h @@ -1,11 +1,11 @@ #pragma once -#include "../eterlib/GrpTextInstance.h" -#include "../eterlib/GrpMarkInstance.h" -#include "../eterlib/GrpImageInstance.h" -#include "../eterlib/GrpExpandedImageInstance.h" +#include "EterLib/GrpTextInstance.h" +#include "EterLib/GrpMarkInstance.h" +#include "EterLib/GrpImageInstance.h" +#include "EterLib/GrpExpandedImageInstance.h" -#include "../eterGrnLib/ThingInstance.h" +#include "EterGrnLib/ThingInstance.h" class CPythonGraphic : public CScreen, public CSingleton { diff --git a/src/EterPythonLib/PythonGraphicModule.cpp b/src/EterPythonLib/PythonGraphicModule.cpp index b1bc61a..3b69108 100644 --- a/src/EterPythonLib/PythonGraphicModule.cpp +++ b/src/EterPythonLib/PythonGraphicModule.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterlib/Camera.h" -#include "../EterLib/TextBar.h" +#include "EterLib/Camera.h" +#include "EterLib/TextBar.h" #include diff --git a/src/EterPythonLib/PythonGridSlotWindow.cpp b/src/EterPythonLib/PythonGridSlotWindow.cpp index 125fae0..d1f848d 100644 --- a/src/EterPythonLib/PythonGridSlotWindow.cpp +++ b/src/EterPythonLib/PythonGridSlotWindow.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/CRC32.h" +#include "EterBase/CRC32.h" #include "PythonGridSlotWindow.h" using namespace UI; diff --git a/src/EterPythonLib/PythonSlotWindow.cpp b/src/EterPythonLib/PythonSlotWindow.cpp index 6edd77e..a64c34b 100644 --- a/src/EterPythonLib/PythonSlotWindow.cpp +++ b/src/EterPythonLib/PythonSlotWindow.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterBase/CRC32.h" -#include "../eterBase/Filename.h" +#include "EterBase/CRC32.h" +#include "EterBase/Filename.h" #include "PythonWindow.h" #include "PythonSlotWindow.h" diff --git a/src/EterPythonLib/PythonWindow.cpp b/src/EterPythonLib/PythonWindow.cpp index b7ce50f..099fe87 100644 --- a/src/EterPythonLib/PythonWindow.cpp +++ b/src/EterPythonLib/PythonWindow.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/CRC32.h" +#include "EterBase/CRC32.h" #include "PythonWindow.h" #include "PythonSlotWindow.h" #include "PythonWindowManager.h" diff --git a/src/EterPythonLib/PythonWindow.h b/src/EterPythonLib/PythonWindow.h index e125530..588a746 100644 --- a/src/EterPythonLib/PythonWindow.h +++ b/src/EterPythonLib/PythonWindow.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterBase/Utils.h" +#include "EterBase/Utils.h" namespace UI { diff --git a/src/EterPythonLib/StdAfx.h b/src/EterPythonLib/StdAfx.h index 6b9274d..d5e0931 100644 --- a/src/EterPythonLib/StdAfx.h +++ b/src/EterPythonLib/StdAfx.h @@ -3,8 +3,8 @@ #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS #endif -#include "../EterLib/StdAfx.h" -#include "../ScriptLib/StdAfx.h" +#include "EterLib/StdAfx.h" +#include "ScriptLib/StdAfx.h" #include "PythonGraphic.h" #include "PythonWindowManager.h" diff --git a/src/GameLib/ActorInstance.cpp b/src/GameLib/ActorInstance.cpp index bd66f0d..9b12497 100644 --- a/src/GameLib/ActorInstance.cpp +++ b/src/GameLib/ActorInstance.cpp @@ -2,8 +2,8 @@ #include "ActorInstance.h" #include "AreaTerrain.h" #include "RaceData.h" -#include "../SpeedTreeLib/SpeedTreeForestDirectX8.h" -#include "../SpeedTreeLib/SpeedTreeWrapper.h" +#include "SpeedTreeLib/SpeedTreeForestDirectX8.h" +#include "SpeedTreeLib/SpeedTreeWrapper.h" enum { diff --git a/src/GameLib/ActorInstance.h b/src/GameLib/ActorInstance.h index 2f86e3c..b862c55 100644 --- a/src/GameLib/ActorInstance.h +++ b/src/GameLib/ActorInstance.h @@ -11,8 +11,8 @@ #include "PhysicsObject.h" #include "ActorInstanceInterface.h" #include "Interface.h" -#include "../SpeedTreeLib/SpeedTreeForest.h" -//#include "../eterGrnLib/ThingInstance.h" +#include "SpeedTreeLib/SpeedTreeForest.h" +//#include "EterGrnLib/ThingInstance.h" class CItemData; class CWeaponTrace; diff --git a/src/GameLib/ActorInstanceAttach.cpp b/src/GameLib/ActorInstanceAttach.cpp index c585122..2a5af52 100644 --- a/src/GameLib/ActorInstanceAttach.cpp +++ b/src/GameLib/ActorInstanceAttach.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../EffectLib/EffectManager.h" +#include "EffectLib/EffectManager.h" #include "ActorInstance.h" #include "ItemData.h" diff --git a/src/GameLib/ActorInstanceBattle.cpp b/src/GameLib/ActorInstanceBattle.cpp index 5360568..15d8e60 100644 --- a/src/GameLib/ActorInstanceBattle.cpp +++ b/src/GameLib/ActorInstanceBattle.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../effectLib/EffectManager.h" -#include "../AudioLib/SoundEngine.h" +#include "EffectLib/EffectManager.h" +#include "AudioLib/SoundEngine.h" #include "ActorInstance.h" #include "RaceData.h" diff --git a/src/GameLib/ActorInstanceCollisionDetection.cpp b/src/GameLib/ActorInstanceCollisionDetection.cpp index eea22ff..49d43ff 100644 --- a/src/GameLib/ActorInstanceCollisionDetection.cpp +++ b/src/GameLib/ActorInstanceCollisionDetection.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/GrpMath.h" +#include "EterLib/GrpMath.h" #include "ActorInstance.h" diff --git a/src/GameLib/ActorInstanceData.cpp b/src/GameLib/ActorInstanceData.cpp index 4119ff9..3f12c83 100644 --- a/src/GameLib/ActorInstanceData.cpp +++ b/src/GameLib/ActorInstanceData.cpp @@ -4,8 +4,8 @@ #include "ItemManager.h" #include "RaceData.h" -#include "../eterlib/ResourceManager.h" -#include "../etergrnlib/util.h" +#include "EterLib/ResourceManager.h" +#include "EterGrnLib/util.h" DWORD CActorInstance::GetVirtualID() { diff --git a/src/GameLib/ActorInstanceInterface.h b/src/GameLib/ActorInstanceInterface.h index 1187c1d..5013173 100644 --- a/src/GameLib/ActorInstanceInterface.h +++ b/src/GameLib/ActorInstanceInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterGrnLib/ThingInstance.h" +#include "EterGrnLib/ThingInstance.h" class IActorInstance : public CGraphicThingInstance { diff --git a/src/GameLib/ActorInstanceMotionEvent.cpp b/src/GameLib/ActorInstanceMotionEvent.cpp index d238e29..7a511b5 100644 --- a/src/GameLib/ActorInstanceMotionEvent.cpp +++ b/src/GameLib/ActorInstanceMotionEvent.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../EffectLib/EffectManager.h" -#include "../AudioLib/SoundEngine.h" +#include "EffectLib/EffectManager.h" +#include "AudioLib/SoundEngine.h" #include "ActorInstance.h" #include "FlyingObjectManager.h" diff --git a/src/GameLib/ActorInstanceRender.cpp b/src/GameLib/ActorInstanceRender.cpp index f538e27..69518c3 100644 --- a/src/GameLib/ActorInstanceRender.cpp +++ b/src/GameLib/ActorInstanceRender.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" +#include "EterLib/StateManager.h" #include "ActorInstance.h" diff --git a/src/GameLib/Area.cpp b/src/GameLib/Area.cpp index 507752a..2a147a4 100644 --- a/src/GameLib/Area.cpp +++ b/src/GameLib/Area.cpp @@ -1,10 +1,10 @@ #include "StdAfx.h" -#include "../eterLib/ResourceManager.h" -#include "../eterLib/StateManager.h" -#include "../effectLib/EffectManager.h" -#include "../SpeedTreeLib/SpeedTreeForestDirectX8.h" -#include "../eterBase/Timer.h" +#include "EterLib/ResourceManager.h" +#include "EterLib/StateManager.h" +#include "EffectLib/EffectManager.h" +#include "SpeedTreeLib/SpeedTreeForestDirectX8.h" +#include "EterBase/Timer.h" #include "Area.h" #include "PropertyManager.h" diff --git a/src/GameLib/Area.h b/src/GameLib/Area.h index 3830450..5bbe691 100644 --- a/src/GameLib/Area.h +++ b/src/GameLib/Area.h @@ -1,10 +1,10 @@ #pragma once -#include "../SpeedTreeLib/SpeedTreeWrapper.h" -#include "../eterGrnLib/ThingInstance.h" +#include "SpeedTreeLib/SpeedTreeWrapper.h" +#include "EterGrnLib/ThingInstance.h" #include "MapType.h" #include "DungeonBlock.h" -#include "../SpeedTreeLib/SpeedTreeForest.h" +#include "SpeedTreeLib/SpeedTreeForest.h" class CMapOutdoor; class CEffectInstance; diff --git a/src/GameLib/AreaLoaderThread.cpp b/src/GameLib/AreaLoaderThread.cpp index 5c63104..268934d 100644 --- a/src/GameLib/AreaLoaderThread.cpp +++ b/src/GameLib/AreaLoaderThread.cpp @@ -4,7 +4,7 @@ #include "StdAfx.h" -#include "../eterLib/ResourceManager.h" +#include "EterLib/ResourceManager.h" #include "AreaLoaderThread.h" #include "AreaTerrain.h" diff --git a/src/GameLib/AreaLoaderThread.h b/src/GameLib/AreaLoaderThread.h index e47e924..dd42740 100644 --- a/src/GameLib/AreaLoaderThread.h +++ b/src/GameLib/AreaLoaderThread.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "../eterLib/Mutex.h" +#include "EterLib/Mutex.h" class CTerrain; class CArea; diff --git a/src/GameLib/AreaTerrain.cpp b/src/GameLib/AreaTerrain.cpp index 26dd8ab..167ca54 100644 --- a/src/GameLib/AreaTerrain.cpp +++ b/src/GameLib/AreaTerrain.cpp @@ -1,9 +1,9 @@ #include "StdAfx.h" -#include "../PRTerrainLib/StdAfx.h" +#include "PRTerrainLib/StdAfx.h" -#include "../eterLib/ResourceManager.h" -#include "../eterlib/StateManager.h" -#include "../EterPack/EterPackManager.h" +#include "EterLib/ResourceManager.h" +#include "EterLib/StateManager.h" +#include "EterPack/EterPackManager.h" #include "AreaTerrain.h" #include "MapOutdoor.h" diff --git a/src/GameLib/AreaTerrain.h b/src/GameLib/AreaTerrain.h index d246fa6..cc7ffdd 100644 --- a/src/GameLib/AreaTerrain.h +++ b/src/GameLib/AreaTerrain.h @@ -2,7 +2,7 @@ class CMapOutdoor; -#include "../PRTerrainLib/Terrain.h" +#include "PRTerrainLib/Terrain.h" #include "TerrainPatch.h" class CTerrain : public CTerrainImpl, public CGraphicBase diff --git a/src/GameLib/DungeonBlock.cpp b/src/GameLib/DungeonBlock.cpp index 291c339..06c120a 100644 --- a/src/GameLib/DungeonBlock.cpp +++ b/src/GameLib/DungeonBlock.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "DungeonBlock.h" -#include "../eterlib/StateManager.h" +#include "EterLib/StateManager.h" class CDungeonModelInstance : public CGrannyModelInstance { diff --git a/src/GameLib/DungeonBlock.h b/src/GameLib/DungeonBlock.h index c9aa962..cf0a5e9 100644 --- a/src/GameLib/DungeonBlock.h +++ b/src/GameLib/DungeonBlock.h @@ -1,9 +1,9 @@ #pragma once -#include "../EterLib/ResourceManager.h" -#include "../EterLib/GrpObjectInstance.h" -#include "../EterGrnLib/ModelInstance.h" -#include "../EterGrnLib/Thing.h" +#include "EterLib/ResourceManager.h" +#include "EterLib/GrpObjectInstance.h" +#include "EterGrnLib/ModelInstance.h" +#include "EterGrnLib/Thing.h" class CDungeonModelInstance; diff --git a/src/GameLib/FlyTrace.cpp b/src/GameLib/FlyTrace.cpp index 0af12fd..d808b4f 100644 --- a/src/GameLib/FlyTrace.cpp +++ b/src/GameLib/FlyTrace.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../eterLib/StateManager.h" -#include "../eterLib/Camera.h" +#include "EterLib/StateManager.h" +#include "EterLib/Camera.h" #include "FlyingData.h" #include "FlyTrace.h" diff --git a/src/GameLib/FlyingData.cpp b/src/GameLib/FlyingData.cpp index 40524d1..30be43f 100644 --- a/src/GameLib/FlyingData.cpp +++ b/src/GameLib/FlyingData.cpp @@ -1,5 +1,5 @@ #include "Stdafx.h" -#include "../effectLib/EffectManager.h" +#include "EffectLib/EffectManager.h" #include "FlyingData.h" diff --git a/src/GameLib/FlyingInstance.cpp b/src/GameLib/FlyingInstance.cpp index c782d52..b887549 100644 --- a/src/GameLib/FlyingInstance.cpp +++ b/src/GameLib/FlyingInstance.cpp @@ -1,6 +1,6 @@ #include "Stdafx.h" -#include "../eterLib/GrpMath.h" -#include "../effectLib/EffectManager.h" +#include "EterLib/GrpMath.h" +#include "EffectLib/EffectManager.h" #include "MapManager.h" diff --git a/src/GameLib/GameType.cpp b/src/GameLib/GameType.cpp index ce11069..7d5bc53 100644 --- a/src/GameLib/GameType.cpp +++ b/src/GameLib/GameType.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "GameType.h" -#include "../effectLib/EffectManager.h" +#include "EffectLib/EffectManager.h" extern float g_fGameFPS = 60.0f; diff --git a/src/GameLib/GameType.h b/src/GameLib/GameType.h index 4919b5b..3972ab8 100644 --- a/src/GameLib/GameType.h +++ b/src/GameLib/GameType.h @@ -2,8 +2,8 @@ #include -#include "../eterLib/TextFileLoader.h" -#include "../eterLib/CollisionData.h" +#include "EterLib/TextFileLoader.h" +#include "EterLib/CollisionData.h" extern float g_fGameFPS; diff --git a/src/GameLib/GameUtil.cpp b/src/GameLib/GameUtil.cpp index 7538dfb..a1c1928 100644 --- a/src/GameLib/GameUtil.cpp +++ b/src/GameLib/GameUtil.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/lineintersect_utils.h" +#include "EterLib/lineintersect_utils.h" #include "GameUtil.h" diff --git a/src/GameLib/ItemData.cpp b/src/GameLib/ItemData.cpp index 7afc96d..d74c5fd 100644 --- a/src/GameLib/ItemData.cpp +++ b/src/GameLib/ItemData.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/ResourceManager.h" +#include "EterLib/ResourceManager.h" #include "ItemData.h" diff --git a/src/GameLib/ItemData.h b/src/GameLib/ItemData.h index c05d7ec..68c5f91 100644 --- a/src/GameLib/ItemData.h +++ b/src/GameLib/ItemData.h @@ -3,8 +3,8 @@ // NOTE : Item의 통합 관리 클래스다. // Icon, Model (droped on ground), Game Data -#include "../eterLib/GrpSubImage.h" -#include "../eterGrnLib/Thing.h" +#include "EterLib/GrpSubImage.h" +#include "EterGrnLib/Thing.h" class CItemData { diff --git a/src/GameLib/ItemManager.cpp b/src/GameLib/ItemManager.cpp index 8e96b0e..828e49d 100644 --- a/src/GameLib/ItemManager.cpp +++ b/src/GameLib/ItemManager.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterPack/EterPackManager.h" -#include "../eterLib/ResourceManager.h" +#include "EterPack/EterPackManager.h" +#include "EterLib/ResourceManager.h" #include "ItemManager.h" diff --git a/src/GameLib/MapManager.cpp b/src/GameLib/MapManager.cpp index c15c0e9..e42014e 100644 --- a/src/GameLib/MapManager.cpp +++ b/src/GameLib/MapManager.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" -#include "../EterPack/EterPackManager.h" +#include "EterLib/StateManager.h" +#include "EterPack/EterPackManager.h" #include "MapManager.h" #include "MapOutdoor.h" diff --git a/src/GameLib/MapOutdoor.cpp b/src/GameLib/MapOutdoor.cpp index 80764db..061484b 100644 --- a/src/GameLib/MapOutdoor.cpp +++ b/src/GameLib/MapOutdoor.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" -#include "../eterlib/StateManager.h" -#include "../eterlib/Camera.h" -#include "../PRTerrainLib/StdAfx.h" -#include "../EffectLib/EffectManager.h" +#include "EterLib/StateManager.h" +#include "EterLib/Camera.h" +#include "PRTerrainLib/StdAfx.h" +#include "EffectLib/EffectManager.h" #include "MapOutdoor.h" #include "TerrainPatch.h" diff --git a/src/GameLib/MapOutdoor.h b/src/GameLib/MapOutdoor.h index a0f7aeb..3db0a2f 100644 --- a/src/GameLib/MapOutdoor.h +++ b/src/GameLib/MapOutdoor.h @@ -1,13 +1,13 @@ #pragma once -#include "../eterLib/SkyBox.h" -#include "../eterLib/LensFlare.h" -#include "../eterLib/ScreenFilter.h" +#include "EterLib/SkyBox.h" +#include "EterLib/LensFlare.h" +#include "EterLib/ScreenFilter.h" -#include "../PRTerrainLib/TerrainType.h" -#include "../PRTerrainLib/TextureSet.h" +#include "PRTerrainLib/TerrainType.h" +#include "PRTerrainLib/TextureSet.h" -#include "../SpeedTreeLib/SpeedTreeForestDirectX8.h" +#include "SpeedTreeLib/SpeedTreeForestDirectX8.h" #include "MapBase.h" #include "Area.h" diff --git a/src/GameLib/MapOutdoorCharacterShadow.cpp b/src/GameLib/MapOutdoorCharacterShadow.cpp index e632f4f..a6b0904 100644 --- a/src/GameLib/MapOutdoorCharacterShadow.cpp +++ b/src/GameLib/MapOutdoorCharacterShadow.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" -#include "../eterlib/Camera.h" +#include "EterLib/StateManager.h" +#include "EterLib/Camera.h" #include "MapOutdoor.h" diff --git a/src/GameLib/MapOutdoorLoad.cpp b/src/GameLib/MapOutdoorLoad.cpp index 987dcde..f7f258c 100644 --- a/src/GameLib/MapOutdoorLoad.cpp +++ b/src/GameLib/MapOutdoorLoad.cpp @@ -2,8 +2,8 @@ #include "MapOutdoor.h" #include "AreaTerrain.h" #include "AreaLoaderThread.h" -#include "../eterLib/ResourceManager.h" -#include "../EterPack/EterPackManager.h" +#include "EterLib/ResourceManager.h" +#include "EterPack/EterPackManager.h" //CAreaLoaderThread CMapOutdoor::ms_AreaLoaderThread; diff --git a/src/GameLib/MapOutdoorRender.cpp b/src/GameLib/MapOutdoorRender.cpp index 474d8cf..e6b80c3 100644 --- a/src/GameLib/MapOutdoorRender.cpp +++ b/src/GameLib/MapOutdoorRender.cpp @@ -4,8 +4,8 @@ #include "AreaTerrain.h" #include "TerrainQuadtree.h" -#include "../eterlib/Camera.h" -#include "../eterlib/StateManager.h" +#include "EterLib/Camera.h" +#include "EterLib/StateManager.h" #define MAX_RENDER_SPALT 150 diff --git a/src/GameLib/MapOutdoorRenderHTP.cpp b/src/GameLib/MapOutdoorRenderHTP.cpp index 5d7fd97..6a1fdcf 100644 --- a/src/GameLib/MapOutdoorRenderHTP.cpp +++ b/src/GameLib/MapOutdoorRenderHTP.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "MapOutdoor.h" -#include "../eterlib/StateManager.h" +#include "EterLib/StateManager.h" void CMapOutdoor::__RenderTerrain_RenderHardwareTransformPatch() { diff --git a/src/GameLib/MapOutdoorRenderSTP.cpp b/src/GameLib/MapOutdoorRenderSTP.cpp index b40a356..63ed1fb 100644 --- a/src/GameLib/MapOutdoorRenderSTP.cpp +++ b/src/GameLib/MapOutdoorRenderSTP.cpp @@ -3,8 +3,8 @@ #include "TerrainPatch.h" #include "TerrainQuadtree.h" -#include "../eterlib/Camera.h" -#include "../eterlib/StateManager.h" +#include "EterLib/Camera.h" +#include "EterLib/StateManager.h" struct SoftwareTransformPatch_SSplatVertex { diff --git a/src/GameLib/MapOutdoorUpdate.cpp b/src/GameLib/MapOutdoorUpdate.cpp index a507c62..933749b 100644 --- a/src/GameLib/MapOutdoorUpdate.cpp +++ b/src/GameLib/MapOutdoorUpdate.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterlib/Camera.h" -#include "../PRTerrainLib/StdAfx.h" +#include "EterLib/Camera.h" +#include "PRTerrainLib/StdAfx.h" #include "MapOutdoor.h" #include "TerrainPatch.h" diff --git a/src/GameLib/MapOutdoorWater.cpp b/src/GameLib/MapOutdoorWater.cpp index 44f34f0..9aeaa37 100644 --- a/src/GameLib/MapOutdoorWater.cpp +++ b/src/GameLib/MapOutdoorWater.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" -#include "../eterLib/ResourceManager.h" +#include "EterLib/StateManager.h" +#include "EterLib/ResourceManager.h" #include "MapOutdoor.h" #include "TerrainPatch.h" diff --git a/src/GameLib/MapType.cpp b/src/GameLib/MapType.cpp index 0dde68f..4216729 100644 --- a/src/GameLib/MapType.cpp +++ b/src/GameLib/MapType.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterBase/Filename.h" +#include "EterBase/Filename.h" #include "Property.h" float SEnvironmentData::GetFogNearDistance() const diff --git a/src/GameLib/MapType.h b/src/GameLib/MapType.h index cab713f..f75ddb3 100644 --- a/src/GameLib/MapType.h +++ b/src/GameLib/MapType.h @@ -3,8 +3,8 @@ class CProperty; -#include "../eterLib/SkyBox.h" -#include "../AudioLib/SoundEngine.h" +#include "EterLib/SkyBox.h" +#include "AudioLib/SoundEngine.h" ///////////////////////////////////////////////////////////////// // Property diff --git a/src/GameLib/Property.cpp b/src/GameLib/Property.cpp index ef40882..7cfd92f 100644 --- a/src/GameLib/Property.cpp +++ b/src/GameLib/Property.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include -#include "../eterBase/TempFile.h" +#include "EterBase/TempFile.h" #include "PropertyManager.h" #include "Property.h" diff --git a/src/GameLib/PropertyLoader.h b/src/GameLib/PropertyLoader.h index 0aa5888..cae129e 100644 --- a/src/GameLib/PropertyLoader.h +++ b/src/GameLib/PropertyLoader.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterbase/FileDir.h" +#include "EterBase/FileDir.h" class CPropertyManager; diff --git a/src/GameLib/PropertyManager.cpp b/src/GameLib/PropertyManager.cpp index 5cbd3e2..975532a 100644 --- a/src/GameLib/PropertyManager.cpp +++ b/src/GameLib/PropertyManager.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" #include "PropertyManager.h" #include "Property.h" diff --git a/src/GameLib/PropertyManager.h b/src/GameLib/PropertyManager.h index 0ad11c1..d3e3ac7 100644 --- a/src/GameLib/PropertyManager.h +++ b/src/GameLib/PropertyManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterPack/EterPack.h" +#include "EterPack/EterPack.h" class CPropertyManager : public CSingleton { diff --git a/src/GameLib/RaceData.cpp b/src/GameLib/RaceData.cpp index de48b19..b1553a2 100644 --- a/src/GameLib/RaceData.cpp +++ b/src/GameLib/RaceData.cpp @@ -1,10 +1,10 @@ #include "StdAfx.h" -#include "../eterLib/ResourceManager.h" -#include "../eterLib/AttributeInstance.h" -#include "../eterBase/Utils.h" +#include "EterLib/ResourceManager.h" +#include "EterLib/AttributeInstance.h" +#include "EterBase/Utils.h" #include "RaceData.h" #include "RaceMotionData.h" -#include "../eterBase/Filename.h" +#include "EterBase/Filename.h" CDynamicPool CRaceData::ms_kPool; CDynamicPool CRaceData::ms_MotionModeDataPool; diff --git a/src/GameLib/RaceData.h b/src/GameLib/RaceData.h index 61becf2..3df24a8 100644 --- a/src/GameLib/RaceData.h +++ b/src/GameLib/RaceData.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterGrnLib/Thing.h" +#include "EterGrnLib/Thing.h" class CRaceMotionData; class CAttributeData; diff --git a/src/GameLib/RaceDataFile.cpp b/src/GameLib/RaceDataFile.cpp index ee05fa9..df15c09 100644 --- a/src/GameLib/RaceDataFile.cpp +++ b/src/GameLib/RaceDataFile.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/ResourceManager.h" +#include "EterLib/ResourceManager.h" #include "RaceData.h" #include "RaceMotionData.h" diff --git a/src/GameLib/RaceManager.cpp b/src/GameLib/RaceManager.cpp index 5860169..bcc1438 100644 --- a/src/GameLib/RaceManager.cpp +++ b/src/GameLib/RaceManager.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "RaceManager.h" #include "RaceMotionData.h" -#include "../EterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" bool __IsGuildRace(unsigned race) { diff --git a/src/GameLib/RaceMotionData.cpp b/src/GameLib/RaceMotionData.cpp index e0aadd9..3f4530c 100644 --- a/src/GameLib/RaceMotionData.cpp +++ b/src/GameLib/RaceMotionData.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../EffectLib/EffectManager.h" +#include "EffectLib/EffectManager.h" #include "FlyingObjectManager.h" #include "RaceMotionData.h" diff --git a/src/GameLib/RaceMotionDataEvent.h b/src/GameLib/RaceMotionDataEvent.h index 9e74a7c..4503c9c 100644 --- a/src/GameLib/RaceMotionDataEvent.h +++ b/src/GameLib/RaceMotionDataEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "../EffectLib/EffectManager.h" +#include "EffectLib/EffectManager.h" #include "FlyingObjectManager.h" namespace NMotionEvent diff --git a/src/GameLib/SnowEnvironment.cpp b/src/GameLib/SnowEnvironment.cpp index 57e361c..1b623fd 100644 --- a/src/GameLib/SnowEnvironment.cpp +++ b/src/GameLib/SnowEnvironment.cpp @@ -1,9 +1,9 @@ #include "StdAfx.h" #include "SnowEnvironment.h" -#include "../EterLib/StateManager.h" -#include "../EterLib/Camera.h" -#include "../EterLib/ResourceManager.h" +#include "EterLib/StateManager.h" +#include "EterLib/Camera.h" +#include "EterLib/ResourceManager.h" #include "SnowParticle.h" void CSnowEnvironment::Enable() diff --git a/src/GameLib/SnowEnvironment.h b/src/GameLib/SnowEnvironment.h index 16d0a7c..21538ff 100644 --- a/src/GameLib/SnowEnvironment.h +++ b/src/GameLib/SnowEnvironment.h @@ -1,6 +1,6 @@ #pragma once -#include "../EterLib/GrpScreen.h" +#include "EterLib/GrpScreen.h" class CSnowParticle; diff --git a/src/GameLib/StdAfx.h b/src/GameLib/StdAfx.h index 6258b4e..3f8f1aa 100644 --- a/src/GameLib/StdAfx.h +++ b/src/GameLib/StdAfx.h @@ -18,13 +18,13 @@ #pragma warning(disable:4201 4512 4238 4239) #endif -#include "../eterBase/Utils.h" -#include "../eterBase/CRC32.h" -#include "../eterBase/Random.h" +#include "EterBase/Utils.h" +#include "EterBase/CRC32.h" +#include "EterBase/Random.h" -#include "../eterLib/StdAfx.h" -#include "../AudioLib/StdAfx.h" -#include "../effectLib/StdAfx.h" +#include "EterLib/StdAfx.h" +#include "AudioLib/StdAfx.h" +#include "EffectLib/StdAfx.h" #include "GameType.h" #include "GameUtil.h" diff --git a/src/GameLib/TerrainDecal.cpp b/src/GameLib/TerrainDecal.cpp index 9709704..46077c1 100644 --- a/src/GameLib/TerrainDecal.cpp +++ b/src/GameLib/TerrainDecal.cpp @@ -3,8 +3,8 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "../eterLib/StateManager.h" -#include "../PRTerrainLib/StdAfx.h" +#include "EterLib/StateManager.h" +#include "PRTerrainLib/StdAfx.h" #include "TerrainDecal.h" #include "MapOutdoor.h" diff --git a/src/GameLib/TerrainDecal.h b/src/GameLib/TerrainDecal.h index 89df15b..2f41234 100644 --- a/src/GameLib/TerrainDecal.h +++ b/src/GameLib/TerrainDecal.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "../eterlib/Decal.h" +#include "EterLib/Decal.h" class CMapOutdoor; diff --git a/src/GameLib/TerrainPatch.h b/src/GameLib/TerrainPatch.h index 14977bc..f131804 100644 --- a/src/GameLib/TerrainPatch.h +++ b/src/GameLib/TerrainPatch.h @@ -9,8 +9,8 @@ #pragma once #endif // _MSC_VER > 1000 -#include "../eterlib/GrpVertexBuffer.h" -#include "../PRTerrainLib/Terrain.h" +#include "EterLib/GrpVertexBuffer.h" +#include "PRTerrainLib/Terrain.h" #pragma pack(push) #pragma pack(1) diff --git a/src/GameLib/WeaponTrace.cpp b/src/GameLib/WeaponTrace.cpp index 5a6ea03..59add16 100644 --- a/src/GameLib/WeaponTrace.cpp +++ b/src/GameLib/WeaponTrace.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterLib/ResourceManager.h" -#include "../eterLib/StateManager.h" +#include "EterLib/ResourceManager.h" +#include "EterLib/StateManager.h" #include "WeaponTrace.h" diff --git a/src/GameLib/WeaponTrace.h b/src/GameLib/WeaponTrace.h index a429331..f705074 100644 --- a/src/GameLib/WeaponTrace.h +++ b/src/GameLib/WeaponTrace.h @@ -1,7 +1,7 @@ #pragma once // change CatMull to cubic spline -#include "../eterGrnLib/ThingInstance.h" +#include "EterGrnLib/ThingInstance.h" class CWeaponTrace { diff --git a/src/PRTerrainLib/StdAfx.h b/src/PRTerrainLib/StdAfx.h index b6db9cb..6d72de0 100644 --- a/src/PRTerrainLib/StdAfx.h +++ b/src/PRTerrainLib/StdAfx.h @@ -15,9 +15,9 @@ //#include -#include "../EterLib/StdAfx.h" -#include "../EterGrnLib/StdAfx.h" -#include "../scriptLib/StdAfx.h" +#include "EterLib/StdAfx.h" +#include "EterGrnLib/StdAfx.h" +#include "ScriptLib/StdAfx.h" /* Fast Float<->Integer conversion */ extern float PR_FCNV; diff --git a/src/PRTerrainLib/Terrain.cpp b/src/PRTerrainLib/Terrain.cpp index c4812b8..8f7c3f4 100644 --- a/src/PRTerrainLib/Terrain.cpp +++ b/src/PRTerrainLib/Terrain.cpp @@ -1,5 +1,5 @@ #include "Stdafx.h" -#include "../eterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" #include "terrain.h" #include diff --git a/src/PRTerrainLib/Terrain.h b/src/PRTerrainLib/Terrain.h index f5e8d76..54ff2d5 100644 --- a/src/PRTerrainLib/Terrain.h +++ b/src/PRTerrainLib/Terrain.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "../eterImageLib/TGAImage.h" +#include "EterImageLib/TGAImage.h" #include "TextureSet.h" #include "TerrainType.h" diff --git a/src/PRTerrainLib/TerrainType.h b/src/PRTerrainLib/TerrainType.h index c59d069..65ae317 100644 --- a/src/PRTerrainLib/TerrainType.h +++ b/src/PRTerrainLib/TerrainType.h @@ -1,8 +1,8 @@ #ifndef __TERRAIn_TYPES__ #define __TERRAIn_TYPES__ -#include "../eterlib/GrpVertexBuffer.h" -#include "../eterlib/GrpIndexBuffer.h" +#include "EterLib/GrpVertexBuffer.h" +#include "EterLib/GrpIndexBuffer.h" #define TERRAIN_PATCHSIZE 16 #define TERRAIN_SIZE 128 diff --git a/src/PRTerrainLib/TextureSet.h b/src/PRTerrainLib/TextureSet.h index 3221f40..d3960e5 100644 --- a/src/PRTerrainLib/TextureSet.h +++ b/src/PRTerrainLib/TextureSet.h @@ -1,7 +1,7 @@ #ifndef __INC_TERRAINLIB_TEXTURESET_H__ #define __INC_TERRAINLIB_TEXTURESET_H__ -#include "../eterLib/GrpImageInstance.h" +#include "EterLib/GrpImageInstance.h" typedef struct STerrainTexture { diff --git a/src/ScriptLib/Resource.cpp b/src/ScriptLib/Resource.cpp index 87d1dca..27dd34f 100644 --- a/src/ScriptLib/Resource.cpp +++ b/src/ScriptLib/Resource.cpp @@ -1,26 +1,26 @@ #include "StdAfx.h" -#include "../eterLib/GrpExpandedImageInstance.h" -#include "../eterLib/GrpTextInstance.h" -#include "../eterLib/GrpMarkInstance.h" -#include "../eterLib/GrpSubImage.h" -#include "../eterLib/GrpText.h" -#include "../eterLib/AttributeData.h" -#include "../eterGrnLib/Thing.h" -#include "../eterGrnLib/ThingInstance.h" -#include "../effectLib/EffectMesh.h" -#include "../effectLib/EffectInstance.h" -#include "../gamelib/WeaponTrace.h" -#include "../gamelib/MapType.h" -#include "../gamelib/GameType.h" -#include "../gamelib/RaceData.h" -#include "../gamelib/RaceMotionData.h" -#include "../gamelib/ActorInstance.h" -#include "../gamelib/Area.h" -#include "../gamelib/ItemData.h" -#include "../gamelib/FlyingData.h" -#include "../gamelib/FlyTrace.h" -#include "../gamelib/FlyingInstance.h" -#include "../gamelib/FlyingData.h" +#include "EterLib/GrpExpandedImageInstance.h" +#include "EterLib/GrpTextInstance.h" +#include "EterLib/GrpMarkInstance.h" +#include "EterLib/GrpSubImage.h" +#include "EterLib/GrpText.h" +#include "EterLib/AttributeData.h" +#include "EterGrnLib/Thing.h" +#include "EterGrnLib/ThingInstance.h" +#include "EffectLib/EffectMesh.h" +#include "EffectLib/EffectInstance.h" +#include "Gamelib/WeaponTrace.h" +#include "Gamelib/MapType.h" +#include "Gamelib/GameType.h" +#include "Gamelib/RaceData.h" +#include "Gamelib/RaceMotionData.h" +#include "Gamelib/ActorInstance.h" +#include "Gamelib/Area.h" +#include "Gamelib/ItemData.h" +#include "Gamelib/FlyingData.h" +#include "Gamelib/FlyTrace.h" +#include "Gamelib/FlyingInstance.h" +#include "Gamelib/FlyingData.h" #include "Resource.h" diff --git a/src/ScriptLib/Resource.h b/src/ScriptLib/Resource.h index c9b1d60..8e91af4 100644 --- a/src/ScriptLib/Resource.h +++ b/src/ScriptLib/Resource.h @@ -1,8 +1,8 @@ #pragma once -#include "../EffectLib/StdAfx.h" -#include "../eterlib/Resource.h" -#include "../eterlib/ResourceManager.h" +#include "EffectLib/StdAfx.h" +#include "EterLib/Resource.h" +#include "EterLib/ResourceManager.h" enum EResourceTypes { diff --git a/src/ScriptLib/StdAfx.h b/src/ScriptLib/StdAfx.h index 363af88..4bf47de 100644 --- a/src/ScriptLib/StdAfx.h +++ b/src/ScriptLib/StdAfx.h @@ -1,7 +1,7 @@ #pragma once -#include "../eterLib/StdAfx.h" -#include "../eterGrnLib/StdAfx.h" +#include "EterLib/StdAfx.h" +#include "EterGrnLib/StdAfx.h" //#include #ifdef _DEBUG diff --git a/src/SpeedTreeLib/BoundaryShapeManager.cpp b/src/SpeedTreeLib/BoundaryShapeManager.cpp index f8d2b77..d61e069 100644 --- a/src/SpeedTreeLib/BoundaryShapeManager.cpp +++ b/src/SpeedTreeLib/BoundaryShapeManager.cpp @@ -24,7 +24,7 @@ #include "StdAfx.h" #include -#include "../eterbase/Random.h" +#include "EterBase/Random.h" #include "BoundaryShapeManager.h" using namespace std; diff --git a/src/SpeedTreeLib/Constants.h b/src/SpeedTreeLib/Constants.h index 2f83f06..e6674ba 100644 --- a/src/SpeedTreeLib/Constants.h +++ b/src/SpeedTreeLib/Constants.h @@ -22,17 +22,10 @@ // #pragma once -//#include "LibVector_Source/IdvVector.h" -//#include "../Common Source/Filename.h" // used to isolate SpeedGrass usage #define USE_SPEEDGRASS - -// paths -//const CFilename c_strTreePath = "../data/TheValley/Trees/"; -//const CFilename c_strDataPath = "../data/TheValley/"; - // vertex shader constant locations const int c_nShaderLightPosition = 16; const int c_nShaderGrassBillboard = 4; diff --git a/src/SpeedTreeLib/SpeedGrassRT.h b/src/SpeedTreeLib/SpeedGrassRT.h index fd8a2ba..287a6e1 100644 --- a/src/SpeedTreeLib/SpeedGrassRT.h +++ b/src/SpeedTreeLib/SpeedGrassRT.h @@ -22,10 +22,6 @@ #pragma once -//#include -//#include "Constants.h" -//#include "../Common Source/IdvVertexBuffer.h" - #ifdef USE_SPEEDGRASS diff --git a/src/SpeedTreeLib/SpeedGrassWrapper.cpp b/src/SpeedTreeLib/SpeedGrassWrapper.cpp index dd9ede6..f762d87 100644 --- a/src/SpeedTreeLib/SpeedGrassWrapper.cpp +++ b/src/SpeedTreeLib/SpeedGrassWrapper.cpp @@ -25,12 +25,6 @@ #include #include #include -//#include "../Common Source/extgl.h" -//#include "SpeedGrassWrapper.h" -//#include "Scene.h" -//#include "../Common Source/nv_dds.h" -//#include "../Common Source/Random.h" -//#include "TextureLayers.h" using namespace std; diff --git a/src/SpeedTreeLib/SpeedGrassWrapper.h b/src/SpeedTreeLib/SpeedGrassWrapper.h index 9c51657..d6d5aaa 100644 --- a/src/SpeedTreeLib/SpeedGrassWrapper.h +++ b/src/SpeedTreeLib/SpeedGrassWrapper.h @@ -24,9 +24,6 @@ #pragma once //#include "SpeedGrassRT.h" #ifdef USE_SPEEDGRASS -//#include "../Common Source/IdvVertexBuffer.h" -//#include - // forward reference //class CScene; class CMapOutdoor; diff --git a/src/SpeedTreeLib/SpeedTreeForest.cpp b/src/SpeedTreeLib/SpeedTreeForest.cpp index 1d1b934..49fdc4a 100644 --- a/src/SpeedTreeLib/SpeedTreeForest.cpp +++ b/src/SpeedTreeLib/SpeedTreeForest.cpp @@ -6,7 +6,7 @@ #include "StdAfx.h" #include -#include "../eterBase/Filename.h" +#include "EterBase/Filename.h" #include "EterBase/MappedFile.h" #include "EterPack/EterPackManager.h" diff --git a/src/SpeedTreeLib/SpeedTreeForest.h b/src/SpeedTreeLib/SpeedTreeForest.h index d1604be..610e9f8 100644 --- a/src/SpeedTreeLib/SpeedTreeForest.h +++ b/src/SpeedTreeLib/SpeedTreeForest.h @@ -38,7 +38,7 @@ #include #include -#include "../EterBase/CRC32.h" +#include "EterBase/CRC32.h" /////////////////////////////////////////////////////////////////////// // Render bit vector diff --git a/src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp b/src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp index 8064eb7..c88bd06 100644 --- a/src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp +++ b/src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp @@ -34,9 +34,9 @@ #include #include -#include "../eterBase/Timer.h" -#include "../eterlib/StateManager.h" -#include "../eterlib/Camera.h" +#include "EterBase/Timer.h" +#include "EterLib/StateManager.h" +#include "EterLib/Camera.h" #include "SpeedTreeForestDirectX8.h" #include "SpeedTreeConfig.h" diff --git a/src/SpeedTreeLib/SpeedTreeWrapper.cpp b/src/SpeedTreeLib/SpeedTreeWrapper.cpp index 745d3b9..c5cdaad 100644 --- a/src/SpeedTreeLib/SpeedTreeWrapper.cpp +++ b/src/SpeedTreeLib/SpeedTreeWrapper.cpp @@ -36,12 +36,12 @@ #include #include -#include "../eterBase/Debug.h" -#include "../eterBase/Timer.h" -#include "../eterBase/Filename.h" -#include "../eterLib/ResourceManager.h" -#include "../eterLib/Camera.h" -#include "../eterLib/StateManager.h" +#include "EterBase/Debug.h" +#include "EterBase/Timer.h" +#include "EterBase/Filename.h" +#include "EterLib/ResourceManager.h" +#include "EterLib/Camera.h" +#include "EterLib/StateManager.h" #include "SpeedTreeConfig.h" #include "SpeedTreeForestDirectX8.h" diff --git a/src/SpeedTreeLib/StdAfx.h b/src/SpeedTreeLib/StdAfx.h index 8d8eae4..37bf0c8 100644 --- a/src/SpeedTreeLib/StdAfx.h +++ b/src/SpeedTreeLib/StdAfx.h @@ -1,7 +1,7 @@ #pragma once #include -#include "../UserInterface/Locale_inc.h" +#include "UserInterface/Locale_inc.h" //#include //#include "Forest.h" diff --git a/src/SphereLib/spherepack.cpp b/src/SphereLib/spherepack.cpp index 5bacb4d..572006c 100644 --- a/src/SphereLib/spherepack.cpp +++ b/src/SphereLib/spherepack.cpp @@ -650,7 +650,7 @@ void SpherePackFactory::RayTrace(const Vector3d &p1, mRoot->RayTrace(p1,dir,dist,this); } -#include "../EterBase/Debug.h" +#include "EterBase/Debug.h" void SpherePackFactory::RangeTest(const Vector3d ¢er,float radius,SpherePackCallback *callback) { diff --git a/src/UserInterface/AccountConnector.cpp b/src/UserInterface/AccountConnector.cpp index 6ab9d44..390cea7 100644 --- a/src/UserInterface/AccountConnector.cpp +++ b/src/UserInterface/AccountConnector.cpp @@ -2,8 +2,8 @@ #include "AccountConnector.h" #include "Packet.h" #include "PythonNetworkStream.h" -#include "../EterBase/tea.h" -#include "../EterPack/EterPackManager.h" +#include "EterBase/tea.h" +#include "EterPack/EterPackManager.h" // CHINA_CRYPT_KEY extern DWORD g_adwEncryptKey[4]; diff --git a/src/UserInterface/AccountConnector.h b/src/UserInterface/AccountConnector.h index 83844f0..d222221 100644 --- a/src/UserInterface/AccountConnector.h +++ b/src/UserInterface/AccountConnector.h @@ -1,7 +1,7 @@ #pragma -#include "../EterLib/NetStream.h" -#include "../EterLib/FuncObject.h" +#include "EterLib/NetStream.h" +#include "EterLib/FuncObject.h" class CAccountConnector : public CNetworkStream, public CSingleton { diff --git a/src/UserInterface/CameraProcedure.cpp b/src/UserInterface/CameraProcedure.cpp index be6be5f..a6ec93c 100644 --- a/src/UserInterface/CameraProcedure.cpp +++ b/src/UserInterface/CameraProcedure.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "PythonBackground.h" -#include "../eterlib/Camera.h" +#include "EterLib/Camera.h" ////////////////////////////////////////////////////////////////////////// // 메세지 diff --git a/src/UserInterface/GameType.h b/src/UserInterface/GameType.h index f70761b..624a3a1 100644 --- a/src/UserInterface/GameType.h +++ b/src/UserInterface/GameType.h @@ -1,5 +1,5 @@ #pragma once -#include "../GameLib/ItemData.h" +#include "GameLib/ItemData.h" struct SAffects { diff --git a/src/UserInterface/GuildMarkDownloader.h b/src/UserInterface/GuildMarkDownloader.h index 5719352..4873edd 100644 --- a/src/UserInterface/GuildMarkDownloader.h +++ b/src/UserInterface/GuildMarkDownloader.h @@ -1,6 +1,6 @@ #pragma once -#include "../EterLib/NetStream.h" +#include "EterLib/NetStream.h" #include "MarkManager.h" class CGuildMarkDownloader : public CNetworkStream, public CSingleton diff --git a/src/UserInterface/GuildMarkUploader.h b/src/UserInterface/GuildMarkUploader.h index 7f86e2e..4c61e73 100644 --- a/src/UserInterface/GuildMarkUploader.h +++ b/src/UserInterface/GuildMarkUploader.h @@ -1,6 +1,6 @@ #pragma once -#include "../EterLib/NetStream.h" +#include "EterLib/NetStream.h" #include "MarkImage.h" #ifdef __VTUNE__ diff --git a/src/UserInterface/InstanceBase.cpp b/src/UserInterface/InstanceBase.cpp index 66f60aa..54bd918 100644 --- a/src/UserInterface/InstanceBase.cpp +++ b/src/UserInterface/InstanceBase.cpp @@ -8,8 +8,8 @@ #include "AbstractApplication.h" #include "packet.h" -#include "../eterlib/StateManager.h" -#include "../gamelib/ItemManager.h" +#include "EterLib/StateManager.h" +#include "GameLib/ItemManager.h" BOOL HAIR_COLOR_ENABLE=FALSE; BOOL USE_ARMOR_SPECULAR=FALSE; diff --git a/src/UserInterface/InstanceBase.h b/src/UserInterface/InstanceBase.h index 0b9c2ec..d05c52f 100644 --- a/src/UserInterface/InstanceBase.h +++ b/src/UserInterface/InstanceBase.h @@ -1,7 +1,7 @@ #pragma once -#include "../gamelib/RaceData.h" -#include "../gamelib/ActorInstance.h" +#include "GameLib/RaceData.h" +#include "GameLib/ActorInstance.h" #include "AffectFlagContainer.h" diff --git a/src/UserInterface/InstanceBaseBattle.cpp b/src/UserInterface/InstanceBaseBattle.cpp index 842a23c..ba810ed 100644 --- a/src/UserInterface/InstanceBaseBattle.cpp +++ b/src/UserInterface/InstanceBaseBattle.cpp @@ -2,7 +2,7 @@ #include "InstanceBase.h" #include "PythonBackground.h" #include "PythonCharacterManager.h" -#include "../PRTerrainLib/Terrain.h" +#include "PRTerrainLib/Terrain.h" float NEW_UnsignedDegreeToSignedDegree(float fUD) { diff --git a/src/UserInterface/InstanceBaseEffect.cpp b/src/UserInterface/InstanceBaseEffect.cpp index efd65fc..888ce40 100644 --- a/src/UserInterface/InstanceBaseEffect.cpp +++ b/src/UserInterface/InstanceBaseEffect.cpp @@ -6,9 +6,9 @@ #include "PythonPlayer.h" #include "PythonSystem.h" -#include "../EffectLib/EffectManager.h" -#include "../EffectLib/ParticleSystemData.h" -#include "../EterLib/Camera.h" +#include "EffectLib/EffectManager.h" +#include "EffectLib/ParticleSystemData.h" +#include "EterLib/Camera.h" float CInstanceBase::ms_fDustGap; float CInstanceBase::ms_fHorseDustGap; diff --git a/src/UserInterface/InstanceBaseMotion.cpp b/src/UserInterface/InstanceBaseMotion.cpp index 95a35f0..4a9e2c9 100644 --- a/src/UserInterface/InstanceBaseMotion.cpp +++ b/src/UserInterface/InstanceBaseMotion.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "InstanceBase.h" #include "AbstractPlayer.h" -#include "../gameLib/ActorInstance.h" +#include "GameLib/ActorInstance.h" const int c_iFishingRotStep = 8; const float c_fFishingDistance = 600.0f; diff --git a/src/UserInterface/InstanceBaseMovement.cpp b/src/UserInterface/InstanceBaseMovement.cpp index eed8ff1..f6fa616 100644 --- a/src/UserInterface/InstanceBaseMovement.cpp +++ b/src/UserInterface/InstanceBaseMovement.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "InstanceBase.h" #include "PythonBackground.h" -#include "../eterLib/GrpMath.h" +#include "EterLib/GrpMath.h" void CInstanceBase::SetAttackSpeed(UINT uAtkSpd) { diff --git a/src/UserInterface/Locale.cpp b/src/UserInterface/Locale.cpp index c18d1fc..16c24fc 100644 --- a/src/UserInterface/Locale.cpp +++ b/src/UserInterface/Locale.cpp @@ -2,9 +2,9 @@ #include "Locale.h" #include "PythonApplication.h" #include "resource.h" -#include "../eterBase/CRC32.h" -#include "../eterpack/EterPackManager.h" -#include "../eterLocale/Japanese.h" +#include "EterBase/CRC32.h" +#include "EterPack/EterPackManager.h" +#include "EterLocale/Japanese.h" #include const char* LSS_YMIR = "YMIR"; diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h index ee02a39..0b95a96 100644 --- a/src/UserInterface/Packet.h +++ b/src/UserInterface/Packet.h @@ -13,7 +13,7 @@ typedef struct _AHNHS_TRANS_BUFFER #pragma pack(pop) // 기존 alignment 복구. -#include "../gamelib/RaceData.h" +#include "Gamelib/RaceData.h" typedef uint8_t TPacketHeader; diff --git a/src/UserInterface/PythonApplicationCamera.cpp b/src/UserInterface/PythonApplicationCamera.cpp index 3decfe9..ba96b3e 100644 --- a/src/UserInterface/PythonApplicationCamera.cpp +++ b/src/UserInterface/PythonApplicationCamera.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" #include "PythonApplication.h" -#include "../eterbase/timer.h" -#include "../eterlib/Camera.h" +#include "EterBase/timer.h" +#include "EterLib/Camera.h" float BlendValueByLinear(float fElapsedTime, float fDuration, float fBeginValue, float fEndValue) { diff --git a/src/UserInterface/PythonApplicationEvent.cpp b/src/UserInterface/PythonApplicationEvent.cpp index afe263b..d5b3fcb 100644 --- a/src/UserInterface/PythonApplicationEvent.cpp +++ b/src/UserInterface/PythonApplicationEvent.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "PythonApplication.h" -#include "../eterlib/Camera.h" +#include "EterLib/Camera.h" void CPythonApplication::OnCameraUpdate() { diff --git a/src/UserInterface/PythonApplicationModule.cpp b/src/UserInterface/PythonApplicationModule.cpp index 99b0aed..55db4ba 100644 --- a/src/UserInterface/PythonApplicationModule.cpp +++ b/src/UserInterface/PythonApplicationModule.cpp @@ -253,7 +253,7 @@ PyObject* appIsCHEONMA(PyObject* poSelf, PyObject* poArgs) return Py_BuildValue("i", LocaleService_IsCHEONMA()); } -#include "../eterBase/tea.h" +#include "EterBase/tea.h" PyObject* appLoadLocaleAddr(PyObject* poSelf, PyObject* poArgs) { @@ -339,7 +339,7 @@ PyObject* appGetImageInfo(PyObject* poSelf, PyObject* poArgs) } #endif -#include "../EterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" PyObject* appIsExistFile(PyObject* poSelf, PyObject* poArgs) { diff --git a/src/UserInterface/PythonBackground.cpp b/src/UserInterface/PythonBackground.cpp index f27d475..ae6bd13 100644 --- a/src/UserInterface/PythonBackground.cpp +++ b/src/UserInterface/PythonBackground.cpp @@ -3,11 +3,11 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "../eterlib/CullingManager.h" -#include "../eterlib/Camera.h" -#include "../eterPack/EterPackManager.h" -#include "../gamelib/MapOutDoor.h" -#include "../gamelib/PropertyLoader.h" +#include "EterLib/CullingManager.h" +#include "EterLib/Camera.h" +#include "EterPack/EterPackManager.h" +#include "GameLib/MapOutDoor.h" +#include "GameLib/PropertyLoader.h" #include "PythonBackground.h" #include "PythonCharacterManager.h" diff --git a/src/UserInterface/PythonBackground.h b/src/UserInterface/PythonBackground.h index a88e786..9c985ba 100644 --- a/src/UserInterface/PythonBackground.h +++ b/src/UserInterface/PythonBackground.h @@ -9,9 +9,9 @@ #pragma once #endif // _MSC_VER > 1000 -#include "../gamelib/MapManager.h" -#include "../gamelib/TerrainDecal.h" -#include "../gamelib/SnowEnvironment.h" +#include "GameLib/MapManager.h" +#include "GameLib/TerrainDecal.h" +#include "GameLib/SnowEnvironment.h" class CInstanceBase; diff --git a/src/UserInterface/PythonBackgroundModule.cpp b/src/UserInterface/PythonBackgroundModule.cpp index 93ecd3a..c424154 100644 --- a/src/UserInterface/PythonBackgroundModule.cpp +++ b/src/UserInterface/PythonBackgroundModule.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" #include "PythonSystem.h" #include "PythonBackground.h" -#include "../eterlib/StateManager.h" -#include "../gamelib/MapOutDoor.h" +#include "EterLib/StateManager.h" +#include "GameLib/MapOutDoor.h" PyObject * backgroundIsSoftwareTiling(PyObject * poSelf, PyObject * poArgs) { diff --git a/src/UserInterface/PythonCharacterManager.cpp b/src/UserInterface/PythonCharacterManager.cpp index b68f648..e788e36 100644 --- a/src/UserInterface/PythonCharacterManager.cpp +++ b/src/UserInterface/PythonCharacterManager.cpp @@ -5,7 +5,7 @@ #include "AbstractPlayer.h" #include "packet.h" -#include "../eterLib/Camera.h" +#include "EterLib/Camera.h" /////////////////////////////////////////////////////////////////////////////////////////////////// // Frame Process diff --git a/src/UserInterface/PythonCharacterManager.h b/src/UserInterface/PythonCharacterManager.h index ad41f4b..e1a7c51 100644 --- a/src/UserInterface/PythonCharacterManager.h +++ b/src/UserInterface/PythonCharacterManager.h @@ -2,7 +2,7 @@ #include "AbstractCharacterManager.h" #include "InstanceBase.h" -#include "../GameLib/PhysicsObject.h" +#include "GameLib/PhysicsObject.h" class CPythonCharacterManager : public CSingleton, public IAbstractCharacterManager, public IObjectManager { diff --git a/src/UserInterface/PythonCharacterManagerModule.cpp b/src/UserInterface/PythonCharacterManagerModule.cpp index a36d526..4f8e1f6 100644 --- a/src/UserInterface/PythonCharacterManagerModule.cpp +++ b/src/UserInterface/PythonCharacterManagerModule.cpp @@ -2,7 +2,7 @@ #include "PythonCharacterManager.h" #include "PythonBackground.h" #include "InstanceBase.h" -#include "../gamelib/RaceManager.h" +#include "GameLib/RaceManager.h" ////////////////////////////////////////////////////////////////////////// // RaceData 관련 시작 diff --git a/src/UserInterface/PythonChat.cpp b/src/UserInterface/PythonChat.cpp index faa2e97..3195c49 100644 --- a/src/UserInterface/PythonChat.cpp +++ b/src/UserInterface/PythonChat.cpp @@ -3,7 +3,7 @@ #include "AbstractApplication.h" #include "PythonCharacterManager.h" -#include "../eterbase/Timer.h" +#include "EterBase/Timer.h" int CPythonChat::TChatSet::ms_iChatModeSize = CHAT_TYPE_MAX_NUM; diff --git a/src/UserInterface/PythonChatModule.cpp b/src/UserInterface/PythonChatModule.cpp index 5c275fe..80f9605 100644 --- a/src/UserInterface/PythonChatModule.cpp +++ b/src/UserInterface/PythonChatModule.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "PythonChat.h" #include "PythonItem.h" -#include "../gamelib/ItemManager.h" +#include "GameLib/ItemManager.h" PyObject * chatSetChatColor(PyObject* poSelf, PyObject* poArgs) { diff --git a/src/UserInterface/PythonEffectModule.cpp b/src/UserInterface/PythonEffectModule.cpp index 9cab6ea..dceb78e 100644 --- a/src/UserInterface/PythonEffectModule.cpp +++ b/src/UserInterface/PythonEffectModule.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../EffectLib/EffectManager.h" +#include "EffectLib/EffectManager.h" #include "PythonCharacterManager.h" PyObject * effectRegisterEffect(PyObject * poSelf, PyObject * poArgs) diff --git a/src/UserInterface/PythonEventManager.cpp b/src/UserInterface/PythonEventManager.cpp index 73b0025..7839a1b 100644 --- a/src/UserInterface/PythonEventManager.cpp +++ b/src/UserInterface/PythonEventManager.cpp @@ -2,15 +2,13 @@ #include "PythonEventManager.h" #include "PythonNetworkStream.h" #include "PythonNonPlayer.h" - +#include "EterPack/EterPackManager.h" +#include "PythonMiniMap.h" #include "AbstractApplication.h" -#include "../gamelib/ItemData.h" -#include "../gamelib/ItemManager.h" +#include "GameLib/ItemData.h" +#include "GameLib/ItemManager.h" -#include "../eterPack/EterPackManager.h" - -#include "PythonMiniMap.h" const long c_lNormal_Waiting_Time = 10; const int c_fLine_Temp = 16; diff --git a/src/UserInterface/PythonEventManager.h b/src/UserInterface/PythonEventManager.h index 86ba7a4..c1c3adf 100644 --- a/src/UserInterface/PythonEventManager.h +++ b/src/UserInterface/PythonEventManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterLib/parser.h" +#include "EterLib/parser.h" #include #include diff --git a/src/UserInterface/PythonFlyModule.cpp b/src/UserInterface/PythonFlyModule.cpp index 1757854..c784775 100644 --- a/src/UserInterface/PythonFlyModule.cpp +++ b/src/UserInterface/PythonFlyModule.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" -#include "../gamelib/FlyingObjectManager.h" +#include "GameLib/FlyingObjectManager.h" + PyObject * flyUpdate(PyObject * poSelf, PyObject * poArgs) { CFlyingManager::Instance().Update(); diff --git a/src/UserInterface/PythonGameEventManagerModule.cpp b/src/UserInterface/PythonGameEventManagerModule.cpp index bbaceb4..75b29d6 100644 --- a/src/UserInterface/PythonGameEventManagerModule.cpp +++ b/src/UserInterface/PythonGameEventManagerModule.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../gamelib/GameEventManager.h" +#include "GameLib/GameEventManager.h" PyObject * eventMgrUpdate(PyObject * poSelf, PyObject * poArgs) { diff --git a/src/UserInterface/PythonIME.h b/src/UserInterface/PythonIME.h index 4031ff8..51ed835 100644 --- a/src/UserInterface/PythonIME.h +++ b/src/UserInterface/PythonIME.h @@ -1,7 +1,7 @@ #pragma once -#include "../eterBase/Singleton.h" -#include "../eterlib/IME.h" +#include "EterBase/Singleton.h" +#include "EterLib/IME.h" class CPythonIME : public IIMEEventSink, diff --git a/src/UserInterface/PythonItem.cpp b/src/UserInterface/PythonItem.cpp index 5c1183c..43cf62f 100644 --- a/src/UserInterface/PythonItem.cpp +++ b/src/UserInterface/PythonItem.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "../eterlib/GrpMath.h" -#include "../gamelib/ItemManager.h" -#include "../EffectLib/EffectManager.h" +#include "EterLib/GrpMath.h" +#include "Gamelib/ItemManager.h" +#include "EffectLib/EffectManager.h" #include "PythonBackground.h" #include "pythonitem.h" diff --git a/src/UserInterface/PythonItem.h b/src/UserInterface/PythonItem.h index 9824758..6de26bf 100644 --- a/src/UserInterface/PythonItem.h +++ b/src/UserInterface/PythonItem.h @@ -4,7 +4,7 @@ // 각 아이템의 데이타와 Icon Image Instance의 매니져 역할까지 주관 // 조금 난잡해진거 같기도 하다 - 2003. 01. 13. [levites] -#include "../EterGrnLib/ThingInstance.h" +#include "EterGrnLib/ThingInstance.h" class CItemData; diff --git a/src/UserInterface/PythonItemModule.cpp b/src/UserInterface/PythonItemModule.cpp index 2b0706e..dda05d5 100644 --- a/src/UserInterface/PythonItemModule.cpp +++ b/src/UserInterface/PythonItemModule.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "PythonItem.h" -#include "../gamelib/ItemManager.h" +#include "GameLib/ItemManager.h" #include "InstanceBase.h" #include "AbstractApplication.h" diff --git a/src/UserInterface/PythonMiniMap.cpp b/src/UserInterface/PythonMiniMap.cpp index df4fc71..c263a3f 100644 --- a/src/UserInterface/PythonMiniMap.cpp +++ b/src/UserInterface/PythonMiniMap.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" -#include "../eterLib/StateManager.h" -#include "../eterLib/GrpSubImage.h" -#include "../eterlib/Camera.h" -#include "../EterPack/EterPackManager.h" +#include "EterLib/StateManager.h" +#include "EterLib/GrpSubImage.h" +#include "EterLib/Camera.h" +#include "EterPack/EterPackManager.h" #include "PythonMiniMap.h" #include "PythonBackground.h" @@ -11,7 +11,7 @@ #include "AbstractPlayer.h" -#include "../eterPythonLib/PythonWindowManager.h" +#include "EterPythonLib/PythonWindowManager.h" void CPythonMiniMap::AddObserver(DWORD dwVID, float fSrcX, float fSrcY) { diff --git a/src/UserInterface/PythonNetworkDatagram.h b/src/UserInterface/PythonNetworkDatagram.h index 4d4ac3e..05a9274 100644 --- a/src/UserInterface/PythonNetworkDatagram.h +++ b/src/UserInterface/PythonNetworkDatagram.h @@ -1,8 +1,8 @@ #pragma once /* -#include "../eterLib/NetDatagramReceiver.h" -#include "../eterLib/NetDatagramSender.h" +#include "EterLib/NetDatagramReceiver.h" +#include "EterLib/NetDatagramSender.h" #include "Packet.h" class CPythonNetworkDatagram : public CSingleton diff --git a/src/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp index faeada5..ce83d2f 100644 --- a/src/UserInterface/PythonNetworkStream.cpp +++ b/src/UserInterface/PythonNetworkStream.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/NetPacketHeaderMap.h" +#include "EterLib/NetPacketHeaderMap.h" #include "PythonNetworkStream.h" #include "Packet.h" diff --git a/src/UserInterface/PythonNetworkStream.h b/src/UserInterface/PythonNetworkStream.h index 335c689..bca7af9 100644 --- a/src/UserInterface/PythonNetworkStream.h +++ b/src/UserInterface/PythonNetworkStream.h @@ -1,8 +1,8 @@ #pragma once -#include "../eterLib/FuncObject.h" -#include "../eterlib/NetStream.h" -#include "../eterLib/NetPacketHeaderMap.h" +#include "EterLib/FuncObject.h" +#include "EterLib/NetStream.h" +#include "EterLib/NetPacketHeaderMap.h" #include "InsultChecker.h" diff --git a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp index 6bad1a7..59f0f17 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp @@ -17,8 +17,8 @@ #include "PythonMessenger.h" #include "PythonApplication.h" -#include "../EterPack/EterPackManager.h" -#include "../gamelib/ItemManager.h" +#include "EterPack/EterPackManager.h" +#include "GameLib/ItemManager.h" #include "AbstractApplication.h" #include "AbstractCharacterManager.h" diff --git a/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp index b12d126..b367ac0 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp @@ -5,11 +5,7 @@ #include "PythonApplication.h" #include "AbstractPlayer.h" -#include "../gamelib/ActorInstance.h" - - - - +#include "GameLib/ActorInstance.h" void CPythonNetworkStream::__GlobalPositionToLocalPosition(int32_t& rGlobalX, int32_t& rGlobalY) { diff --git a/src/UserInterface/PythonNetworkStreamPhaseHandShake.cpp b/src/UserInterface/PythonNetworkStreamPhaseHandShake.cpp index 3f15668..f99ddb0 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseHandShake.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseHandShake.cpp @@ -2,7 +2,7 @@ #include "PythonNetworkStream.h" #include "PythonApplication.h" #include "Packet.h" -#include "../eterpack/EterPackManager.h" +#include "EterPack/EterPackManager.h" // HandShake --------------------------------------------------------------------------- void CPythonNetworkStream::HandShakePhase() diff --git a/src/UserInterface/PythonNetworkStreamPhaseLoading.cpp b/src/UserInterface/PythonNetworkStreamPhaseLoading.cpp index f003ce0..45fe768 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseLoading.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseLoading.cpp @@ -6,7 +6,7 @@ #include "AbstractPlayer.h" -#include "../eterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" void CPythonNetworkStream::EnableChatInsultFilter(bool isEnable) { diff --git a/src/UserInterface/PythonNonPlayer.cpp b/src/UserInterface/PythonNonPlayer.cpp index 63edfdf..1f27825 100644 --- a/src/UserInterface/PythonNonPlayer.cpp +++ b/src/UserInterface/PythonNonPlayer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "../eterPack/EterPackManager.h" +#include "EterPack/EterPackManager.h" #include "pythonnonplayer.h" #include "InstanceBase.h" #include "PythonCharacterManager.h" diff --git a/src/UserInterface/PythonPackModule.cpp b/src/UserInterface/PythonPackModule.cpp index ad58d3d..89a5f41 100644 --- a/src/UserInterface/PythonPackModule.cpp +++ b/src/UserInterface/PythonPackModule.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" -#include "../eterPack/EterPackManager.h" -#include "../eterBase/tea.h" +#include "EterPack/EterPackManager.h" +#include "EterBase/tea.h" // CHINA_CRYPT_KEY DWORD g_adwEncryptKey[4]; diff --git a/src/UserInterface/PythonPlayer.cpp b/src/UserInterface/PythonPlayer.cpp index 3d32b33..157fb76 100644 --- a/src/UserInterface/PythonPlayer.cpp +++ b/src/UserInterface/PythonPlayer.cpp @@ -2,7 +2,7 @@ #include "PythonPlayerEventHandler.h" #include "PythonApplication.h" #include "PythonItem.h" -#include "../eterbase/Timer.h" +#include "EterBase/Timer.h" #include "AbstractPlayer.h" diff --git a/src/UserInterface/PythonPlayerEventHandler.h b/src/UserInterface/PythonPlayerEventHandler.h index b1fa367..ca24462 100644 --- a/src/UserInterface/PythonPlayerEventHandler.h +++ b/src/UserInterface/PythonPlayerEventHandler.h @@ -1,7 +1,7 @@ #pragma once -#include "../gamelib/ActorInstance.h" -#include "../gamelib/FlyHandler.h" +#include "GameLib/ActorInstance.h" +#include "GameLib/FlyHandler.h" #include "PythonNetworkStream.h" #include "InstanceBase.h" diff --git a/src/UserInterface/PythonPlayerInput.cpp b/src/UserInterface/PythonPlayerInput.cpp index 444786f..0b30311 100644 --- a/src/UserInterface/PythonPlayerInput.cpp +++ b/src/UserInterface/PythonPlayerInput.cpp @@ -2,8 +2,8 @@ #include "PythonPlayer.h" #include "PythonPlayerEventHandler.h" #include "PythonApplication.h" -#include "../eterlib/Camera.h" -#include "../eterbase/Timer.h" +#include "EterLib/Camera.h" +#include "EterBase/Timer.h" const int c_iFastestSendingCount = 3; const int c_iSlowestSendingCount = 3; diff --git a/src/UserInterface/PythonPlayerInputMouse.cpp b/src/UserInterface/PythonPlayerInputMouse.cpp index c42ebd2..6eceba5 100644 --- a/src/UserInterface/PythonPlayerInputMouse.cpp +++ b/src/UserInterface/PythonPlayerInputMouse.cpp @@ -2,7 +2,7 @@ #include "PythonPlayer.h" #include "PythonApplication.h" -#include "../eterlib/Camera.h" +#include "EterLib/Camera.h" void CPythonPlayer::NEW_SetMouseMoveState(int eMBS) { diff --git a/src/UserInterface/PythonPlayerSkill.cpp b/src/UserInterface/PythonPlayerSkill.cpp index db9e725..f8342eb 100644 --- a/src/UserInterface/PythonPlayerSkill.cpp +++ b/src/UserInterface/PythonPlayerSkill.cpp @@ -5,7 +5,7 @@ #include "InstanceBase.h" #include "PythonChat.h" #include "PythonGuild.h" -#include "../GameLib/ItemManager.h" +#include "GameLib/ItemManager.h" void CPythonPlayer::ClearAffects() { diff --git a/src/UserInterface/PythonProfilerModule.cpp b/src/UserInterface/PythonProfilerModule.cpp index c28ff16..b9456fb 100644 --- a/src/UserInterface/PythonProfilerModule.cpp +++ b/src/UserInterface/PythonProfilerModule.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "../eterLib/Profiler.h" +#include "EterLib/Profiler.h" PyObject * profilerPush(PyObject * poSelf, PyObject * poArgs) { diff --git a/src/UserInterface/PythonSkill.cpp b/src/UserInterface/PythonSkill.cpp index abee50b..7478c7f 100644 --- a/src/UserInterface/PythonSkill.cpp +++ b/src/UserInterface/PythonSkill.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" #include "PythonSkill.h" -#include "../EterBase/Poly/Poly.h" -#include "../EterPack/EterPackManager.h" +#include "EterBase/Poly/Poly.h" +#include "EterPack/EterPackManager.h" #include "InstanceBase.h" #include "PythonPlayer.h" diff --git a/src/UserInterface/PythonSkill.h b/src/UserInterface/PythonSkill.h index 9e9b742..0a6c879 100644 --- a/src/UserInterface/PythonSkill.h +++ b/src/UserInterface/PythonSkill.h @@ -1,7 +1,6 @@ #pragma once - -#include "../gamelib/ItemData.h" -#include "../EterBase/Poly/Poly.h" +#include "GameLib/ItemData.h" +#include "EterBase/Poly/Poly.h" class CInstanceBase; diff --git a/src/UserInterface/PythonTextTail.h b/src/UserInterface/PythonTextTail.h index ee14a4a..e5850fa 100644 --- a/src/UserInterface/PythonTextTail.h +++ b/src/UserInterface/PythonTextTail.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterBase/Singleton.h" +#include "EterBase/Singleton.h" /* * 따라다니는 텍스트 처리 diff --git a/src/UserInterface/ServerStateChecker.cpp b/src/UserInterface/ServerStateChecker.cpp index c9c63ee..c959837 100644 --- a/src/UserInterface/ServerStateChecker.cpp +++ b/src/UserInterface/ServerStateChecker.cpp @@ -2,7 +2,7 @@ #include "Packet.h" #include "ServerStateChecker.h" -#include "../eterLib/NetAddress.h" +#include "EterLib/NetAddress.h" #pragma pack(push) #pragma pack(1) diff --git a/src/UserInterface/ServerStateChecker.h b/src/UserInterface/ServerStateChecker.h index 0434e9c..1746fec 100644 --- a/src/UserInterface/ServerStateChecker.h +++ b/src/UserInterface/ServerStateChecker.h @@ -1,6 +1,6 @@ #pragma once -#include "../eterLib/NetStream.h" +#include "EterLib/NetStream.h" class CServerStateChecker : public CSingleton { diff --git a/src/UserInterface/StdAfx.h b/src/UserInterface/StdAfx.h index 67bd07c..ca1457b 100644 --- a/src/UserInterface/StdAfx.h +++ b/src/UserInterface/StdAfx.h @@ -9,10 +9,10 @@ #pragma warning(disable:4245) #pragma warning(disable:4995) -#include "eterLib/StdAfx.h" -#include "eterPythonLib/StdAfx.h" -#include "gameLib/StdAfx.h" -#include "scriptLib/StdAfx.h" +#include "EterLib/StdAfx.h" +#include "EterPythonLib/StdAfx.h" +#include "GameLib/StdAfx.h" +#include "ScriptLib/StdAfx.h" #include "AudioLib/StdAfx.h" #include "EffectLib/StdAfx.h" #include "PRTerrainLib/StdAfx.h" @@ -55,7 +55,6 @@ void initItem(); void initNonPlayer(); void initnet(); void initPlayer(); -void initSectionDisplayer(); void initServerStateChecker(); void initTrade(); void initMiniMap();