diff --git a/source/graphics/Camera.cpp b/source/graphics/Camera.cpp index 1dc5f6e3ee..61459a2d20 100644 --- a/source/graphics/Camera.cpp +++ b/source/graphics/Camera.cpp @@ -13,10 +13,10 @@ #include "precompiled.h" #include "Camera.h" -#include "Renderer.h" +#include "renderer/Renderer.h" #include "HFTracer.h" -#include "Game.h" -#include "ogl.h" +#include "ps/Game.h" +#include "lib/ogl.h" #include "ps/World.h" CCamera::CCamera () diff --git a/source/graphics/Camera.h b/source/graphics/Camera.h index 60126eda43..7df6602e70 100644 --- a/source/graphics/Camera.h +++ b/source/graphics/Camera.h @@ -14,7 +14,7 @@ #define CAMERA_H #include "Frustum.h" -#include "Matrix3D.h" +#include "maths/Matrix3D.h" extern int g_mouse_x, g_mouse_y; diff --git a/source/graphics/CinemaTrack.cpp b/source/graphics/CinemaTrack.cpp index da72a018c0..c4a2bbf0f5 100644 --- a/source/graphics/CinemaTrack.cpp +++ b/source/graphics/CinemaTrack.cpp @@ -2,15 +2,15 @@ #include "precompiled.h" #include #include -#include "ogl.h" +#include "lib/ogl.h" #include "CinemaTrack.h" -#include "Game.h" +#include "ps/Game.h" #include "GameView.h" -#include "MathUtil.h" +#include "maths/MathUtil.h" #include "Camera.h" -#include "CStr.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "ps/CStr.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "lib/res/file/vfs.h" #include "lib/res/mem.h" diff --git a/source/graphics/CinemaTrack.h b/source/graphics/CinemaTrack.h index fe0b8ee272..ae4ff8c8ae 100644 --- a/source/graphics/CinemaTrack.h +++ b/source/graphics/CinemaTrack.h @@ -16,8 +16,8 @@ #include #include -#include "CStr.h" -#include "NUSpline.h" +#include "ps/CStr.h" +#include "maths/NUSpline.h" /* diff --git a/source/graphics/Color.cpp b/source/graphics/Color.cpp index 05fd62e66a..47fbf82e86 100644 --- a/source/graphics/Color.cpp +++ b/source/graphics/Color.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "MathUtil.h" +#include "maths/MathUtil.h" #include "graphics/Color.h" diff --git a/source/graphics/Color.h b/source/graphics/Color.h index c5f0416c98..6ad9f69c4f 100644 --- a/source/graphics/Color.h +++ b/source/graphics/Color.h @@ -9,8 +9,8 @@ #ifndef _COLOR_H #define _COLOR_H -#include "Vector3D.h" -#include "Vector4D.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "lib/types.h" // simple defines for 3 and 4 component floating point colors - just map to diff --git a/source/graphics/Frustum.cpp b/source/graphics/Frustum.cpp index e4b662ecca..c4f83ed35f 100644 --- a/source/graphics/Frustum.cpp +++ b/source/graphics/Frustum.cpp @@ -16,7 +16,7 @@ #include "precompiled.h" #include "Frustum.h" -#include "Bound.h" +#include "maths/Bound.h" CFrustum::CFrustum () { diff --git a/source/graphics/Frustum.h b/source/graphics/Frustum.h index 919a5d0b80..2ad1a35b84 100644 --- a/source/graphics/Frustum.h +++ b/source/graphics/Frustum.h @@ -16,7 +16,7 @@ #ifndef FRUSTUM_H #define FRUSTUM_H -#include "Plane.h" +#include "maths/Plane.h" //10 planes should be enough #define MAX_NUM_FRUSTUM_PLANES (10) diff --git a/source/graphics/GameView.cpp b/source/graphics/GameView.cpp index b7a7af8a6b..a424565f47 100644 --- a/source/graphics/GameView.cpp +++ b/source/graphics/GameView.cpp @@ -3,41 +3,41 @@ #include "precompiled.h" #include "Terrain.h" -#include "Renderer.h" +#include "renderer/Renderer.h" #include "GameView.h" -#include "Game.h" +#include "ps/Game.h" #include "Camera.h" -#include "Interact.h" +#include "ps/Interact.h" -#include "Matrix3D.h" -#include "MathUtil.h" -#include "Renderer.h" +#include "maths/Matrix3D.h" +#include "maths/MathUtil.h" +#include "renderer/Renderer.h" #include "Terrain.h" #include "LightEnv.h" #include "HFTracer.h" #include "TextureManager.h" #include "ObjectManager.h" -#include "LOSManager.h" -#include "EntityOrders.h" -#include "Bound.h" -#include "Pyrogenesis.h" -#include "Hotkey.h" -#include "ConfigDB.h" -#include "Loader.h" -#include "Profile.h" +#include "simulation/LOSManager.h" +#include "simulation/EntityOrders.h" +#include "maths/Bound.h" +#include "ps/Pyrogenesis.h" +#include "ps/Hotkey.h" +#include "ps/ConfigDB.h" +#include "ps/Loader.h" +#include "ps/Profile.h" #include "ps/LoaderThunks.h" #include "ps/Globals.h" #include "renderer/WaterManager.h" #include "renderer/SkyManager.h" -#include "Quaternion.h" +#include "maths/Quaternion.h" #include "Unit.h" #include "Model.h" -#include "Projectile.h" +#include "simulation/Projectile.h" -#include "input.h" -#include "lib.h" -#include "timer.h" +#include "lib/input.h" +#include "lib/lib.h" +#include "lib/timer.h" float g_MaxZoomHeight=350.0f; //note: Max terrain height is this minus YMinOffset float g_YMinOffset=15.0f; diff --git a/source/graphics/GameView.h b/source/graphics/GameView.h index 33d97015dd..a92d55d367 100644 --- a/source/graphics/GameView.h +++ b/source/graphics/GameView.h @@ -8,7 +8,7 @@ extern float g_YMinOffset; #include "Camera.h" #include "CinemaTrack.h" #include "ModelDef.h" -#include "Vector3D.h" +#include "maths/Vector3D.h" #include "LightEnv.h" #include "scripting/ScriptableObject.h" diff --git a/source/graphics/HFTracer.cpp b/source/graphics/HFTracer.cpp index 00f332f36a..c73720fef2 100644 --- a/source/graphics/HFTracer.cpp +++ b/source/graphics/HFTracer.cpp @@ -10,8 +10,8 @@ #include "HFTracer.h" #include "Terrain.h" -#include "Bound.h" -#include "Vector3D.h" +#include "maths/Bound.h" +#include "maths/Vector3D.h" /////////////////////////////////////////////////////////////////////////////// // CHFTracer constructor diff --git a/source/graphics/LightEnv.h b/source/graphics/LightEnv.h index 41104c2e96..48d9b74de6 100644 --- a/source/graphics/LightEnv.h +++ b/source/graphics/LightEnv.h @@ -13,7 +13,7 @@ #define __LIGHTENV_H #include "Color.h" -#include "Vector3D.h" +#include "maths/Vector3D.h" class CMapWriter; class CMapReader; diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp index edaa5bd0a9..937d07d9a0 100644 --- a/source/graphics/MapReader.cpp +++ b/source/graphics/MapReader.cpp @@ -4,13 +4,13 @@ #include "lib/types.h" #include "UnitManager.h" #include "Unit.h" -#include "Game.h" +#include "ps/Game.h" #include "ObjectManager.h" -#include "BaseEntity.h" -#include "BaseEntityCollection.h" -#include "EntityManager.h" -#include "CLogger.h" -#include "MathUtil.h" +#include "simulation/BaseEntity.h" +#include "simulation/BaseEntityCollection.h" +#include "simulation/EntityManager.h" +#include "ps/CLogger.h" +#include "maths/MathUtil.h" #include "Camera.h" #include "Model.h" @@ -18,9 +18,9 @@ #include "TextureManager.h" #include "TextureEntry.h" -#include "timer.h" -#include "Loader.h" -#include "LoaderThunks.h" +#include "lib/timer.h" +#include "ps/Loader.h" +#include "ps/LoaderThunks.h" #define LOG_CATEGORY "graphics" diff --git a/source/graphics/MapReader.h b/source/graphics/MapReader.h index ef4e4d52f4..0bf361c884 100644 --- a/source/graphics/MapReader.h +++ b/source/graphics/MapReader.h @@ -3,9 +3,9 @@ #include "MapIO.h" #include "lib/res/handle.h" -#include "CStr.h" +#include "ps/CStr.h" #include "LightEnv.h" -#include "FileUnpacker.h" +#include "ps/FileUnpacker.h" class CObjectEntry; class CTerrain; diff --git a/source/graphics/MapWriter.cpp b/source/graphics/MapWriter.cpp index dd0e7322bf..450f39ef9f 100644 --- a/source/graphics/MapWriter.cpp +++ b/source/graphics/MapWriter.cpp @@ -14,9 +14,9 @@ #include "LightEnv.h" #include "TextureManager.h" #include "TextureEntry.h" -#include "VFSUtil.h" -#include "Loader.h" -#include "MathUtil.h" +#include "ps/VFSUtil.h" +#include "ps/Loader.h" +#include "maths/MathUtil.h" #include "graphics/Camera.h" #include "ps/XML/XMLWriter.h" diff --git a/source/graphics/MapWriter.h b/source/graphics/MapWriter.h index de032bb883..5d4b0e6fb9 100644 --- a/source/graphics/MapWriter.h +++ b/source/graphics/MapWriter.h @@ -3,8 +3,8 @@ #include #include "MapIO.h" -#include "CStr.h" -#include "FilePacker.h" +#include "ps/CStr.h" +#include "ps/FilePacker.h" class CLightEnv; class CTerrain; diff --git a/source/graphics/Material.cpp b/source/graphics/Material.cpp index 901c79375a..e95273e485 100644 --- a/source/graphics/Material.cpp +++ b/source/graphics/Material.cpp @@ -1,11 +1,11 @@ #include "precompiled.h" -#include "ogl.h" +#include "lib/ogl.h" #include "lib/res/res.h" #include "Material.h" -#include "Player.h" -#include "Game.h" -#include "Overlay.h" // for CColor +#include "ps/Player.h" +#include "ps/Game.h" +#include "ps/Overlay.h" // for CColor CMaterial NullMaterial; CMaterial IdentityMaterial; diff --git a/source/graphics/Material.h b/source/graphics/Material.h index f618924c02..f24875e986 100644 --- a/source/graphics/Material.h +++ b/source/graphics/Material.h @@ -1,7 +1,7 @@ #ifndef __H_MATERIAL_H__ #define __H_MATERIAL_H__ -#include "CStr.h" +#include "ps/CStr.h" struct CColor; diff --git a/source/graphics/MaterialManager.cpp b/source/graphics/MaterialManager.cpp index 625a5129dc..50e6876a4c 100644 --- a/source/graphics/MaterialManager.cpp +++ b/source/graphics/MaterialManager.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "ogl.h" -#include "XML/Xeromyces.h" +#include "lib/ogl.h" +#include "ps/XML/Xeromyces.h" #include "MaterialManager.h" static float ClampFloat(float value, float min, float max) diff --git a/source/graphics/MaterialManager.h b/source/graphics/MaterialManager.h index b04d33157c..9f34761d39 100644 --- a/source/graphics/MaterialManager.h +++ b/source/graphics/MaterialManager.h @@ -2,7 +2,7 @@ #define __H_MATERIALREADER_H__ #include -#include "Singleton.h" +#include "ps/Singleton.h" #include "Material.h" #define g_MaterialManager CMaterialManager::GetSingleton() diff --git a/source/graphics/MeshManager.cpp b/source/graphics/MeshManager.cpp index 1137483306..709f537de2 100644 --- a/source/graphics/MeshManager.cpp +++ b/source/graphics/MeshManager.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "graphics/MeshManager.h" -#include "CLogger.h" -#include "FileUnpacker.h" // to get access to its CError +#include "ps/CLogger.h" +#include "ps/FileUnpacker.h" // to get access to its CError #include "ModelDef.h" CMeshManager::CMeshManager() diff --git a/source/graphics/MeshManager.h b/source/graphics/MeshManager.h index 2026c40331..12c7ec05c1 100644 --- a/source/graphics/MeshManager.h +++ b/source/graphics/MeshManager.h @@ -1,8 +1,8 @@ #ifndef __H_MESHMANAGER_H__ #define __H_MESHMANAGER_H__ -#include "Singleton.h" -#include "CStr.h" +#include "ps/Singleton.h" +#include "ps/CStr.h" #include #include diff --git a/source/graphics/MiniPatch.cpp b/source/graphics/MiniPatch.cpp index a01d6e4f96..6ac868e4d7 100644 --- a/source/graphics/MiniPatch.cpp +++ b/source/graphics/MiniPatch.cpp @@ -8,7 +8,7 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #include "Patch.h" #include "MiniPatch.h" diff --git a/source/graphics/Model.cpp b/source/graphics/Model.cpp index 60e401c2ea..77eb7d2daf 100644 --- a/source/graphics/Model.cpp +++ b/source/graphics/Model.cpp @@ -10,15 +10,15 @@ #include "Model.h" #include "ModelDef.h" -#include "Quaternion.h" -#include "Bound.h" +#include "maths/Quaternion.h" +#include "maths/Bound.h" #include "SkeletonAnim.h" #include "SkeletonAnimDef.h" #include "SkeletonAnimManager.h" #include "MeshManager.h" #include "lib/res/graphics/ogl_tex.h" #include "lib/res/h_mgr.h" -#include "Profile.h" +#include "ps/Profile.h" #include "ps/CLogger.h" #define LOG_CATEGORY "graphics" diff --git a/source/graphics/Model.h b/source/graphics/Model.h index d9673a9083..a0737ee088 100644 --- a/source/graphics/Model.h +++ b/source/graphics/Model.h @@ -15,7 +15,7 @@ #include "MeshManager.h" #include "RenderableObject.h" #include "Material.h" -#include "Overlay.h" +#include "ps/Overlay.h" struct SPropPoint; class CObjectEntry; class CSkeletonAnim; diff --git a/source/graphics/ModelDef.cpp b/source/graphics/ModelDef.cpp index 35c3b6ca46..3939c299f6 100644 --- a/source/graphics/ModelDef.cpp +++ b/source/graphics/ModelDef.cpp @@ -9,8 +9,8 @@ #include "precompiled.h" #include "ModelDef.h" -#include "FilePacker.h" -#include "FileUnpacker.h" +#include "ps/FilePacker.h" +#include "ps/FileUnpacker.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/source/graphics/ModelDef.h b/source/graphics/ModelDef.h index 4182bb2f5e..17fcb291f7 100644 --- a/source/graphics/ModelDef.h +++ b/source/graphics/ModelDef.h @@ -9,8 +9,8 @@ #ifndef _MODELDEF_H #define _MODELDEF_H -#include "CStr.h" -#include "Vector3D.h" +#include "ps/CStr.h" +#include "maths/Vector3D.h" #include "MeshManager.h" #include "SkeletonAnimDef.h" #include diff --git a/source/graphics/ObjectBase.cpp b/source/graphics/ObjectBase.cpp index 782487fc95..365a4829e0 100644 --- a/source/graphics/ObjectBase.cpp +++ b/source/graphics/ObjectBase.cpp @@ -5,8 +5,8 @@ #include "ObjectBase.h" #include "ObjectManager.h" -#include "XML/Xeromyces.h" -#include "CLogger.h" +#include "ps/XML/Xeromyces.h" +#include "ps/CLogger.h" #include "lib/timer.h" #define LOG_CATEGORY "graphics" diff --git a/source/graphics/ObjectBase.h b/source/graphics/ObjectBase.h index 36d4e34ced..7f5cd78a7f 100644 --- a/source/graphics/ObjectBase.h +++ b/source/graphics/ObjectBase.h @@ -7,7 +7,7 @@ class CSkeletonAnim; #include #include #include -#include "CStr.h" +#include "ps/CStr.h" class CObjectBase { diff --git a/source/graphics/ObjectEntry.cpp b/source/graphics/ObjectEntry.cpp index 2f6f245832..a9e7c9b80d 100644 --- a/source/graphics/ObjectEntry.cpp +++ b/source/graphics/ObjectEntry.cpp @@ -5,7 +5,7 @@ #include "ObjectBase.h" #include "Model.h" #include "ModelDef.h" -#include "CLogger.h" +#include "ps/CLogger.h" #include "MaterialManager.h" #include "MeshManager.h" #include "SkeletonAnim.h" diff --git a/source/graphics/ObjectEntry.h b/source/graphics/ObjectEntry.h index 10b0e33100..5f8b9a0427 100644 --- a/source/graphics/ObjectEntry.h +++ b/source/graphics/ObjectEntry.h @@ -9,8 +9,8 @@ struct SPropPoint; #include #include #include -#include "CStr.h" -#include "Overlay.h" +#include "ps/CStr.h" +#include "ps/Overlay.h" class CObjectEntry { diff --git a/source/graphics/ObjectManager.cpp b/source/graphics/ObjectManager.cpp index c3388958aa..9008192dbe 100644 --- a/source/graphics/ObjectManager.cpp +++ b/source/graphics/ObjectManager.cpp @@ -2,19 +2,19 @@ #include "ObjectManager.h" #include -#include "CLogger.h" +#include "ps/CLogger.h" #include "lib/res/res.h" -#include "timer.h" -#include "VFSUtil.h" +#include "lib/timer.h" +#include "ps/VFSUtil.h" #include "ObjectBase.h" #include "ObjectEntry.h" -#include "Entity.h" -#include "EntityManager.h" -#include "BaseEntity.h" -#include "Game.h" +#include "simulation/Entity.h" +#include "simulation/EntityManager.h" +#include "simulation/BaseEntity.h" +#include "ps/Game.h" #include "Model.h" #include "Unit.h" -#include "Matrix3D.h" +#include "maths/Matrix3D.h" #include "ps/Profile.h" #define LOG_CATEGORY "graphics" diff --git a/source/graphics/ObjectManager.h b/source/graphics/ObjectManager.h index 02a3aeb5c3..571102313b 100644 --- a/source/graphics/ObjectManager.h +++ b/source/graphics/ObjectManager.h @@ -3,8 +3,8 @@ #include #include -#include "Singleton.h" -#include "CStr.h" +#include "ps/Singleton.h" +#include "ps/CStr.h" #include "ObjectBase.h" class CObjectEntry; diff --git a/source/graphics/ParticleEngine.h b/source/graphics/ParticleEngine.h index 40eeb57c8a..c0d7ea6c5b 100644 --- a/source/graphics/ParticleEngine.h +++ b/source/graphics/ParticleEngine.h @@ -18,8 +18,8 @@ #include "ps/CLogger.h" #include "ps/Loader.h" -#include "ogl.h" -#include "Renderer.h" +#include "lib/ogl.h" +#include "renderer/Renderer.h" // Different textures enum PText { DEFAULTTEXT, MAX_TEXTURES }; diff --git a/source/graphics/RenderableObject.h b/source/graphics/RenderableObject.h index f387cae93a..34cf46c498 100644 --- a/source/graphics/RenderableObject.h +++ b/source/graphics/RenderableObject.h @@ -10,8 +10,8 @@ #define _RENDERABLEOBJECT_H -#include "Bound.h" -#include "Matrix3D.h" +#include "maths/Bound.h" +#include "maths/Matrix3D.h" // dirty flags - used as notification to the renderer that some bit of data diff --git a/source/graphics/SkeletonAnim.h b/source/graphics/SkeletonAnim.h index cbaa14ac52..f323133779 100644 --- a/source/graphics/SkeletonAnim.h +++ b/source/graphics/SkeletonAnim.h @@ -9,7 +9,7 @@ #ifndef _SKELETONANIM_H #define _SKELETONANIM_H -#include "Bound.h" +#include "maths/Bound.h" class CSkeletonAnimDef; diff --git a/source/graphics/SkeletonAnimDef.cpp b/source/graphics/SkeletonAnimDef.cpp index 5ee8a73700..0f29389d8c 100644 --- a/source/graphics/SkeletonAnimDef.cpp +++ b/source/graphics/SkeletonAnimDef.cpp @@ -9,8 +9,8 @@ #include "precompiled.h" #include "SkeletonAnimDef.h" -#include "FilePacker.h" -#include "FileUnpacker.h" +#include "ps/FilePacker.h" +#include "ps/FileUnpacker.h" /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/graphics/SkeletonAnimDef.h b/source/graphics/SkeletonAnimDef.h index 4a34fce0bf..0519a8554f 100644 --- a/source/graphics/SkeletonAnimDef.h +++ b/source/graphics/SkeletonAnimDef.h @@ -9,9 +9,9 @@ #ifndef _SKELETONANIMDEF_H #define _SKELETONANIMDEF_H -#include "CStr.h" -#include "Vector3D.h" -#include "Quaternion.h" +#include "ps/CStr.h" +#include "maths/Vector3D.h" +#include "maths/Quaternion.h" //////////////////////////////////////////////////////////////////////////////////////// // CBoneState: structure describing state of a bone at some point diff --git a/source/graphics/SkeletonAnimManager.cpp b/source/graphics/SkeletonAnimManager.cpp index 3994706714..45981c50f4 100644 --- a/source/graphics/SkeletonAnimManager.cpp +++ b/source/graphics/SkeletonAnimManager.cpp @@ -10,9 +10,9 @@ #include "lib/res/res.h" #include "Model.h" -#include "CLogger.h" +#include "ps/CLogger.h" #include "SkeletonAnimManager.h" -#include "FileUnpacker.h" +#include "ps/FileUnpacker.h" #include #define LOG_CATEGORY "graphics" diff --git a/source/graphics/SkeletonAnimManager.h b/source/graphics/SkeletonAnimManager.h index b61f62e9ca..fe6b5e01b9 100644 --- a/source/graphics/SkeletonAnimManager.h +++ b/source/graphics/SkeletonAnimManager.h @@ -12,7 +12,7 @@ #include #include #include "SkeletonAnimDef.h" -#include "Singleton.h" +#include "ps/Singleton.h" // access to sole CSkeletonAnimManager object diff --git a/source/graphics/Sprite.cpp b/source/graphics/Sprite.cpp index b8031167cc..cac085a59b 100644 --- a/source/graphics/Sprite.cpp +++ b/source/graphics/Sprite.cpp @@ -27,8 +27,8 @@ #include "precompiled.h" #include "Sprite.h" -#include "Renderer.h" -#include "ogl.h" +#include "renderer/Renderer.h" +#include "lib/ogl.h" #include "lib/res/graphics/ogl_tex.h" CSprite::CSprite() : diff --git a/source/graphics/Sprite.h b/source/graphics/Sprite.h index cc072773f5..26cbc9d214 100644 --- a/source/graphics/Sprite.h +++ b/source/graphics/Sprite.h @@ -31,7 +31,7 @@ // Includes / Compiler directives //-------------------------------------------------------- -#include "Vector3D.h" +#include "maths/Vector3D.h" #include "Texture.h" //-------------------------------------------------------- diff --git a/source/graphics/Terrain.cpp b/source/graphics/Terrain.cpp index 3546916a5b..866fcf23f2 100644 --- a/source/graphics/Terrain.cpp +++ b/source/graphics/Terrain.cpp @@ -14,11 +14,11 @@ #include "renderer/Renderer.h" #include "renderer/WaterManager.h" -#include "EntityManager.h" +#include "simulation/EntityManager.h" #include #include "Terrain.h" -#include "MathUtil.h" +#include "maths/MathUtil.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/source/graphics/Terrain.h b/source/graphics/Terrain.h index 2cc907f6f6..6e1f72a31e 100644 --- a/source/graphics/Terrain.h +++ b/source/graphics/Terrain.h @@ -11,9 +11,9 @@ #define _TERRAIN_H #include "Patch.h" -#include "Vector3D.h" -#include "Vector2D.h" -#include "Entity.h" +#include "maths/Vector3D.h" +#include "ps/Vector2D.h" +#include "simulation/Entity.h" /////////////////////////////////////////////////////////////////////////////// // CTerrain: main terrain class; contains the heightmap describing elevation diff --git a/source/graphics/TerrainProperties.cpp b/source/graphics/TerrainProperties.cpp index 915ea281ba..90d2b0acba 100644 --- a/source/graphics/TerrainProperties.cpp +++ b/source/graphics/TerrainProperties.cpp @@ -4,13 +4,13 @@ #include "TerrainProperties.h" #include "TextureManager.h" -#include "Overlay.h" +#include "ps/Overlay.h" -#include "Parser.h" +#include "ps/Parser.h" #include "ps/XML/XeroXMB.h" -#include "XML/Xeromyces.h" +#include "ps/XML/Xeromyces.h" -#include "CLogger.h" +#include "ps/CLogger.h" #define LOG_CATEGORY "graphics" using namespace std; diff --git a/source/graphics/TerrainProperties.h b/source/graphics/TerrainProperties.h index a576ccd0cc..4abee6f84d 100644 --- a/source/graphics/TerrainProperties.h +++ b/source/graphics/TerrainProperties.h @@ -10,7 +10,7 @@ #ifndef graphics_TerrainProperties_H #define graphics_TerrainProperties_H -#include "CStr.h" +#include "ps/CStr.h" #include class CTerrainGroup; diff --git a/source/graphics/Texture.h b/source/graphics/Texture.h index baea42b08b..3bb857733d 100644 --- a/source/graphics/Texture.h +++ b/source/graphics/Texture.h @@ -13,7 +13,7 @@ #define _TEXTURE_H #include "lib/res/handle.h" -#include "CStr.h" +#include "ps/CStr.h" class CTexture { diff --git a/source/graphics/TextureEntry.cpp b/source/graphics/TextureEntry.cpp index 15d04edca3..3e4b2c3343 100644 --- a/source/graphics/TextureEntry.cpp +++ b/source/graphics/TextureEntry.cpp @@ -2,16 +2,16 @@ #include -#include "ogl.h" +#include "lib/ogl.h" #include "lib/res/graphics/ogl_tex.h" -#include "CLogger.h" +#include "ps/CLogger.h" #include "TextureEntry.h" #include "TextureManager.h" #include "TerrainProperties.h" #include "Texture.h" -#include "Renderer.h" +#include "renderer/Renderer.h" #define LOG_CATEGORY "graphics" diff --git a/source/graphics/TextureEntry.h b/source/graphics/TextureEntry.h index b47762e01c..ada7aaad3f 100644 --- a/source/graphics/TextureEntry.h +++ b/source/graphics/TextureEntry.h @@ -4,7 +4,7 @@ #include #include "lib/res/handle.h" -#include "CStr.h" +#include "ps/CStr.h" #include "TextureManager.h" diff --git a/source/graphics/TextureManager.h b/source/graphics/TextureManager.h index 6ba4dfd602..c90328765d 100644 --- a/source/graphics/TextureManager.h +++ b/source/graphics/TextureManager.h @@ -7,8 +7,8 @@ #include "lib/res/handle.h" -#include "CStr.h" -#include "Singleton.h" +#include "ps/CStr.h" +#include "ps/Singleton.h" // access to sole CTextureManager object #define g_TexMan CTextureManager ::GetSingleton() diff --git a/source/graphics/UnitManager.cpp b/source/graphics/UnitManager.cpp index d56f3b5a04..5e28c2b7c1 100644 --- a/source/graphics/UnitManager.cpp +++ b/source/graphics/UnitManager.cpp @@ -14,10 +14,10 @@ #include "Model.h" #include "UnitManager.h" #include "Unit.h" -#include "CConsole.h" +#include "ps/CConsole.h" #include "ObjectManager.h" #include "ObjectEntry.h" -#include "LOSManager.h" +#include "simulation/LOSManager.h" extern CConsole* g_Console; diff --git a/source/graphics/UnitManager.h b/source/graphics/UnitManager.h index 5111a23540..aff2bdc5ec 100644 --- a/source/graphics/UnitManager.h +++ b/source/graphics/UnitManager.h @@ -11,7 +11,7 @@ #include #include -#include "Singleton.h" +#include "ps/Singleton.h" class CUnit; class CModel; diff --git a/source/graphics/scripting/JSInterface_Camera.cpp b/source/graphics/scripting/JSInterface_Camera.cpp index 7961937938..5454ac7740 100644 --- a/source/graphics/scripting/JSInterface_Camera.cpp +++ b/source/graphics/scripting/JSInterface_Camera.cpp @@ -1,13 +1,13 @@ #include "precompiled.h" #include "JSInterface_Camera.h" -#include "scripting/JSInterface_Vector3D.h" -#include "Camera.h" -#include "Vector3D.h" -#include "Matrix3D.h" -#include "MathUtil.h" -#include "Terrain.h" -#include "Game.h" +#include "maths/scripting/JSInterface_Vector3D.h" +#include "graphics/Camera.h" +#include "maths/Vector3D.h" +#include "maths/Matrix3D.h" +#include "maths/MathUtil.h" +#include "graphics/Terrain.h" +#include "ps/Game.h" #include "graphics/GameView.h" diff --git a/source/graphics/scripting/JSInterface_Camera.h b/source/graphics/scripting/JSInterface_Camera.h index bef100c1e8..a1b29a1107 100644 --- a/source/graphics/scripting/JSInterface_Camera.h +++ b/source/graphics/scripting/JSInterface_Camera.h @@ -8,9 +8,9 @@ #include "scripting/ScriptingHost.h" -#include "Vector3D.h" -#include "Camera.h" -#include "HFTracer.h" +#include "maths/Vector3D.h" +#include "graphics/Camera.h" +#include "graphics/HFTracer.h" #ifndef JSI_CAMERA_INCLUDED #define JSI_CAMERA_INCLUDED diff --git a/source/gui/CButton.cpp b/source/gui/CButton.cpp index bbb101f854..7d64c3e132 100644 --- a/source/gui/CButton.cpp +++ b/source/gui/CButton.cpp @@ -8,7 +8,7 @@ gee@pyro.nu #include "GUI.h" #include "CButton.h" -#include "ogl.h" +#include "lib/ogl.h" using namespace std; diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp index 2ae84b1459..dc3e544911 100644 --- a/source/gui/CDropDown.cpp +++ b/source/gui/CDropDown.cpp @@ -8,7 +8,7 @@ gee@pyro.nu #include "GUI.h" #include "CDropDown.h" -#include "ogl.h" +#include "lib/ogl.h" using namespace std; diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp index 263a2715dd..89cce5d94d 100644 --- a/source/gui/CGUI.cpp +++ b/source/gui/CGUI.cpp @@ -30,13 +30,13 @@ gee@pyro.nu #include "ps/XML/Xeromyces.h" #include "ps/Font.h" -#include "Pyrogenesis.h" -#include "input.h" +#include "ps/Pyrogenesis.h" +#include "lib/input.h" // TODO Gee: Whatever include CRect/CPos/CSize -#include "Overlay.h" +#include "ps/Overlay.h" #include "scripting/ScriptingHost.h" -#include "Hotkey.h" +#include "ps/Hotkey.h" #include "ps/Globals.h" #include "lib/timer.h" diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h index d3d998bb2b..2103d4b7c2 100644 --- a/source/gui/CGUI.h +++ b/source/gui/CGUI.h @@ -32,10 +32,10 @@ ERROR_TYPE(GUI, JSOpenFailed); #include "ps/Overlay.h" // CPos and CRect -#include "Singleton.h" +#include "ps/Singleton.h" #include "lib/input.h" -#include "XML/Xeromyces.h" +#include "ps/XML/Xeromyces.h" extern InReaction gui_handler(const SDL_Event* ev); diff --git a/source/gui/CGUISprite.h b/source/gui/CGUISprite.h index e106ba13af..b88574d528 100644 --- a/source/gui/CGUISprite.h +++ b/source/gui/CGUISprite.h @@ -27,7 +27,7 @@ gee@pyro.nu //-------------------------------------------------------- #include "GUIbase.h" -#include "Overlay.h" +#include "ps/Overlay.h" #include "lib/res/graphics/ogl_tex.h" //-------------------------------------------------------- diff --git a/source/gui/CImage.cpp b/source/gui/CImage.cpp index 4e9af4a9a8..0911d84092 100644 --- a/source/gui/CImage.cpp +++ b/source/gui/CImage.cpp @@ -8,7 +8,7 @@ gee@pyro.nu #include "GUI.h" #include "CImage.h" -#include "ogl.h" +#include "lib/ogl.h" using namespace std; diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp index 31038f1cda..ffbd487b45 100644 --- a/source/gui/CInput.cpp +++ b/source/gui/CInput.cpp @@ -9,7 +9,7 @@ gee@pyro.nu #include "CInput.h" #include "ps/Font.h" -#include "ogl.h" +#include "lib/ogl.h" #include "lib/res/graphics/unifont.h" diff --git a/source/gui/CProgressBar.cpp b/source/gui/CProgressBar.cpp index 9e6febffda..402f03d1b1 100644 --- a/source/gui/CProgressBar.cpp +++ b/source/gui/CProgressBar.cpp @@ -8,7 +8,7 @@ gee@pyro.nu #include "GUI.h" #include "CProgressBar.h" -#include "ogl.h" +#include "lib/ogl.h" using namespace std; diff --git a/source/gui/CText.cpp b/source/gui/CText.cpp index 1efccd6503..05c6f30f78 100644 --- a/source/gui/CText.cpp +++ b/source/gui/CText.cpp @@ -8,7 +8,7 @@ gee@pyro.nu #include "GUI.h" #include "CText.h" -#include "ogl.h" +#include "lib/ogl.h" using namespace std; diff --git a/source/gui/GUI.h b/source/gui/GUI.h index 0ee79f69aa..fa8593db53 100644 --- a/source/gui/GUI.h +++ b/source/gui/GUI.h @@ -25,10 +25,10 @@ gee@pyro.nu #include #include -#include "Pyrogenesis.h" -#include "CStr.h" +#include "ps/Pyrogenesis.h" +#include "ps/CStr.h" #include "lib/types.h" -#include "ogl.h" +#include "lib/ogl.h" #include "GUIbase.h" #include "GUIutil.h" diff --git a/source/gui/GUITooltip.h b/source/gui/GUITooltip.h index 0c3777ade7..3f73c7f0a8 100644 --- a/source/gui/GUITooltip.h +++ b/source/gui/GUITooltip.h @@ -5,7 +5,7 @@ class IGUIObject; class CGUI; class CStr; -#include "Overlay.h" +#include "ps/Overlay.h" class GUITooltip { diff --git a/source/gui/GUIbase.h b/source/gui/GUIbase.h index 22728d577b..818287bd03 100644 --- a/source/gui/GUIbase.h +++ b/source/gui/GUIbase.h @@ -26,7 +26,7 @@ gee@pyro.nu // I would like to just forward declare CSize, but it doesn't // seem to be defined anywhere in the predefined header. -#include "Overlay.h" +#include "ps/Overlay.h" //-------------------------------------------------------- // Forward declarations diff --git a/source/gui/GUItext.cpp b/source/gui/GUItext.cpp index 480487d007..db9b0e36b2 100644 --- a/source/gui/GUItext.cpp +++ b/source/gui/GUItext.cpp @@ -7,8 +7,8 @@ gee@pyro.nu #include "precompiled.h" #include "GUI.h" -#include "CLogger.h" -#include "Parser.h" +#include "ps/CLogger.h" +#include "ps/Parser.h" #include #define LOG_CATEGORY "gui" diff --git a/source/gui/GUIutil.cpp b/source/gui/GUIutil.cpp index ea0e38bbd4..e17488a55e 100644 --- a/source/gui/GUIutil.cpp +++ b/source/gui/GUIutil.cpp @@ -6,8 +6,8 @@ gee@pyro.nu #include "precompiled.h" #include "GUI.h" -#include "Parser.h" -#include "i18n.h" +#include "ps/Parser.h" +#include "ps/i18n.h" extern int g_yres; diff --git a/source/gui/GUIutil.h b/source/gui/GUIutil.h index cd0c21b057..5bfd801644 100644 --- a/source/gui/GUIutil.h +++ b/source/gui/GUIutil.h @@ -22,9 +22,9 @@ gee@pyro.nu // Includes / Compiler directives //-------------------------------------------------------- #include "GUIbase.h" -#include "Parser.h" +#include "ps/Parser.h" // TODO Gee: New -#include "Overlay.h" +#include "ps/Overlay.h" #include "CGUI.h" #include "CGUISprite.h" #include "IGUIObject.h" diff --git a/source/gui/IGUIObject.cpp b/source/gui/IGUIObject.cpp index f3dbe5b666..cc89dc64c3 100644 --- a/source/gui/IGUIObject.cpp +++ b/source/gui/IGUIObject.cpp @@ -8,7 +8,7 @@ gee@pyro.nu #include "GUI.h" ///// janwas: again, including etiquette? -#include "Parser.h" +#include "ps/Parser.h" ///// diff --git a/source/gui/MiniMap.cpp b/source/gui/MiniMap.cpp index fd0369d9a0..f0097d1b57 100644 --- a/source/gui/MiniMap.cpp +++ b/source/gui/MiniMap.cpp @@ -4,22 +4,22 @@ #include "ps/Game.h" #include -#include "ogl.h" +#include "lib/ogl.h" #include "renderer/Renderer.h" #include "graphics/TextureEntry.h" #include "graphics/TextureManager.h" #include "graphics/Unit.h" -#include "UnitManager.h" -#include "Entity.h" -#include "Bound.h" -#include "Model.h" +#include "graphics/UnitManager.h" +#include "simulation/Entity.h" +#include "maths/Bound.h" +#include "graphics/Model.h" #include "scripting/GameEvents.h" -#include "Terrain.h" -#include "Profile.h" -#include "LOSManager.h" +#include "graphics/Terrain.h" +#include "ps/Profile.h" +#include "simulation/LOSManager.h" #include "graphics/GameView.h" #include "renderer/WaterManager.h" -#include "Interact.h" +#include "ps/Interact.h" #include "ps/Network/NetMessage.h" diff --git a/source/gui/scripting/JSInterface_GUITypes.cpp b/source/gui/scripting/JSInterface_GUITypes.cpp index ba96bf530b..75a387a4e9 100644 --- a/source/gui/scripting/JSInterface_GUITypes.cpp +++ b/source/gui/scripting/JSInterface_GUITypes.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "JSInterface_GUITypes.h" -#include "CStr.h" +#include "ps/CStr.h" /**** GUISize ****/ diff --git a/source/i18n/CLocale.cpp b/source/i18n/CLocale.cpp index 49401a477b..1dd998e316 100644 --- a/source/i18n/CLocale.cpp +++ b/source/i18n/CLocale.cpp @@ -2,7 +2,7 @@ #include "CLocale.h" #include "TSComponent.h" -#include "StringConvert.h" +#include "ps/StringConvert.h" #include diff --git a/source/i18n/ScriptInterface.cpp b/source/i18n/ScriptInterface.cpp index b41ddaa1a5..e3783dc030 100644 --- a/source/i18n/ScriptInterface.cpp +++ b/source/i18n/ScriptInterface.cpp @@ -2,7 +2,7 @@ #include "ScriptInterface.h" #include "CLocale.h" -#include "StringConvert.h" +#include "ps/StringConvert.h" #include "scripting/SpiderMonkey.h" #include "ps/CLogger.h" diff --git a/source/i18n/StringBuffer.h b/source/i18n/StringBuffer.h index 368a7c4306..eff7e8eb9e 100644 --- a/source/i18n/StringBuffer.h +++ b/source/i18n/StringBuffer.h @@ -10,7 +10,7 @@ before converting into a string. #include "Common.h" #include "TranslatedString.h" -#include "CStr.h" +#include "ps/CStr.h" namespace I18n { diff --git a/source/lib/app_hooks.cpp b/source/lib/app_hooks.cpp index e52d5a6d8a..283f80ab8f 100644 --- a/source/lib/app_hooks.cpp +++ b/source/lib/app_hooks.cpp @@ -25,7 +25,7 @@ #include #include -#include "sysdep/gfx.h" +#include "lib/sysdep/gfx.h" #include "lib/res/graphics/ogl_tex.h" #include "lib/res/file/file.h" #include "lib/res/file/vfs.h" diff --git a/source/lib/debug.h b/source/lib/debug.h index e627aed3a6..2e32969a84 100644 --- a/source/lib/debug.h +++ b/source/lib/debug.h @@ -25,9 +25,9 @@ #include "lib.h" // STMT #if OS_WIN -# include "sysdep/win/wdbg.h" +# include "lib/sysdep/win/wdbg.h" #else -# include "sysdep/unix/udbg.h" +# include "lib/sysdep/unix/udbg.h" #endif /** diff --git a/source/lib/lf_alloc.cpp b/source/lib/lf_alloc.cpp index 0fccfec745..aa93caf9ba 100644 --- a/source/lib/lf_alloc.cpp +++ b/source/lib/lf_alloc.cpp @@ -29,7 +29,7 @@ #include "lib.h" #include "posix.h" -#include "sysdep/cpu.h" +#include "lib/sysdep/cpu.h" #include "lockfree.h" #include "timer.h" diff --git a/source/lib/lib.cpp b/source/lib/lib.cpp index 04b58fd34b..3af258247d 100644 --- a/source/lib/lib.cpp +++ b/source/lib/lib.cpp @@ -31,7 +31,7 @@ #include "lib.h" #include "lib/app_hooks.h" -#include "sysdep/sysdep.h" +#include "lib/sysdep/sysdep.h" //----------------------------------------------------------------------------- // bit bashing diff --git a/source/lib/lib.h b/source/lib/lib.h index 8d431ebf77..3833567335 100644 --- a/source/lib/lib.h +++ b/source/lib/lib.h @@ -62,7 +62,7 @@ scope #include "config.h" #include "lib/types.h" -#include "sysdep/sysdep.h" +#include "lib/sysdep/sysdep.h" #include "sysdep/cpu.h" // CAS //#include "sysdep/sysdep.h" // moved down; see below. diff --git a/source/lib/lib_errors.cpp b/source/lib/lib_errors.cpp index e292e48795..677b7a1a24 100644 --- a/source/lib/lib_errors.cpp +++ b/source/lib/lib_errors.cpp @@ -28,7 +28,7 @@ #include "precompiled.h" #include "lib_errors.h" -#include "sysdep/sysdep.h" +#include "lib/sysdep/sysdep.h" #include #include // abs diff --git a/source/lib/lockfree.cpp b/source/lib/lockfree.cpp index c2f7c25192..cfc0997295 100644 --- a/source/lib/lockfree.cpp +++ b/source/lib/lockfree.cpp @@ -27,7 +27,7 @@ #include "lib.h" #include "posix.h" -#include "sysdep/cpu.h" +#include "lib/sysdep/cpu.h" #include "lockfree.h" #include "timer.h" diff --git a/source/lib/ogl.cpp b/source/lib/ogl.cpp index 931dad46a2..4830946a50 100644 --- a/source/lib/ogl.cpp +++ b/source/lib/ogl.cpp @@ -30,7 +30,7 @@ #include "lib.h" #include "sdl.h" #include "ogl.h" -#include "sysdep/gfx.h" +#include "lib/sysdep/gfx.h" #include "debug.h" #include "lib/res/h_mgr.h" #include "lib/res/graphics/tex.h" diff --git a/source/lib/ogl.h b/source/lib/ogl.h index 691497ce44..fac1bf504e 100644 --- a/source/lib/ogl.h +++ b/source/lib/ogl.h @@ -28,7 +28,7 @@ extern "C" { #endif #if OS_WIN -#include "sysdep/win/wgl.h" +#include "lib/sysdep/win/wgl.h" #endif diff --git a/source/lib/posix.h b/source/lib/posix.h index 9951511c99..37be0a127a 100644 --- a/source/lib/posix.h +++ b/source/lib/posix.h @@ -55,8 +55,8 @@ need only be renamed (e.g. _open, _stat). #if OS_WIN -#include "sysdep/win/wposix.h" -#include "sysdep/win/win.h" +#include "lib/sysdep/win/wposix.h" +#include "lib/sysdep/win/win.h" #else diff --git a/source/lib/posix_types.h b/source/lib/posix_types.h index cc43e2f838..b950e82aad 100644 --- a/source/lib/posix_types.h +++ b/source/lib/posix_types.h @@ -30,7 +30,7 @@ #include #if OS_WIN -# include "sysdep/win/wposix_types.h" +# include "lib/sysdep/win/wposix_types.h" #else // unix/linux/glibc/gcc says that this macro has to be defined when including // stdint.h from C++ for stdint.h to define SIZE_MAX and friends diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index b083560cda..af5109cb73 100644 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -164,14 +164,6 @@ # include #endif -// some other external libraries that are used in several places: -// .. CStr is included very frequently, so a reasonable amount of time is -// saved by including it here. (~10% in a full rebuild, as of r2365) -#include "ps/CStr.h" -#include "scripting/SpiderMonkey.h" -#include -#include - // (further headers to be precompiled go here) #endif // #if HAVE_PCH diff --git a/source/lib/res/file/archive.h b/source/lib/res/file/archive.h index 59d68696b2..b6fcae527e 100644 --- a/source/lib/res/file/archive.h +++ b/source/lib/res/file/archive.h @@ -24,7 +24,7 @@ #ifndef ARCHIVE_H__ #define ARCHIVE_H__ -#include "../handle.h" +#include "lib/res/handle.h" #include "file.h" // FileCB for afile_enum #include "compression.h" // CompressionMethod diff --git a/source/lib/res/file/archive_builder.cpp b/source/lib/res/file/archive_builder.cpp index d3f40bdf65..4f75fec4f9 100644 --- a/source/lib/res/file/archive_builder.cpp +++ b/source/lib/res/file/archive_builder.cpp @@ -22,7 +22,7 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #include "lib/timer.h" #include "file_internal.h" diff --git a/source/lib/res/file/compression.cpp b/source/lib/res/file/compression.cpp index c6d0504c26..63c58ddaaf 100644 --- a/source/lib/res/file/compression.cpp +++ b/source/lib/res/file/compression.cpp @@ -438,7 +438,7 @@ uintptr_t comp_alloc(ContextType type, CompressionMethod method) cassert(sizeof(ZLibCompressor) <= MAX_COMPRESSOR_SIZE); #include "nommgr.h" // protect placement new c = new(c_mem) ZLibCompressor(type); -#include "mmgr.h" +#include "lib/mmgr.h" break; #endif default: diff --git a/source/lib/res/file/file.cpp b/source/lib/res/file/file.cpp index 94c32b6bbe..395dd7d84f 100644 --- a/source/lib/res/file/file.cpp +++ b/source/lib/res/file/file.cpp @@ -23,10 +23,10 @@ #include "precompiled.h" -#include "lib.h" -#include "adts.h" -#include "sysdep/sysdep.h" -#include "byte_order.h" +#include "lib/lib.h" +#include "lib/adts.h" +#include "lib/sysdep/sysdep.h" +#include "lib/byte_order.h" #include "lib/allocators.h" #include "file_internal.h" diff --git a/source/lib/res/file/file.h b/source/lib/res/file/file.h index 11abb7cdc6..2720278887 100644 --- a/source/lib/res/file/file.h +++ b/source/lib/res/file/file.h @@ -24,7 +24,7 @@ #ifndef FILE_H #define FILE_H -#include "posix.h" // struct stat +#include "lib/posix.h" // struct stat extern LibError file_init(); diff --git a/source/lib/res/file/file_io.cpp b/source/lib/res/file/file_io.cpp index 16d7d1ba2e..db85bd5366 100644 --- a/source/lib/res/file/file_io.cpp +++ b/source/lib/res/file/file_io.cpp @@ -24,7 +24,7 @@ #include -#include "lib.h" +#include "lib/lib.h" #include "lib/posix.h" #include "lib/allocators.h" #include "lib/adts.h" diff --git a/source/lib/res/file/path.cpp b/source/lib/res/file/path.cpp index 927a32b5ac..955c4c2627 100644 --- a/source/lib/res/file/path.cpp +++ b/source/lib/res/file/path.cpp @@ -24,10 +24,10 @@ #include -#include "lib.h" -#include "adts.h" +#include "lib/lib.h" +#include "lib/adts.h" #include "file_internal.h" -#include "allocators.h" +#include "lib/allocators.h" // path types: diff --git a/source/lib/res/file/path.h b/source/lib/res/file/path.h index 87be57ecc2..22675f2a9c 100644 --- a/source/lib/res/file/path.h +++ b/source/lib/res/file/path.h @@ -23,7 +23,7 @@ #ifndef VFS_PATH_H__ #define VFS_PATH_H__ -#include "lib.h" +#include "lib/lib.h" #define VFS_PATH_IS_DIR(path) (*path == '\0' || path[strlen(path)-1] == '/') diff --git a/source/lib/res/file/vfs.cpp b/source/lib/res/file/vfs.cpp index e47fbee9bc..519ef2c392 100644 --- a/source/lib/res/file/vfs.cpp +++ b/source/lib/res/file/vfs.cpp @@ -37,7 +37,7 @@ #include "lib/adts.h" #include "lib/timer.h" #include "lib/res/res.h" -#include "sysdep/dir_watch.h" +#include "lib/sysdep/dir_watch.h" #include "file_internal.h" // not safe to call before main! diff --git a/source/lib/res/file/vfs_mount.cpp b/source/lib/res/file/vfs_mount.cpp index 5ca78dcc14..5fd2462d0a 100644 --- a/source/lib/res/file/vfs_mount.cpp +++ b/source/lib/res/file/vfs_mount.cpp @@ -23,7 +23,7 @@ #include "precompiled.h" -#include "sysdep/dir_watch.h" +#include "lib/sysdep/dir_watch.h" #include "lib/res/h_mgr.h" #include "file_internal.h" diff --git a/source/lib/res/file/vfs_tree.cpp b/source/lib/res/file/vfs_tree.cpp index c088817d31..51cc12ebda 100644 --- a/source/lib/res/file/vfs_tree.cpp +++ b/source/lib/res/file/vfs_tree.cpp @@ -255,12 +255,12 @@ RealDir rd; // HACK; removeme if(!mem) WARN_RETURN(ERR_NO_MEM); TNode* node; -#include "nommgr.h" +#include "lib/nommgr.h" if(type == NT_FILE) node = new(mem) TFile(V_new_path, name, m); else node = new(mem) TDir (V_new_path, name, m); -#include "mmgr.h" +#include "lib/mmgr.h" children.insert(name, node); @@ -477,7 +477,7 @@ static void tree_root_init() void* mem = node_alloc(); if(mem) tree_root = new(mem) TDir("", "", 0); -#include "mmgr.h" +#include "lib/mmgr.h" } // destroy the tree root node and free any extra memory held by it. diff --git a/source/lib/res/file/zip.cpp b/source/lib/res/file/zip.cpp index 2f01ee6ffa..612f67be0c 100644 --- a/source/lib/res/file/zip.cpp +++ b/source/lib/res/file/zip.cpp @@ -25,11 +25,11 @@ #include #include -#include "lib.h" -#include "byte_order.h" -#include "allocators.h" -#include "timer.h" -#include "self_test.h" +#include "lib/lib.h" +#include "lib/byte_order.h" +#include "lib/allocators.h" +#include "lib/timer.h" +#include "lib/self_test.h" #include "file_internal.h" diff --git a/source/lib/res/graphics/cursor.cpp b/source/lib/res/graphics/cursor.cpp index 0bbfbb9210..2b5f2c46be 100644 --- a/source/lib/res/graphics/cursor.cpp +++ b/source/lib/res/graphics/cursor.cpp @@ -36,7 +36,7 @@ #include "lib/ogl.h" #include "sysdep/sysdep.h" // sys_cursor_* -#include "../res.h" +#include "lib/res/res.h" #include "ogl_tex.h" #include "cursor.h" diff --git a/source/lib/res/graphics/ogl_shader.cpp b/source/lib/res/graphics/ogl_shader.cpp index 48cd37abdf..b09cb83f48 100644 --- a/source/lib/res/graphics/ogl_shader.cpp +++ b/source/lib/res/graphics/ogl_shader.cpp @@ -10,8 +10,8 @@ #include "precompiled.h" -#include "lib.h" -#include "../res.h" +#include "lib/lib.h" +#include "lib/res/res.h" #include "lib/ogl.h" #include "ps/CLogger.h" diff --git a/source/lib/res/graphics/ogl_shader.h b/source/lib/res/graphics/ogl_shader.h index 76beddebb7..8bccfc695a 100644 --- a/source/lib/res/graphics/ogl_shader.h +++ b/source/lib/res/graphics/ogl_shader.h @@ -11,7 +11,7 @@ #ifndef OGL_SHADER_H__ #define OGL_SHADER_H__ -#include "../handle.h" +#include "lib/res/handle.h" #include "lib/types.h" #include "lib/ogl.h" diff --git a/source/lib/res/graphics/ogl_tex.cpp b/source/lib/res/graphics/ogl_tex.cpp index acc505ae45..28a057f21a 100644 --- a/source/lib/res/graphics/ogl_tex.cpp +++ b/source/lib/res/graphics/ogl_tex.cpp @@ -23,11 +23,11 @@ #include "precompiled.h" -#include "lib.h" -#include "app_hooks.h" -#include "sysdep/gfx.h" -#include "../res.h" -#include "ogl.h" +#include "lib/lib.h" +#include "lib/app_hooks.h" +#include "lib/sysdep/gfx.h" +#include "lib/res/res.h" +#include "lib/ogl.h" #include "tex.h" #include "ogl_tex.h" diff --git a/source/lib/res/graphics/ogl_tex.h b/source/lib/res/graphics/ogl_tex.h index e1e74b7998..51df8d12d9 100644 --- a/source/lib/res/graphics/ogl_tex.h +++ b/source/lib/res/graphics/ogl_tex.h @@ -143,7 +143,7 @@ the next function to fail, but real apps should check and report errors. #ifndef OGL_TEX_H__ #define OGL_TEX_H__ -#include "../handle.h" +#include "lib/res/handle.h" #include "lib/types.h" #include "lib/ogl.h" #include "tex.h" diff --git a/source/lib/res/graphics/tex.cpp b/source/lib/res/graphics/tex.cpp index b6e5332e55..2dc9b5ac89 100644 --- a/source/lib/res/graphics/tex.cpp +++ b/source/lib/res/graphics/tex.cpp @@ -27,9 +27,9 @@ #include -#include "lib.h" -#include "timer.h" -#include "../res.h" +#include "lib/lib.h" +#include "lib/timer.h" +#include "lib/res/res.h" #include "tex.h" #include "tex_codec.h" diff --git a/source/lib/res/graphics/tex.h b/source/lib/res/graphics/tex.h index 5ac24a11af..9fb1fd97d3 100644 --- a/source/lib/res/graphics/tex.h +++ b/source/lib/res/graphics/tex.h @@ -100,7 +100,7 @@ library and IO layer. Read and write are zero-copy. #ifndef TEX_H__ #define TEX_H__ -#include "../handle.h" +#include "lib/res/handle.h" /** * flags describing the pixel format. these are to be interpreted as diff --git a/source/lib/res/graphics/tex_jpg.cpp b/source/lib/res/graphics/tex_jpg.cpp index 93201418a1..f084cee711 100644 --- a/source/lib/res/graphics/tex_jpg.cpp +++ b/source/lib/res/graphics/tex_jpg.cpp @@ -28,7 +28,7 @@ extern "C" { #include } -#include "lib.h" +#include "lib/lib.h" #include "lib/res/res.h" #include "tex_codec.h" #include diff --git a/source/lib/res/graphics/unifont.cpp b/source/lib/res/graphics/unifont.cpp index 2a570da8b8..99f0616a6c 100644 --- a/source/lib/res/graphics/unifont.cpp +++ b/source/lib/res/graphics/unifont.cpp @@ -10,9 +10,9 @@ #include "precompiled.h" -#include "lib.h" -#include "../res.h" -#include "ogl.h" +#include "lib/lib.h" +#include "lib/res/res.h" +#include "lib/ogl.h" #include "ogl_tex.h" #include diff --git a/source/lib/res/graphics/unifont.h b/source/lib/res/graphics/unifont.h index 3891f2b49d..94ab93e8e1 100644 --- a/source/lib/res/graphics/unifont.h +++ b/source/lib/res/graphics/unifont.h @@ -13,7 +13,7 @@ #include // va_list -#include "../handle.h" +#include "lib/res/handle.h" // Load and return a handle to the font defined // in fn+".fnt" with texture fn+".tga" diff --git a/source/lib/res/h_mgr.cpp b/source/lib/res/h_mgr.cpp index d6b6c840f2..02654a4038 100644 --- a/source/lib/res/h_mgr.cpp +++ b/source/lib/res/h_mgr.cpp @@ -22,7 +22,7 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #include "h_mgr.h" #include "lib/allocators.h" diff --git a/source/lib/res/h_mgr.h b/source/lib/res/h_mgr.h index 08e8aab0ff..172f087c28 100644 --- a/source/lib/res/h_mgr.h +++ b/source/lib/res/h_mgr.h @@ -244,7 +244,7 @@ we could switch H_DEREF to throwing an exception on error. #include // type init routines get va_list of args -#include "lib.h" +#include "lib/lib.h" #ifndef HANDLE_DEFINED #include "handle.h" diff --git a/source/lib/res/mem.cpp b/source/lib/res/mem.cpp index 8e32a3b95e..249d88c81a 100644 --- a/source/lib/res/mem.cpp +++ b/source/lib/res/mem.cpp @@ -23,8 +23,8 @@ #include "precompiled.h" -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "h_mgr.h" #include "lib/allocators.h" // OverrunProtector #include "mem.h" diff --git a/source/lib/res/res.h b/source/lib/res/res.h index da8eb0ee40..21637c2918 100644 --- a/source/lib/res/res.h +++ b/source/lib/res/res.h @@ -1,6 +1,6 @@ // common headers needed by lib/res code #include "h_mgr.h" -#include "file/vfs.h" +#include "lib/res/file/vfs.h" #include "lib/path_util.h" #include "mem.h" diff --git a/source/lib/res/sound/snd_mgr.cpp b/source/lib/res/sound/snd_mgr.cpp index 91a2259da6..cbd04af9d6 100644 --- a/source/lib/res/sound/snd_mgr.cpp +++ b/source/lib/res/sound/snd_mgr.cpp @@ -47,13 +47,13 @@ // for DLL-load hack in alc_init #if OS_WIN -# include "sysdep/win/win_internal.h" +# include "lib/sysdep/win/win_internal.h" #endif #include "lib/res/res.h" #include "snd_mgr.h" #include "lib/timer.h" -#include "app_hooks.h" +#include "lib/app_hooks.h" #define OGG_HACK diff --git a/source/lib/res/sound/snd_mgr.h b/source/lib/res/sound/snd_mgr.h index be6b89e3e4..f864a24ad3 100644 --- a/source/lib/res/sound/snd_mgr.h +++ b/source/lib/res/sound/snd_mgr.h @@ -24,7 +24,7 @@ #ifndef SND_MGR_H__ #define SND_MGR_H__ -#include "../handle.h" +#include "lib/res/handle.h" /** diff --git a/source/lib/sdl.h b/source/lib/sdl.h index 38524a1a16..b8a5fe2dd4 100644 --- a/source/lib/sdl.h +++ b/source/lib/sdl.h @@ -24,7 +24,7 @@ #define LIB_SDL_H__ #if OS_WIN && !defined(CONFIG_NO_WSDL) -# include "sysdep/win/wsdl.h" +# include "lib/sysdep/win/wsdl.h" #else # include diff --git a/source/lib/sysdep/cpu.cpp b/source/lib/sysdep/cpu.cpp index 118114a51f..1e60153d44 100644 --- a/source/lib/sysdep/cpu.cpp +++ b/source/lib/sysdep/cpu.cpp @@ -22,7 +22,7 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #if CPU_IA32 # include "sysdep/ia32.h" diff --git a/source/lib/sysdep/gfx.cpp b/source/lib/sysdep/gfx.cpp index 555e55062b..8795cb05c8 100644 --- a/source/lib/sysdep/gfx.cpp +++ b/source/lib/sysdep/gfx.cpp @@ -22,8 +22,8 @@ #include "precompiled.h" -#include "lib.h" -#include "sdl.h" +#include "lib/lib.h" +#include "lib/sdl.h" #include "gfx.h" char gfx_card[GFX_CARD_LEN] = ""; diff --git a/source/lib/sysdep/ia32.cpp b/source/lib/sysdep/ia32.cpp index d21d1ab9ff..f04b3f9a3d 100644 --- a/source/lib/sysdep/ia32.cpp +++ b/source/lib/sysdep/ia32.cpp @@ -22,10 +22,10 @@ #include "precompiled.h" -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "ia32.h" -#include "timer.h" +#include "lib/timer.h" // HACK (see call to wtime_reset_impl) #if OS_WIN diff --git a/source/lib/sysdep/snd.cpp b/source/lib/sysdep/snd.cpp index daf444cbb3..d92924d81e 100644 --- a/source/lib/sysdep/snd.cpp +++ b/source/lib/sysdep/snd.cpp @@ -22,7 +22,7 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #include "snd.h" char snd_card[SND_CARD_LEN]; diff --git a/source/lib/sysdep/sysdep.h b/source/lib/sysdep/sysdep.h index 3b2f1a5654..8dfb4154e0 100644 --- a/source/lib/sysdep/sysdep.h +++ b/source/lib/sysdep/sysdep.h @@ -23,7 +23,7 @@ #ifndef SYSDEP_H_INCLUDED #define SYSDEP_H_INCLUDED -#include "config.h" +#include "lib/config.h" // some functions among the sysdep API are implemented as macros // that redirect to the platform-dependent version. this is done where @@ -31,9 +31,9 @@ // always inline them. // we therefore need to include those headers. #if OS_WIN -# include "win/win.h" +# include "lib/sysdep/win/win.h" #elif OS_UNIX -# include "unix/unix.h" +# include "lib/sysdep/unix/unix.h" #endif #if CPU_IA32 #include "ia32.h" @@ -157,7 +157,7 @@ extern void* alloca(size_t size); # define __func__ "(unknown)" #endif -#include "debug.h" +#include "lib/debug.h" //----------------------------------------------------------------------------- // sysdep API diff --git a/source/lib/sysdep/unix/dir_watch_fam.cpp b/source/lib/sysdep/unix/dir_watch_fam.cpp index ba30f736ca..773708cd24 100644 --- a/source/lib/sysdep/unix/dir_watch_fam.cpp +++ b/source/lib/sysdep/unix/dir_watch_fam.cpp @@ -3,8 +3,8 @@ #include #include -#include "lib.h" -#include "res/file/file.h" +#include "lib/lib.h" +#include "lib/res/file/file.h" #include diff --git a/source/lib/sysdep/unix/udbg.cpp b/source/lib/sysdep/unix/udbg.cpp index ea633a001f..324646f277 100644 --- a/source/lib/sysdep/unix/udbg.cpp +++ b/source/lib/sysdep/unix/udbg.cpp @@ -1,9 +1,9 @@ #include "precompiled.h" -#include "lib.h" -#include "timer.h" -#include "sysdep/sysdep.h" -#include "debug.h" +#include "lib/lib.h" +#include "lib/timer.h" +#include "lib/sysdep/sysdep.h" +#include "lib/debug.h" #include #include @@ -288,7 +288,7 @@ static void find_address_in_section (bfd *abfd, asection *section, void *data) } // BFD functions perform allocs with real malloc - we need to free that data -#include "nommgr.h" +#include "lib/nommgr.h" void demangle_buf(char *buf, const char *symbol, size_t n) { int status=0; diff --git a/source/lib/sysdep/unix/unix.cpp b/source/lib/sysdep/unix/unix.cpp index 5a49e51b68..f6416f368e 100644 --- a/source/lib/sysdep/unix/unix.cpp +++ b/source/lib/sysdep/unix/unix.cpp @@ -4,9 +4,9 @@ #include #include -#include "sdl.h" -#include "lib.h" -#include "sysdep/sysdep.h" +#include "lib/sdl.h" +#include "lib/lib.h" +#include "lib/sysdep/sysdep.h" #include "udbg.h" #define GNU_SOURCE diff --git a/source/lib/sysdep/unix/x.cpp b/source/lib/sysdep/unix/x.cpp index 2c7c2f6449..40a474c730 100644 --- a/source/lib/sysdep/unix/x.cpp +++ b/source/lib/sysdep/unix/x.cpp @@ -23,9 +23,9 @@ #include #include -#include "lib.h" -#include "debug.h" -#include "sysdep/gfx.h" +#include "lib/lib.h" +#include "lib/debug.h" +#include "lib/sysdep/gfx.h" #include diff --git a/source/lib/sysdep/win/delay_load.cpp b/source/lib/sysdep/win/delay_load.cpp index 7b6b622d77..22505c04d0 100644 --- a/source/lib/sysdep/win/delay_load.cpp +++ b/source/lib/sysdep/win/delay_load.cpp @@ -201,7 +201,7 @@ CountOfImports(PCImgThunkData pitdBase) { extern "C" PUnloadInfo __puiHead = 0; -#include "nommgr.h" +#include "lib/nommgr.h" struct ULI : public UnloadInfo { @@ -233,7 +233,7 @@ struct ULI : public UnloadInfo } }; -#include "mmgr.h" +#include "lib/mmgr.h" // For our own internal use, we convert to the old @@ -400,9 +400,9 @@ extern "C" FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, FARPROC* ppfn if (hmodT != hmod) { // add lib to unload list if we have unload data if (pidd->rvaUnloadIAT) { -#include "nommgr.h" +#include "lib/nommgr.h" new ULI(pidd); -#include "mmgr.h" +#include "lib/mmgr.h" } } else { diff --git a/source/lib/sysdep/win/waio.cpp b/source/lib/sysdep/win/waio.cpp index df1232d559..c14c09e027 100644 --- a/source/lib/sysdep/win/waio.cpp +++ b/source/lib/sysdep/win/waio.cpp @@ -22,8 +22,8 @@ #include "precompiled.h" -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "win_internal.h" diff --git a/source/lib/sysdep/win/wcpu.cpp b/source/lib/sysdep/win/wcpu.cpp index bcbde4c3c5..f1d81a4db9 100644 --- a/source/lib/sysdep/win/wcpu.cpp +++ b/source/lib/sysdep/win/wcpu.cpp @@ -22,11 +22,11 @@ #include "precompiled.h" -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "win_internal.h" -#include "sysdep/cpu.h" +#include "lib/sysdep/cpu.h" // limit allows statically allocated per-CPU structures (for simplicity). // we're Windows-specific anyway; such systems won't foreseeably have more. diff --git a/source/lib/sysdep/win/wdbg.cpp b/source/lib/sysdep/win/wdbg.cpp index ccdbd66b57..1ea4be6894 100644 --- a/source/lib/sysdep/win/wdbg.cpp +++ b/source/lib/sysdep/win/wdbg.cpp @@ -26,13 +26,13 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #include "win_internal.h" -#include "posix.h" -#include "sysdep/cpu.h" +#include "lib/posix.h" +#include "lib/sysdep/cpu.h" #include "wdbg.h" #include "byte_order.h" // FOURCC -#include "app_hooks.h" +#include "lib/app_hooks.h" #pragma data_seg(WIN_CALLBACK_PRE_MAIN(b)) diff --git a/source/lib/sysdep/win/wdbg_sym.cpp b/source/lib/sysdep/win/wdbg_sym.cpp index 08648e8f1c..beadad2140 100644 --- a/source/lib/sysdep/win/wdbg_sym.cpp +++ b/source/lib/sysdep/win/wdbg_sym.cpp @@ -26,16 +26,16 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #include "win_internal.h" #define _NO_CVCONST_H // request SymTagEnum be defined #include #include // VARIANT -#include "posix.h" -#include "sysdep/cpu.h" +#include "lib/posix.h" +#include "lib/sysdep/cpu.h" #include "wdbg.h" -#include "debug_stl.h" -#include "app_hooks.h" +#include "lib/debug_stl.h" +#include "lib/app_hooks.h" #include "lib/path_util.h" #if CPU_IA32 # include "lib/sysdep/ia32.h" diff --git a/source/lib/sysdep/win/wdir_watch.cpp b/source/lib/sysdep/win/wdir_watch.cpp index 6dfc455a74..5c1bc04634 100644 --- a/source/lib/sysdep/win/wdir_watch.cpp +++ b/source/lib/sysdep/win/wdir_watch.cpp @@ -26,7 +26,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #include "lib/path_util.h" #include "win_internal.h" #include "lib/res/file/file.h" // path_is_subpath diff --git a/source/lib/sysdep/win/win.h b/source/lib/sysdep/win/win.h index 6b81ef1dcb..6e013a982f 100644 --- a/source/lib/sysdep/win/win.h +++ b/source/lib/sysdep/win/win.h @@ -27,7 +27,7 @@ #error "win.h: do not include if not compiling for Windows" #endif -#include "config.h" +#include "lib/config.h" #include diff --git a/source/lib/sysdep/win/wposix.cpp b/source/lib/sysdep/win/wposix.cpp index a61e5f2d05..93ecf1d8a3 100644 --- a/source/lib/sysdep/win/wposix.cpp +++ b/source/lib/sysdep/win/wposix.cpp @@ -25,11 +25,11 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #include "win_internal.h" -#include "allocators.h" +#include "lib/allocators.h" #include "lib/path_util.h" -#include "posix.h" +#include "lib/posix.h" // cast intptr_t to HANDLE; centralized for easier changing, e.g. avoiding diff --git a/source/lib/sysdep/win/wpthread.cpp b/source/lib/sysdep/win/wpthread.cpp index a12fd1f46e..5d9c7f89a3 100644 --- a/source/lib/sysdep/win/wpthread.cpp +++ b/source/lib/sysdep/win/wpthread.cpp @@ -26,8 +26,8 @@ #include -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "win_internal.h" #include "../cpu.h" // CAS diff --git a/source/lib/sysdep/win/wsdl.cpp b/source/lib/sysdep/win/wsdl.cpp index 955ab8b4c2..2ec007c1b5 100644 --- a/source/lib/sysdep/win/wsdl.cpp +++ b/source/lib/sysdep/win/wsdl.cpp @@ -31,9 +31,9 @@ #include // _beginthreadex #include // message crackers -#include "sdl.h" -#include "lib.h" -#include "posix.h" +#include "lib/sdl.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "ogl.h" // needed to pull in the delay-loaded opengl32.dll #include "SDL_vkeys.h" diff --git a/source/lib/sysdep/win/wsock.cpp b/source/lib/sysdep/win/wsock.cpp index ac571a5e5d..036fb33192 100644 --- a/source/lib/sysdep/win/wsock.cpp +++ b/source/lib/sysdep/win/wsock.cpp @@ -23,7 +23,7 @@ #include "precompiled.h" #include "win_internal.h" -#include "lib.h" +#include "lib/lib.h" #include "wsock.h" #include "delay_load.h" diff --git a/source/lib/sysdep/win/wsysdep.cpp b/source/lib/sysdep/win/wsysdep.cpp index bebc6a9e2b..198dda4935 100644 --- a/source/lib/sysdep/win/wsysdep.cpp +++ b/source/lib/sysdep/win/wsysdep.cpp @@ -25,8 +25,8 @@ #include "win_internal.h" // includes windows.h; must come before shlobj #include // pick_dir -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #include "error_dialog.h" #include "lib/res/graphics/tex.h" diff --git a/source/lib/sysdep/win/wtime.cpp b/source/lib/sysdep/win/wtime.cpp index 447c2b54dd..6d31230556 100644 --- a/source/lib/sysdep/win/wtime.cpp +++ b/source/lib/sysdep/win/wtime.cpp @@ -22,10 +22,10 @@ #include "precompiled.h" -#include "lib.h" -#include "posix.h" -#include "adts.h" -#include "sysdep/ia32.h" +#include "lib/lib.h" +#include "lib/posix.h" +#include "lib/adts.h" +#include "lib/sysdep/ia32.h" #include "win_internal.h" diff --git a/source/lib/timer.cpp b/source/lib/timer.cpp index b3adfd08d3..39ef0b8aef 100644 --- a/source/lib/timer.cpp +++ b/source/lib/timer.cpp @@ -32,7 +32,7 @@ #include #include -#include "sysdep/ia32.h" +#include "lib/sysdep/ia32.h" // rationale for wrapping gettimeofday and clock_gettime, instead of emulating // them where not available: allows returning higher-resolution timer values diff --git a/source/maths/Bound.cpp b/source/maths/Bound.cpp index c68be9b5c4..5cb2162710 100644 --- a/source/maths/Bound.cpp +++ b/source/maths/Bound.cpp @@ -10,11 +10,11 @@ // necessary includes -#include "ogl.h" +#include "lib/ogl.h" #include #include "Bound.h" -#include "Frustum.h" +#include "graphics/Frustum.h" #include "Brush.h" diff --git a/source/maths/Brush.cpp b/source/maths/Brush.cpp index 434fd83023..ce2ee84d9f 100644 --- a/source/maths/Brush.cpp +++ b/source/maths/Brush.cpp @@ -10,13 +10,13 @@ #include "precompiled.h" -#include "ogl.h" +#include "lib/ogl.h" #include #include "Brush.h" #include "Bound.h" -#include "Frustum.h" +#include "graphics/Frustum.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/source/maths/Matrix3D.cpp b/source/maths/Matrix3D.cpp index 434efd75ad..097c2926d5 100644 --- a/source/maths/Matrix3D.cpp +++ b/source/maths/Matrix3D.cpp @@ -13,7 +13,7 @@ #include "Matrix3D.h" #include "Quaternion.h" -#include "self_test.h" +#include "lib/self_test.h" CMatrix3D::CMatrix3D () { diff --git a/source/maths/scripting/JSInterface_Vector3D.h b/source/maths/scripting/JSInterface_Vector3D.h index 5d6fac1900..01283f0bee 100644 --- a/source/maths/scripting/JSInterface_Vector3D.h +++ b/source/maths/scripting/JSInterface_Vector3D.h @@ -8,7 +8,7 @@ // Mark Thompson mot20@cam.ac.uk / mark@wildfiregames.com #include "scripting/ScriptingHost.h" -#include "Vector3D.h" +#include "maths/Vector3D.h" #ifndef JSI_VECTOR3_INCLUDED #define JSI_VECTOR3_INCLUDED diff --git a/source/maths/tests/test_Matrix3d.h b/source/maths/tests/test_Matrix3d.h index 66327976af..9df9b513ca 100644 --- a/source/maths/tests/test_Matrix3d.h +++ b/source/maths/tests/test_Matrix3d.h @@ -1,6 +1,6 @@ #include -#include "Maths/Matrix3D.h" +#include "maths/Matrix3D.h" class TestMatrix : public CxxTest::TestSuite { diff --git a/source/pch/atlas/precompiled.cpp b/source/pch/atlas/precompiled.cpp new file mode 100644 index 0000000000..5f656a45da --- /dev/null +++ b/source/pch/atlas/precompiled.cpp @@ -0,0 +1 @@ +#include "precompiled.h" diff --git a/source/pch/engine/precompiled.cpp b/source/pch/engine/precompiled.cpp new file mode 100644 index 0000000000..5f656a45da --- /dev/null +++ b/source/pch/engine/precompiled.cpp @@ -0,0 +1 @@ +#include "precompiled.h" diff --git a/source/pch/graphics/precompiled.cpp b/source/pch/graphics/precompiled.cpp new file mode 100644 index 0000000000..5f656a45da --- /dev/null +++ b/source/pch/graphics/precompiled.cpp @@ -0,0 +1 @@ +#include "precompiled.h" diff --git a/source/pch/gui/precompiled.cpp b/source/pch/gui/precompiled.cpp new file mode 100644 index 0000000000..5f656a45da --- /dev/null +++ b/source/pch/gui/precompiled.cpp @@ -0,0 +1 @@ +#include "precompiled.h" diff --git a/source/pch/i18n/precompiled.cpp b/source/pch/i18n/precompiled.cpp new file mode 100644 index 0000000000..5f656a45da --- /dev/null +++ b/source/pch/i18n/precompiled.cpp @@ -0,0 +1 @@ +#include "precompiled.h" diff --git a/source/pch/lowlevel/precompiled.cpp b/source/pch/lowlevel/precompiled.cpp new file mode 100644 index 0000000000..5f656a45da --- /dev/null +++ b/source/pch/lowlevel/precompiled.cpp @@ -0,0 +1 @@ +#include "precompiled.h" diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp index 9f0ce4883c..19af3fe9ef 100644 --- a/source/ps/CConsole.cpp +++ b/source/ps/CConsole.cpp @@ -5,13 +5,13 @@ #include "CLogger.h" #include "Pyrogenesis.h" -#include "sysdep/sysdep.h" +#include "lib/sysdep/sysdep.h" #include "Hotkey.h" #include "scripting/ScriptingHost.h" -#include "MathUtil.h" +#include "maths/MathUtil.h" -#include "Network/Client.h" -#include "Network/Server.h" +#include "ps/Network/Client.h" +#include "ps/Network/Server.h" #include "lib/res/file/vfs.h" diff --git a/source/ps/CConsole.h b/source/ps/CConsole.h index 0b752ab27f..62474cc4af 100644 --- a/source/ps/CConsole.h +++ b/source/ps/CConsole.h @@ -16,8 +16,8 @@ #include #include "lib/res/graphics/unifont.h" -#include "ogl.h" -#include "lib.h" +#include "lib/ogl.h" +#include "lib/lib.h" #include "CStr.h" #include "lib/input.h" diff --git a/source/ps/CLogger.cpp b/source/ps/CLogger.cpp index 40367210a7..761fb2f3a3 100644 --- a/source/ps/CLogger.cpp +++ b/source/ps/CLogger.cpp @@ -2,7 +2,7 @@ #include "CLogger.h" #include "ConfigDB.h" -#include "lib.h" +#include "lib/lib.h" #include "lib/path_util.h" #include "lib/res/file/file.h" diff --git a/source/ps/CStr.cpp b/source/ps/CStr.cpp index 2c22f90de6..8825ed539c 100644 --- a/source/ps/CStr.cpp +++ b/source/ps/CStr.cpp @@ -3,8 +3,8 @@ #ifndef CStr_CPP_FIRST #define CStr_CPP_FIRST -#include "posix.h" // for htons, ntohs -#include "Network/Serialization.h" +#include "lib/posix.h" // for htons, ntohs +#include "ps/Network/Serialization.h" #include #include @@ -12,7 +12,7 @@ #define UNIDOUBLER_HEADER "CStr.cpp" #include "UniDoubler.h" -#include "self_test.h" +#include "lib/self_test.h" // Only include these function definitions in the first instance of CStr.cpp: diff --git a/source/ps/Game.cpp b/source/ps/Game.cpp index c73648e2d3..dc1bf215c8 100644 --- a/source/ps/Game.cpp +++ b/source/ps/Game.cpp @@ -6,11 +6,11 @@ #ifndef NO_GUI #include "gui/CGUI.h" #endif -#include "timer.h" +#include "lib/timer.h" #include "Profile.h" #include "Loader.h" #include "CStr.h" -#include "EntityManager.h" +#include "simulation/EntityManager.h" #include "CConsole.h" #include "ps/World.h" diff --git a/source/ps/GameAttributes.cpp b/source/ps/GameAttributes.cpp index 8f796cd5e9..5cce85f00e 100644 --- a/source/ps/GameAttributes.cpp +++ b/source/ps/GameAttributes.cpp @@ -5,7 +5,7 @@ #include "GameAttributes.h" #include "Game.h" #include "ConfigDB.h" -#include "Network/ServerSession.h" +#include "ps/Network/ServerSession.h" #include "CLogger.h" #include "ps/XML/Xeromyces.h" diff --git a/source/ps/GameSetup/Config.h b/source/ps/GameSetup/Config.h index 729d35800a..1401270af4 100644 --- a/source/ps/GameSetup/Config.h +++ b/source/ps/GameSetup/Config.h @@ -1,4 +1,4 @@ -#include "CStr.h" +#include "ps/CStr.h" // flag to disable extended GL extensions until fix found - specifically, crashes // using VBOs on laptop Radeon cards diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp index ec8f26d597..b7020040bc 100644 --- a/source/ps/GameSetup/GameSetup.cpp +++ b/source/ps/GameSetup/GameSetup.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #include "lib/sdl.h" #include "lib/ogl.h" #include "lib/timer.h" @@ -59,14 +59,14 @@ #include "scripting/ScriptingHost.h" #include "scripting/GameEvents.h" -#include "scripting/JSInterface_Entity.h" -#include "scripting/JSInterface_BaseEntity.h" -#include "scripting/JSInterface_Vector3D.h" -#include "scripting/JSInterface_Camera.h" -#include "scripting/JSInterface_Selection.h" -#include "scripting/JSInterface_Console.h" +#include "simulation/scripting/JSInterface_Entity.h" +#include "simulation/scripting/JSInterface_BaseEntity.h" +#include "maths/scripting/JSInterface_Vector3D.h" +#include "graphics/scripting/JSInterface_Camera.h" +#include "ps/scripting/JSInterface_Selection.h" +#include "ps/scripting/JSInterface_Console.h" #include "graphics/scripting/JSInterface_LightEnv.h" -#include "scripting/JSCollection.h" +#include "ps/scripting/JSCollection.h" #include "scripting/DOMEvent.h" #ifndef NO_GUI # include "gui/scripting/JSInterface_IGUIObject.h" @@ -77,9 +77,9 @@ #include "sound/CMusicPlayer.h" #include "sound/JSI_Sound.h" -#include "Network/SessionManager.h" -#include "Network/Server.h" -#include "Network/Client.h" +#include "ps/Network/SessionManager.h" +#include "ps/Network/Server.h" +#include "ps/Network/Client.h" #include "GameSetup/Config.h" diff --git a/source/ps/Hotkey.cpp b/source/ps/Hotkey.cpp index afaa1bcc40..0e7de0c362 100644 --- a/source/ps/Hotkey.cpp +++ b/source/ps/Hotkey.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "Hotkey.h" -#include "input.h" +#include "lib/input.h" #include "ConfigDB.h" #include "CLogger.h" #include "CConsole.h" diff --git a/source/ps/Interact.cpp b/source/ps/Interact.cpp index a4b52ef777..9fe32b3d70 100644 --- a/source/ps/Interact.cpp +++ b/source/ps/Interact.cpp @@ -1,28 +1,28 @@ #include "precompiled.h" #include "Interact.h" -#include "Renderer.h" -#include "input.h" +#include "renderer/Renderer.h" +#include "lib/input.h" #include "CConsole.h" -#include "HFTracer.h" +#include "graphics/HFTracer.h" #include "Hotkey.h" #include "gui/CGUI.h" #include "gui/MiniMap.h" -#include "timer.h" +#include "lib/timer.h" #include "Game.h" -#include "Simulation.h" +#include "simulation/Simulation.h" #include "ps/Globals.h" #include "ps/VFSUtil.h" -#include "Network/NetMessage.h" -#include "BoundingObjects.h" -#include "Unit.h" -#include "Model.h" +#include "ps/Network/NetMessage.h" +#include "simulation/BoundingObjects.h" +#include "graphics/Unit.h" +#include "graphics/Model.h" #include "simulation/BaseEntityCollection.h" #include "simulation/EntityFormation.h" #include "simulation/FormationManager.h" #include "scripting/GameEvents.h" -#include "UnitManager.h" -#include "MathUtil.h" +#include "graphics/UnitManager.h" +#include "maths/MathUtil.h" #include "graphics/GameView.h" #include "ps/CLogger.h" diff --git a/source/ps/Interact.h b/source/ps/Interact.h index 81f4e5e1de..eae8570a57 100644 --- a/source/ps/Interact.h +++ b/source/ps/Interact.h @@ -9,12 +9,12 @@ #include #include "Singleton.h" -#include "Entity.h" -#include "EntityManager.h" -#include "EntityMessage.h" -#include "Collision.h" -#include "Scheduler.h" -#include "Camera.h" +#include "simulation/Entity.h" +#include "simulation/EntityManager.h" +#include "simulation/EntityMessage.h" +#include "simulation/Collision.h" +#include "simulation/Scheduler.h" +#include "graphics/Camera.h" #include "lib/input.h" #define MAX_BOOKMARKS 10 diff --git a/source/ps/Loader.cpp b/source/ps/Loader.cpp index 0b94886975..82db2a0152 100644 --- a/source/ps/Loader.cpp +++ b/source/ps/Loader.cpp @@ -9,8 +9,8 @@ #include #include -#include "lib.h" // error codes -#include "timer.h" +#include "lib/lib.h" // error codes +#include "lib/timer.h" #include "CStr.h" #include "Loader.h" diff --git a/source/ps/Network/AllNetMessages.h b/source/ps/Network/AllNetMessages.h index b88f0c94a4..a3a92eeb0a 100644 --- a/source/ps/Network/AllNetMessages.h +++ b/source/ps/Network/AllNetMessages.h @@ -2,7 +2,7 @@ #define _AllNetMessages_H #include "lib/types.h" -#include "CStr.h" +#include "ps/CStr.h" #include "scripting/JSSerialization.h" enum ENetMessageType diff --git a/source/ps/Network/Client.cpp b/source/ps/Network/Client.cpp index 0cce18cc38..af91063a73 100644 --- a/source/ps/Network/Client.cpp +++ b/source/ps/Network/Client.cpp @@ -1,18 +1,18 @@ #include "precompiled.h" -#include "lib.h" +#include "lib/lib.h" #include "scripting/DOMEvent.h" #include "scripting/JSConversions.h" #include "scripting/ScriptableObject.h" #include "Network/Client.h" #include "Network/JSEvents.h" -#include "CStr.h" -#include "CLogger.h" -#include "CConsole.h" -#include "Game.h" -#include "GameAttributes.h" -#include "Simulation.h" +#include "ps/CStr.h" +#include "ps/CLogger.h" +#include "ps/CConsole.h" +#include "ps/Game.h" +#include "ps/GameAttributes.h" +#include "simulation/Simulation.h" #define LOG_CAT_NET "net" diff --git a/source/ps/Network/Client.h b/source/ps/Network/Client.h index b215a85c87..80a6b38163 100644 --- a/source/ps/Network/Client.h +++ b/source/ps/Network/Client.h @@ -4,10 +4,10 @@ #include #include -#include "TurnManager.h" +#include "simulation/TurnManager.h" #include "simulation/ScriptObject.h" #include "scripting/ScriptableObject.h" -#include "scripting/JSMap.h" +#include "ps/scripting/JSMap.h" #include diff --git a/source/ps/Network/NetLog.cpp b/source/ps/Network/NetLog.cpp index 59d2e258ee..69df1d2453 100644 --- a/source/ps/Network/NetLog.cpp +++ b/source/ps/Network/NetLog.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "NetLog.h" -#include "ThreadUtil.h" +#include "ps/ThreadUtil.h" #include #include #include diff --git a/source/ps/Network/NetLog.h b/source/ps/Network/NetLog.h index a7ffca27aa..26a9371daf 100644 --- a/source/ps/Network/NetLog.h +++ b/source/ps/Network/NetLog.h @@ -2,7 +2,7 @@ #define _Network_NetLog_H #include -#include "ThreadUtil.h" +#include "ps/ThreadUtil.h" /* CNetLog: an interface for writing to the network trace log. This log is diff --git a/source/ps/Network/NetMessage.cpp b/source/ps/Network/NetMessage.cpp index 3229c70366..4fc565e9cd 100644 --- a/source/ps/Network/NetMessage.cpp +++ b/source/ps/Network/NetMessage.cpp @@ -1,17 +1,17 @@ #include "precompiled.h" -#include "posix.h" -#include "lib.h" +#include "lib/posix.h" +#include "lib/lib.h" #include #include -#include "Entity.h" +#include "simulation/Entity.h" #include "Vector2D.h" #define ALLNETMSGS_IMPLEMENT #include "NetMessage.h" -#include "CLogger.h" +#include "ps/CLogger.h" #define LOG_CAT_NET "net" diff --git a/source/ps/Network/NetMessage.h b/source/ps/Network/NetMessage.h index f10aace21e..b92418c937 100644 --- a/source/ps/Network/NetMessage.h +++ b/source/ps/Network/NetMessage.h @@ -86,7 +86,7 @@ public: typedef CNetMessage * (*NetMessageDeserializer) (const u8 *buffer, uint length); -#include "EntityHandles.h" +#include "simulation/EntityHandles.h" struct SNetMessageDeserializerRegistration { diff --git a/source/ps/Network/Network.h b/source/ps/Network/Network.h index 6ae3b59393..29cc072fda 100644 --- a/source/ps/Network/Network.h +++ b/source/ps/Network/Network.h @@ -45,11 +45,11 @@ MORE INFO // Includes / Compiler directives //-------------------------------------------------------- -#include "posix.h" +#include "lib/posix.h" #include "lib/types.h" -#include "Pyrogenesis.h" -#include "ThreadUtil.h" -#include "Singleton.h" +#include "ps/Pyrogenesis.h" +#include "ps/ThreadUtil.h" +#include "ps/Singleton.h" #include "StreamSocket.h" diff --git a/source/ps/Network/Serialization.h b/source/ps/Network/Serialization.h index d388a9f6fe..bc76fdcb57 100644 --- a/source/ps/Network/Serialization.h +++ b/source/ps/Network/Serialization.h @@ -2,7 +2,7 @@ #define _Serialization_H #include "lib/types.h" -#include "lib.h" +#include "lib/lib.h" #define Serialize_int_1(_pos, _val) \ STMT( *((_pos)++) = (u8)((_val)&0xff); ) diff --git a/source/ps/Network/Server.cpp b/source/ps/Network/Server.cpp index e19f11e150..83fbef09ff 100644 --- a/source/ps/Network/Server.cpp +++ b/source/ps/Network/Server.cpp @@ -9,11 +9,11 @@ #include "scripting/ScriptableObject.h" -#include "Game.h" -#include "Simulation.h" -#include "Player.h" -#include "CLogger.h" -#include "CConsole.h" +#include "ps/Game.h" +#include "simulation/Simulation.h" +#include "ps/Player.h" +#include "ps/CLogger.h" +#include "ps/CConsole.h" #define LOG_CAT_NET "net" diff --git a/source/ps/Network/Server.h b/source/ps/Network/Server.h index 8cca447d02..e3b5e037b4 100644 --- a/source/ps/Network/Server.h +++ b/source/ps/Network/Server.h @@ -2,10 +2,10 @@ #define _Network_NetServer_H #include "Network/Session.h" -#include "GameAttributes.h" -#include "TurnManager.h" -#include "scripting/JSMap.h" -#include "ScriptObject.h" +#include "ps/GameAttributes.h" +#include "simulation/TurnManager.h" +#include "ps/scripting/JSMap.h" +#include "simulation/ScriptObject.h" class CGame; diff --git a/source/ps/Network/ServerSession.cpp b/source/ps/Network/ServerSession.cpp index 12f9bcbc3f..ab56c495aa 100644 --- a/source/ps/Network/ServerSession.cpp +++ b/source/ps/Network/ServerSession.cpp @@ -2,8 +2,8 @@ #include "Network/ServerSession.h" #include "Network/Server.h" -#include "CLogger.h" -#include "CConsole.h" +#include "ps/CLogger.h" +#include "ps/CConsole.h" extern CConsole *g_Console; diff --git a/source/ps/Network/SessionManager.h b/source/ps/Network/SessionManager.h index 50ecf32972..76b5aec024 100644 --- a/source/ps/Network/SessionManager.h +++ b/source/ps/Network/SessionManager.h @@ -1,7 +1,7 @@ #ifndef _Network_SessionManager_H #define _Network_SessionManager_H -#include +#include "ps/ThreadUtil.h" class CNetSession; diff --git a/source/ps/Network/SocketBase.cpp b/source/ps/Network/SocketBase.cpp index 886626fd07..1bb892e4d2 100644 --- a/source/ps/Network/SocketBase.cpp +++ b/source/ps/Network/SocketBase.cpp @@ -1,17 +1,17 @@ #include "precompiled.h" #if OS_WIN -#include "sysdep/win/win_internal.h" +#include "lib/sysdep/win/win_internal.h" #endif #include "Network.h" #include "NetworkInternal.h" -#include "lib.h" -#include "CStr.h" +#include "lib/lib.h" +#include "ps/CStr.h" // ERROR is defined by some windows header. Undef it #undef ERROR -#include "CLogger.h" +#include "ps/CLogger.h" #include "NetLog.h" #include diff --git a/source/ps/Network/SocketBase.h b/source/ps/Network/SocketBase.h index 59c965818a..4be950bf76 100644 --- a/source/ps/Network/SocketBase.h +++ b/source/ps/Network/SocketBase.h @@ -5,11 +5,11 @@ // Includes / Compiler directives //-------------------------------------------------------- -#include "posix.h" +#include "lib/posix.h" #include "lib/types.h" -#include "Pyrogenesis.h" +#include "ps/Pyrogenesis.h" #include -#include "CStr.h" +#include "ps/CStr.h" //------------------------------------------------- // Error Codes diff --git a/source/ps/Network/StreamSocket.h b/source/ps/Network/StreamSocket.h index 82dbbed62f..96a319e626 100644 --- a/source/ps/Network/StreamSocket.h +++ b/source/ps/Network/StreamSocket.h @@ -2,7 +2,7 @@ #define _StreamSocket_H #include "lib/types.h" -#include "Pyrogenesis.h" +#include "ps/Pyrogenesis.h" #include "Network.h" #include "SocketBase.h" diff --git a/source/ps/Network/StringConverters.h b/source/ps/Network/StringConverters.h index 18c8be75ff..dd8e4e1630 100644 --- a/source/ps/Network/StringConverters.h +++ b/source/ps/Network/StringConverters.h @@ -1,7 +1,7 @@ #ifndef _StringConverters_H #define _StringConverters_H -#include "CStr.h" +#include "ps/CStr.h" #include "simulation/EntityHandles.h" template diff --git a/source/ps/Overlay.h b/source/ps/Overlay.h index 098c075775..27938b1065 100644 --- a/source/ps/Overlay.h +++ b/source/ps/Overlay.h @@ -12,7 +12,7 @@ by Rich Cross, rich@0ad.wildfiregames.com #ifndef COVERLAY_H #define COVERLAY_H -#include "types.h" +#include "lib/types.h" class CStr8; @@ -222,7 +222,7 @@ public: //-------------------------------------------------------- // Includes / Compiler directives //-------------------------------------------------------- -#include "Texture.h" +#include "graphics/Texture.h" //-------------------------------------------------------- diff --git a/source/ps/Parser.cpp b/source/ps/Parser.cpp index 618d6271af..6544d41e0b 100644 --- a/source/ps/Parser.cpp +++ b/source/ps/Parser.cpp @@ -1,8 +1,8 @@ #include "precompiled.h" #include "Parser.h" -#include "lib.h" -#include "self_test.h" +#include "lib/lib.h" +#include "lib/self_test.h" #if MSC_VERSION #pragma warning(disable:4786) diff --git a/source/ps/Player.cpp b/source/ps/Player.cpp index f3cc0f787d..4de44e58e2 100644 --- a/source/ps/Player.cpp +++ b/source/ps/Player.cpp @@ -1,10 +1,10 @@ #include "precompiled.h" #include "Player.h" -#include "Network/NetMessage.h" -#include "Entity.h" -#include "EntityManager.h" -#include "scripting/JSCollection.h" +#include "ps/Network/NetMessage.h" +#include "simulation/Entity.h" +#include "simulation/EntityManager.h" +#include "ps/scripting/JSCollection.h" #include "simulation/LOSManager.h" CPlayer::CPlayer(uint playerID): diff --git a/source/ps/Player.h b/source/ps/Player.h index 51bd54ede6..e4ccf811b9 100644 --- a/source/ps/Player.h +++ b/source/ps/Player.h @@ -5,7 +5,7 @@ #include "scripting/SynchedJSObject.h" #include "scripting/ScriptableObject.h" #include "scripting/ScriptCustomTypes.h" -#include "EntityHandles.h" +#include "simulation/EntityHandles.h" class CNetMessage; diff --git a/source/ps/Profile.h b/source/ps/Profile.h index 5701ec5f2d..4d8710fe30 100644 --- a/source/ps/Profile.h +++ b/source/ps/Profile.h @@ -14,7 +14,7 @@ #include #include "Singleton.h" #include "scripting/ScriptableObject.h" -#include "timer.h" +#include "lib/timer.h" #define PROFILE_AMORTIZE diff --git a/source/ps/ProfileViewer.cpp b/source/ps/ProfileViewer.cpp index c325ef4bef..a57fc7e433 100644 --- a/source/ps/ProfileViewer.cpp +++ b/source/ps/ProfileViewer.cpp @@ -16,7 +16,7 @@ #include "ProfileViewer.h" #include "Profile.h" -#include "Renderer.h" +#include "renderer/Renderer.h" #include "lib/res/graphics/unifont.h" #include "lib/path_util.h" #include "lib/res/file/file.h" diff --git a/source/ps/ProfileViewer.h b/source/ps/ProfileViewer.h index 2c023f6642..3e4156fb85 100644 --- a/source/ps/ProfileViewer.h +++ b/source/ps/ProfileViewer.h @@ -12,7 +12,7 @@ #ifndef PROFILE_VIEWER_INCLUDED #define PROFILE_VIEWER_INCLUDED -#include "input.h" +#include "lib/input.h" #include "ps/CStr.h" #include "ps/Singleton.h" diff --git a/source/ps/ThreadUtil.h b/source/ps/ThreadUtil.h index 82cf476c6e..514e8e0933 100644 --- a/source/ps/ThreadUtil.h +++ b/source/ps/ThreadUtil.h @@ -66,8 +66,8 @@ CLocker usage 2: // Includes / Compiler directives //-------------------------------------------------------- -#include "lib.h" -#include "posix.h" +#include "lib/lib.h" +#include "lib/posix.h" #ifdef DEBUG_LOCKS diff --git a/source/ps/Vector2D.h b/source/ps/Vector2D.h index 748fb35fae..106423aedd 100644 --- a/source/ps/Vector2D.h +++ b/source/ps/Vector2D.h @@ -8,7 +8,7 @@ #define VECTOR_2D_INCLUDED #include -#include "Vector3D.h" +#include "maths/Vector3D.h" class CVector2D { diff --git a/source/ps/World.cpp b/source/ps/World.cpp index 49b757f997..7e2506551f 100644 --- a/source/ps/World.cpp +++ b/source/ps/World.cpp @@ -5,21 +5,21 @@ #include "ps/Errors.h" #include "World.h" -#include "MapReader.h" +#include "graphics/MapReader.h" #include "Game.h" #include "GameAttributes.h" -#include "Terrain.h" -#include "LightEnv.h" -#include "BaseEntityCollection.h" -#include "EntityManager.h" -#include "timer.h" +#include "graphics/Terrain.h" +#include "graphics/LightEnv.h" +#include "simulation/BaseEntityCollection.h" +#include "simulation/EntityManager.h" +#include "lib/timer.h" #include "Loader.h" #include "LoaderThunks.h" #include "graphics/MapWriter.h" -#include "UnitManager.h" -#include "EntityManager.h" -#include "Projectile.h" -#include "LOSManager.h" +#include "graphics/UnitManager.h" +#include "simulation/EntityManager.h" +#include "simulation/Projectile.h" +#include "simulation/LOSManager.h" #include "graphics/GameView.h" #define LOG_CATEGORY "world" diff --git a/source/ps/World.h b/source/ps/World.h index bce6c98267..100ec0a3b7 100644 --- a/source/ps/World.h +++ b/source/ps/World.h @@ -1,7 +1,7 @@ #ifndef _ps_World_H #define _ps_World_H -#include "Terrain.h" +#include "graphics/Terrain.h" #include "ps/Errors.h" diff --git a/source/ps/XML/XML.h b/source/ps/XML/XML.h index fbb7f9a9cd..11933baf00 100644 --- a/source/ps/XML/XML.h +++ b/source/ps/XML/XML.h @@ -23,7 +23,7 @@ #define _XercesVFS_H // Temporarily undefine new, because the Xerces headers don't like it -#include "nommgr.h" +#include "lib/nommgr.h" // temporarily go down to W3 because Xerces (in addition to all its other // failings) isn't W4-clean. @@ -53,13 +53,13 @@ #pragma warning(pop) // back to W4 #endif -#include "mmgr.h" // restore malloc/new macros +#include "lib/mmgr.h" // restore malloc/new macros -#include "lib.h" +#include "lib/lib.h" #include "lib/res/handle.h" #include "lib/res/file/file.h" #include "XercesErrorHandler.h" -#include "CStr.h" +#include "ps/CStr.h" XERCES_CPP_NAMESPACE_USE diff --git a/source/ps/XML/XMLUtils.cpp b/source/ps/XML/XMLUtils.cpp index 93907361e3..917c55ca8f 100644 --- a/source/ps/XML/XMLUtils.cpp +++ b/source/ps/XML/XMLUtils.cpp @@ -1,9 +1,9 @@ #include "precompiled.h" #include "XML.h" -#include "CStr.h" -#include "CLogger.h" -#include "posix.h" // ptrdiff_t +#include "ps/CStr.h" +#include "ps/CLogger.h" +#include "lib/posix.h" // ptrdiff_t #include "lib/res/file/vfs.h" #include "lib/res/mem.h" @@ -76,10 +76,10 @@ BinInputStream *CVFSInputSource::makeStream() const { if (m_pBuffer != 0) { -#include "nommgr.h" +#include "lib/nommgr.h" return new BinMemInputStream((XMLByte *)m_pBuffer, (unsigned int)m_BufferSize, BinMemInputStream::BufOpt_Reference); -#include "mmgr.h" +#include "lib/mmgr.h" } else return NULL; @@ -100,9 +100,9 @@ const char *prevpathcomp(const char *end, const char *beginning) InputSource *CVFSEntityResolver::resolveEntity(const XMLCh *const UNUSED(publicId), const XMLCh *const systemId) { -#include "nommgr.h" +#include "lib/nommgr.h" CVFSInputSource *ret=new CVFSInputSource(); -#include "mmgr.h" +#include "lib/mmgr.h" char *path=XMLString::transcode(systemId); char *orgpath=path; diff --git a/source/ps/XML/XMLWriter.cpp b/source/ps/XML/XMLWriter.cpp index 3f36196e95..2936d11249 100644 --- a/source/ps/XML/XMLWriter.cpp +++ b/source/ps/XML/XMLWriter.cpp @@ -4,7 +4,7 @@ #include "ps/CLogger.h" #include "lib/res/file/vfs.h" -#include "self_test.h" +#include "lib/self_test.h" // TODO (maybe): Write to the VFS handle frequently, instead of buffering diff --git a/source/ps/XML/XercesErrorHandler.cpp b/source/ps/XML/XercesErrorHandler.cpp index 97c508fb54..938ca413ac 100644 --- a/source/ps/XML/XercesErrorHandler.cpp +++ b/source/ps/XML/XercesErrorHandler.cpp @@ -9,14 +9,14 @@ gee@pyro.nu // --------------------------------------------------------------------------- #include "precompiled.h" -#include "nommgr.h" +#include "lib/nommgr.h" #include "XercesErrorHandler.h" #include #include #include -#include "Pyrogenesis.h" -#include "CLogger.h" +#include "ps/Pyrogenesis.h" +#include "ps/CLogger.h" #define LOG_CATEGORY "xml" diff --git a/source/ps/XML/Xeromyces.cpp b/source/ps/XML/Xeromyces.cpp index 0efa58065d..0e45706b43 100644 --- a/source/ps/XML/Xeromyces.cpp +++ b/source/ps/XML/Xeromyces.cpp @@ -11,7 +11,7 @@ #include "Xeromyces.h" #define ZLIB_DLL -#include "zlib.h" // for crc32 +#include // for crc32 #define LOG_CATEGORY "xml" diff --git a/source/ps/XML/Xeromyces.h b/source/ps/XML/Xeromyces.h index 05c5444246..46652b095b 100644 --- a/source/ps/XML/Xeromyces.h +++ b/source/ps/XML/Xeromyces.h @@ -15,7 +15,7 @@ ERROR_TYPE(Xeromyces, XMLOpenFailed); ERROR_TYPE(Xeromyces, XMLParseError); #include "XeroXMB.h" -#include "CVFSFile.h" +#include "ps/CVFSFile.h" class CXeromyces : public XMBFile { diff --git a/source/ps/XML/tests/test_XMLWriter.h b/source/ps/XML/tests/test_XMLWriter.h index 66b216c754..1ef280af62 100644 --- a/source/ps/XML/tests/test_XMLWriter.h +++ b/source/ps/XML/tests/test_XMLWriter.h @@ -1,6 +1,6 @@ #include -#include "ps/xml/XML.h" +#include "ps/XML/XML.h" class TestXmlWriter : public CxxTest::TestSuite { diff --git a/source/ps/scripting/JSCollection.cpp b/source/ps/scripting/JSCollection.cpp index bf08b3c432..14b89749a5 100644 --- a/source/ps/scripting/JSCollection.cpp +++ b/source/ps/scripting/JSCollection.cpp @@ -1,4 +1,4 @@ #include "precompiled.h" #include "JSCollection.h" -#include "Interact.h" +#include "ps/Interact.h" diff --git a/source/ps/scripting/JSCollection.h b/source/ps/scripting/JSCollection.h index 2fc9e73db7..2831fb7b4e 100644 --- a/source/ps/scripting/JSCollection.h +++ b/source/ps/scripting/JSCollection.h @@ -4,7 +4,7 @@ // object. #include "scripting/ScriptingHost.h" -#include "scripting/JSInterface_Entity.h" +#include "simulation/scripting/JSInterface_Entity.h" #include "simulation/ScriptObject.h" #include "scripting/JSConversions.h" diff --git a/source/ps/scripting/JSInterface_Console.cpp b/source/ps/scripting/JSInterface_Console.cpp index c083928583..57e2d58add 100644 --- a/source/ps/scripting/JSInterface_Console.cpp +++ b/source/ps/scripting/JSInterface_Console.cpp @@ -4,7 +4,7 @@ #include "precompiled.h" #include "JSInterface_Console.h" -#include "CConsole.h" +#include "ps/CConsole.h" #include "scripting/JSConversions.h" extern CConsole* g_Console; diff --git a/source/ps/scripting/JSInterface_Selection.cpp b/source/ps/scripting/JSInterface_Selection.cpp index b96a343b8f..8841e58ecb 100644 --- a/source/ps/scripting/JSInterface_Selection.cpp +++ b/source/ps/scripting/JSInterface_Selection.cpp @@ -5,7 +5,7 @@ #include "precompiled.h" #include "JSInterface_Selection.h" #include "scripting/JSCollection.h" -#include "Interact.h" +#include "ps/Interact.h" JSBool JSI_Selection::getSelection( JSContext* UNUSED(cx), JSObject* UNUSED(obj), jsval UNUSED(id), jsval* vp ) diff --git a/source/renderer/FixedFunctionModelRenderer.cpp b/source/renderer/FixedFunctionModelRenderer.cpp index 02e8eeb669..2c69baaae2 100644 --- a/source/renderer/FixedFunctionModelRenderer.cpp +++ b/source/renderer/FixedFunctionModelRenderer.cpp @@ -10,9 +10,9 @@ #include "precompiled.h" -#include "ogl.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "lib/ogl.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "ps/CLogger.h" diff --git a/source/renderer/HWLightingModelRenderer.cpp b/source/renderer/HWLightingModelRenderer.cpp index 21a5c28c00..9bfb3e435c 100644 --- a/source/renderer/HWLightingModelRenderer.cpp +++ b/source/renderer/HWLightingModelRenderer.cpp @@ -10,10 +10,10 @@ #include "precompiled.h" -#include "ogl.h" +#include "lib/ogl.h" #include "lib/res/graphics/ogl_shader.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "ps/CLogger.h" diff --git a/source/renderer/InstancingModelRenderer.cpp b/source/renderer/InstancingModelRenderer.cpp index 63737b4caa..9456134966 100644 --- a/source/renderer/InstancingModelRenderer.cpp +++ b/source/renderer/InstancingModelRenderer.cpp @@ -10,10 +10,10 @@ #include "precompiled.h" -#include "ogl.h" +#include "lib/ogl.h" #include "lib/res/graphics/ogl_shader.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "ps/CLogger.h" diff --git a/source/renderer/ModelRenderer.cpp b/source/renderer/ModelRenderer.cpp index 239a42c49b..8ab617a462 100644 --- a/source/renderer/ModelRenderer.cpp +++ b/source/renderer/ModelRenderer.cpp @@ -10,9 +10,9 @@ #include "precompiled.h" -#include "ogl.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "lib/ogl.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "ps/CLogger.h" #include "ps/Profile.h" diff --git a/source/renderer/PatchRData.cpp b/source/renderer/PatchRData.cpp index 74036403af..ba8f116daf 100644 --- a/source/renderer/PatchRData.cpp +++ b/source/renderer/PatchRData.cpp @@ -3,7 +3,7 @@ #include #include -#include "Pyrogenesis.h" +#include "ps/Pyrogenesis.h" #include "lib/res/graphics/ogl_tex.h" #include "graphics/LightEnv.h" #include "Renderer.h" @@ -11,8 +11,8 @@ #include "AlphaMapCalculator.h" #include "ps/CLogger.h" #include "ps/Profile.h" -#include "MathUtil.h" -#include "LOSManager.h" +#include "maths/MathUtil.h" +#include "simulation/LOSManager.h" const int BlendOffsets[8][2] = { diff --git a/source/renderer/PatchRData.h b/source/renderer/PatchRData.h index 536f87cf8c..867e5c88ab 100644 --- a/source/renderer/PatchRData.h +++ b/source/renderer/PatchRData.h @@ -2,9 +2,9 @@ #define _PATCHRDATA_H #include -#include "Color.h" -#include "Vector3D.h" -#include "RenderableObject.h" +#include "graphics/Color.h" +#include "maths/Vector3D.h" +#include "graphics/RenderableObject.h" #include "VertexBufferManager.h" class CPatch; diff --git a/source/renderer/RenderModifiers.cpp b/source/renderer/RenderModifiers.cpp index 344a7ad848..03c6acc21e 100644 --- a/source/renderer/RenderModifiers.cpp +++ b/source/renderer/RenderModifiers.cpp @@ -10,9 +10,9 @@ #include "precompiled.h" -#include "ogl.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "lib/ogl.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "maths/Matrix3D.h" diff --git a/source/renderer/RenderPathVertexShader.cpp b/source/renderer/RenderPathVertexShader.cpp index ec04e99be8..c413fe8ff6 100644 --- a/source/renderer/RenderPathVertexShader.cpp +++ b/source/renderer/RenderPathVertexShader.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "ogl.h" +#include "lib/ogl.h" #include "lib/res/graphics/ogl_shader.h" #include "ps/CLogger.h" #include "renderer/Renderer.h" diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index 903432d288..b3e7347045 100644 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -18,25 +18,25 @@ #include #include #include "Renderer.h" -#include "Terrain.h" -#include "Matrix3D.h" -#include "MathUtil.h" -#include "Camera.h" -#include "Texture.h" -#include "LightEnv.h" -#include "Terrain.h" -#include "CLogger.h" +#include "graphics/Terrain.h" +#include "maths/Matrix3D.h" +#include "maths/MathUtil.h" +#include "graphics/Camera.h" +#include "graphics/Texture.h" +#include "graphics/LightEnv.h" +#include "graphics/Terrain.h" +#include "ps/CLogger.h" #include "ps/Game.h" -#include "Profile.h" -#include "Game.h" -#include "World.h" -#include "Player.h" -#include "LOSManager.h" +#include "ps/Profile.h" +#include "ps/Game.h" +#include "ps/World.h" +#include "ps/Player.h" +#include "simulation/LOSManager.h" -#include "Model.h" -#include "ModelDef.h" +#include "graphics/Model.h" +#include "graphics/ModelDef.h" -#include "ogl.h" +#include "lib/ogl.h" #include "lib/path_util.h" #include "lib/res/res.h" #include "lib/res/file/file.h" diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h index eebade0eda..a87090b327 100644 --- a/source/renderer/Renderer.h +++ b/source/renderer/Renderer.h @@ -14,12 +14,12 @@ #define RENDERER_H #include -#include "ogl.h" -#include "Camera.h" -#include "Frustum.h" -#include "Terrain.h" -#include "Singleton.h" -#include "Overlay.h" +#include "lib/ogl.h" +#include "graphics/Camera.h" +#include "graphics/Frustum.h" +#include "graphics/Terrain.h" +#include "ps/Singleton.h" +#include "ps/Overlay.h" #include "scripting/ScriptableObject.h" diff --git a/source/renderer/ShadowMap.cpp b/source/renderer/ShadowMap.cpp index eb1564ede9..8315fdbe6b 100644 --- a/source/renderer/ShadowMap.cpp +++ b/source/renderer/ShadowMap.cpp @@ -10,8 +10,8 @@ #include "precompiled.h" -#include "ogl.h" -#include "CLogger.h" +#include "lib/ogl.h" +#include "ps/CLogger.h" #include "graphics/LightEnv.h" diff --git a/source/renderer/ShadowMap.h b/source/renderer/ShadowMap.h index f83e1db056..a87ca51162 100644 --- a/source/renderer/ShadowMap.h +++ b/source/renderer/ShadowMap.h @@ -11,7 +11,7 @@ #ifndef SHADOWMAP_H #define SHADOWMAP_H -#include "ogl.h" +#include "lib/ogl.h" class CBound; class CMatrix3D; diff --git a/source/renderer/TransparencyRenderer.cpp b/source/renderer/TransparencyRenderer.cpp index 8690b7dafe..165bc28ca7 100644 --- a/source/renderer/TransparencyRenderer.cpp +++ b/source/renderer/TransparencyRenderer.cpp @@ -16,10 +16,10 @@ #include #include -#include "ogl.h" -#include "MathUtil.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "lib/ogl.h" +#include "maths/MathUtil.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "graphics/LightEnv.h" #include "graphics/Model.h" diff --git a/source/renderer/VertexArray.cpp b/source/renderer/VertexArray.cpp index 2f1208a6a0..5ca044bb26 100644 --- a/source/renderer/VertexArray.cpp +++ b/source/renderer/VertexArray.cpp @@ -1,8 +1,8 @@ #include "precompiled.h" -#include "ogl.h" -#include "Vector3D.h" -#include "Vector4D.h" +#include "lib/ogl.h" +#include "maths/Vector3D.h" +#include "maths/Vector4D.h" #include "graphics/Color.h" #include "renderer/VertexArray.h" #include "renderer/VertexBuffer.h" diff --git a/source/renderer/VertexBuffer.cpp b/source/renderer/VertexBuffer.cpp index b2da775647..586cd699e4 100644 --- a/source/renderer/VertexBuffer.cpp +++ b/source/renderer/VertexBuffer.cpp @@ -8,7 +8,7 @@ #include "precompiled.h" #include "ps/Errors.h" -#include "ogl.h" +#include "lib/ogl.h" #include "Renderer.h" #include "VertexBuffer.h" #include "VertexBufferManager.h" diff --git a/source/renderer/VertexBuffer.h b/source/renderer/VertexBuffer.h index fc8c0e261b..021c00cd76 100644 --- a/source/renderer/VertexBuffer.h +++ b/source/renderer/VertexBuffer.h @@ -9,7 +9,7 @@ #ifndef _VERTEXBUFFER_H #define _VERTEXBUFFER_H -#include "lib.h" +#include "lib/lib.h" #include "lib/res/graphics/ogl_tex.h" #include diff --git a/source/renderer/VertexBufferManager.cpp b/source/renderer/VertexBufferManager.cpp index 10b478be0b..a8cb418f3f 100644 --- a/source/renderer/VertexBufferManager.cpp +++ b/source/renderer/VertexBufferManager.cpp @@ -7,7 +7,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "precompiled.h" -#include "ogl.h" +#include "lib/ogl.h" #include "VertexBufferManager.h" #include "ps/CLogger.h" diff --git a/source/scripting/DOMEvent.cpp b/source/scripting/DOMEvent.cpp index 331d36e365..1b2e092651 100644 --- a/source/scripting/DOMEvent.cpp +++ b/source/scripting/DOMEvent.cpp @@ -1,8 +1,8 @@ #include "precompiled.h" #include "DOMEvent.h" -#include "timer.h" -#include "Profile.h" -#include "ScriptObject.h" +#include "lib/timer.h" +#include "ps/Profile.h" +#include "simulation/ScriptObject.h" IEventTarget::~IEventTarget() { diff --git a/source/scripting/JSConversions.cpp b/source/scripting/JSConversions.cpp index 42372ec1d2..64b0384535 100644 --- a/source/scripting/JSConversions.cpp +++ b/source/scripting/JSConversions.cpp @@ -1,10 +1,10 @@ #include "precompiled.h" #include "JSConversions.h" -#include "Entity.h" -#include "ObjectManager.h" -#include "scripting/JSInterface_Vector3D.h" -#include "Parser.h" -#include "BaseEntity.h" +#include "simulation/Entity.h" +#include "graphics/ObjectManager.h" +#include "maths/scripting/JSInterface_Vector3D.h" +#include "ps/Parser.h" +#include "simulation/BaseEntity.h" #include "lib/sysdep/sysdep.h" // finite #include diff --git a/source/scripting/JSSerialization.h b/source/scripting/JSSerialization.h index 881ecc0687..a6d7ae4276 100644 --- a/source/scripting/JSSerialization.h +++ b/source/scripting/JSSerialization.h @@ -3,9 +3,9 @@ // Mark Thompson (mark@wildfiregames.com / mot20@cam.ac.uk) // WIP, not yet functional -#include "Network/Serialization.h" +#include "ps/Network/Serialization.h" #include "JSConversions.h" -#include "CStr.h" +#include "ps/CStr.h" class jsval_ser : public ISerializable { diff --git a/source/scripting/ScriptGlue.cpp b/source/scripting/ScriptGlue.cpp index d579f128db..8c78e95c7a 100644 --- a/source/scripting/ScriptGlue.cpp +++ b/source/scripting/ScriptGlue.cpp @@ -7,36 +7,36 @@ #include "precompiled.h" #include "ScriptGlue.h" -#include "CLogger.h" -#include "CConsole.h" -#include "CStr.h" -#include "EntityHandles.h" -#include "Entity.h" -#include "EntityManager.h" +#include "ps/CLogger.h" +#include "ps/CConsole.h" +#include "ps/CStr.h" +#include "simulation/EntityHandles.h" +#include "simulation/Entity.h" +#include "simulation/EntityManager.h" -#include "BaseEntityCollection.h" -#include "EntityFormation.h" -#include "Scheduler.h" -#include "timer.h" -#include "LightEnv.h" -#include "MapWriter.h" +#include "simulation/BaseEntityCollection.h" +#include "simulation/EntityFormation.h" +#include "simulation/Scheduler.h" +#include "lib/timer.h" +#include "graphics/LightEnv.h" +#include "graphics/MapWriter.h" #include "GameEvents.h" -#include "Interact.h" -#include "Renderer.h" -#include "Game.h" -#include "LOSManager.h" -#include "Network/Server.h" -#include "Network/Client.h" +#include "ps/Interact.h" +#include "renderer/Renderer.h" +#include "ps/Game.h" +#include "simulation/LOSManager.h" +#include "ps/Network/Server.h" +#include "ps/Network/Client.h" #include "gui/CGUI.h" #include "ps/i18n.h" -#include "scripting/JSInterface_Entity.h" -#include "scripting/JSCollection.h" -#include "scripting/JSInterface_BaseEntity.h" -#include "scripting/JSInterface_Vector3D.h" -#include "scripting/JSInterface_Selection.h" -#include "scripting/JSInterface_Camera.h" -#include "scripting/JSInterface_Console.h" -#include "scripting/JSInterface_VFS.h" +#include "simulation/scripting/JSInterface_Entity.h" +#include "ps/scripting/JSCollection.h" +#include "simulation/scripting/JSInterface_BaseEntity.h" +#include "maths/scripting/JSInterface_Vector3D.h" +#include "ps/scripting/JSInterface_Selection.h" +#include "graphics/scripting/JSInterface_Camera.h" +#include "ps/scripting/JSInterface_Console.h" +#include "ps/scripting/JSInterface_VFS.h" #include "simulation/Simulation.h" #include "graphics/GameView.h" #include "graphics/scripting/JSInterface_LightEnv.h" diff --git a/source/scripting/ScriptableComplex.h b/source/scripting/ScriptableComplex.h index 45c66f48ce..84e48a0f47 100644 --- a/source/scripting/ScriptableComplex.h +++ b/source/scripting/ScriptableComplex.h @@ -928,9 +928,9 @@ public: { DeletePreviouslyAssignedProperty( PropertyName ); void* mem = jscomplexproperty_suballoc(); -#include "nommgr.h" +#include "lib/nommgr.h" CJSDynamicComplexProperty* newProp = new(mem) CJSValComplexProperty( Value, false ); -#include "mmgr.h" +#include "lib/mmgr.h" m_Properties[PropertyName] = newProp; ReflectorTable::iterator it; @@ -993,18 +993,18 @@ public: { DeletePreviouslyAssignedProperty( PropertyName ); void* mem = jscomplexproperty_suballoc(); -#include "nommgr.h" +#include "lib/nommgr.h" m_Properties[PropertyName] = new(mem) CJSComplexProperty( Native, PropAllowInheritance, Update, Refresh ); -#include "mmgr.h" +#include "lib/mmgr.h" } // PropertyName must not already exist! (verified in non-final release) template void AddReadOnlyProperty( CStrW PropertyName, PropType* Native, bool PropAllowInheritance = true, NotifyFn Update = NULL, NotifyFn Refresh = NULL ) { DeletePreviouslyAssignedProperty( PropertyName ); void* mem = jscomplexproperty_suballoc(); -#include "nommgr.h" +#include "lib/nommgr.h" m_Properties[PropertyName] = new(mem) CJSComplexProperty( Native, PropAllowInheritance, Update, Refresh ); -#include "mmgr.h" +#include "lib/mmgr.h" } }; diff --git a/source/scripting/ScriptingHost.cpp b/source/scripting/ScriptingHost.cpp index 72f1ba35a8..5ed93238f8 100644 --- a/source/scripting/ScriptingHost.cpp +++ b/source/scripting/ScriptingHost.cpp @@ -4,8 +4,8 @@ #include "ScriptingHost.h" #include "ScriptGlue.h" -#include "CConsole.h" -#include "Profile.h" +#include "ps/CConsole.h" +#include "ps/Profile.h" #include "ps/CLogger.h" #include "lib/res/res.h" diff --git a/source/scripting/ScriptingHost.h b/source/scripting/ScriptingHost.h index a0547bdcc6..dc14b0f60b 100644 --- a/source/scripting/ScriptingHost.h +++ b/source/scripting/ScriptingHost.h @@ -28,8 +28,8 @@ ERROR_TYPE(Scripting_DefineType, CreationFailed); #include #include -#include "Singleton.h" -#include "CStr.h" +#include "ps/Singleton.h" +#include "ps/CStr.h" class IPropertyOwner { diff --git a/source/scripting/SpiderMonkey.h b/source/scripting/SpiderMonkey.h index 6ceec4591c..58bed35704 100644 --- a/source/scripting/SpiderMonkey.h +++ b/source/scripting/SpiderMonkey.h @@ -12,7 +12,7 @@ // jstypes.h (included via jsapi.h) requires we define // "one of XP_BEOS, XP_MAC, XP_OS2, XP_WIN or XP_UNIX". -#include "config.h" +#include "lib/config.h" #if OS_WIN # define XP_WIN #elif OS_MAC diff --git a/source/scripting/SynchedJSObject.cpp b/source/scripting/SynchedJSObject.cpp index 72830d4acc..5525eb26b1 100644 --- a/source/scripting/SynchedJSObject.cpp +++ b/source/scripting/SynchedJSObject.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "SynchedJSObject.h" -#include "Parser.h" +#include "ps/Parser.h" #include "ScriptCustomTypes.h" template <> diff --git a/source/scripting/SynchedJSObject.h b/source/scripting/SynchedJSObject.h index 83ef802a67..8f7b69a9de 100644 --- a/source/scripting/SynchedJSObject.h +++ b/source/scripting/SynchedJSObject.h @@ -35,7 +35,7 @@ #ifndef _SynchedJSObject_H #define _SynchedJSObject_H -#include "CStr.h" +#include "ps/CStr.h" #include "ScriptableObject.h" template diff --git a/source/simulation/AStarEngine.cpp b/source/simulation/AStarEngine.cpp index d226855de2..64368c7b02 100644 --- a/source/simulation/AStarEngine.cpp +++ b/source/simulation/AStarEngine.cpp @@ -7,7 +7,7 @@ #include "ps/Game.h" #include "ps/World.h" -#include "Profile.h" +#include "ps/Profile.h" #define DEFAULT_SEARCH_LIMIT 1000 #define DEFAULT_INIT_NODES 1000 diff --git a/source/simulation/AStarEngine.h b/source/simulation/AStarEngine.h index 85b12e952a..aeafb52b24 100644 --- a/source/simulation/AStarEngine.h +++ b/source/simulation/AStarEngine.h @@ -2,7 +2,7 @@ #define __ASTAR_ENGINE_H__ #include "Vector2D.h" -#include "Player.h" +#include "ps/Player.h" #include "lib/types.h" #include diff --git a/source/simulation/BaseEntity.cpp b/source/simulation/BaseEntity.cpp index baebbae528..d6b6900430 100644 --- a/source/simulation/BaseEntity.cpp +++ b/source/simulation/BaseEntity.cpp @@ -2,13 +2,13 @@ #include "BaseEntity.h" #include "BaseEntityCollection.h" -#include "ObjectManager.h" -#include "CStr.h" -#include "Player.h" +#include "graphics/ObjectManager.h" +#include "ps/CStr.h" +#include "ps/Player.h" #include "ps/XML/Xeromyces.h" -#include "CLogger.h" +#include "ps/CLogger.h" #define LOG_CATEGORY "entity" STL_HASH_SET CBaseEntity::scriptsLoaded; diff --git a/source/simulation/BaseEntity.h b/source/simulation/BaseEntity.h index 5dc046c518..30c56b1fa9 100644 --- a/source/simulation/BaseEntity.h +++ b/source/simulation/BaseEntity.h @@ -17,15 +17,15 @@ #ifndef BASE_ENTITY_INCLUDED #define BASE_ENTITY_INCLUDED -#include "CStr.h" -#include "ObjectEntry.h" +#include "ps/CStr.h" +#include "graphics/ObjectEntry.h" #include "scripting/ScriptableComplex.h" #include "BoundingObjects.h" #include "EventHandlers.h" #include "EntitySupport.h" #include "ScriptObject.h" -#include "XML/Xeromyces.h" +#include "ps/XML/Xeromyces.h" class CPlayer; diff --git a/source/simulation/BaseEntityCollection.cpp b/source/simulation/BaseEntityCollection.cpp index 5fc2f68efc..5f044954ec 100644 --- a/source/simulation/BaseEntityCollection.cpp +++ b/source/simulation/BaseEntityCollection.cpp @@ -1,11 +1,11 @@ #include "precompiled.h" #include "BaseEntityCollection.h" -#include "ObjectManager.h" -#include "Model.h" -#include "CLogger.h" -#include "VFSUtil.h" -#include "Player.h" +#include "graphics/ObjectManager.h" +#include "graphics/Model.h" +#include "ps/CLogger.h" +#include "ps/VFSUtil.h" +#include "ps/Player.h" #define LOG_CATEGORY "entity" diff --git a/source/simulation/BaseEntityCollection.h b/source/simulation/BaseEntityCollection.h index 084c271f0f..1d2be12498 100644 --- a/source/simulation/BaseEntityCollection.h +++ b/source/simulation/BaseEntityCollection.h @@ -20,11 +20,11 @@ #include #include -#include "CStr.h" -#include "Singleton.h" -#include "ObjectEntry.h" +#include "ps/CStr.h" +#include "ps/Singleton.h" +#include "graphics/ObjectEntry.h" #include "BaseEntity.h" -#include "Game.h" +#include "ps/Game.h" #define g_EntityTemplateCollection CBaseEntityCollection::GetSingleton() #define NULL_PLAYER (PS_MAX_PLAYERS+1) diff --git a/source/simulation/BaseFormation.cpp b/source/simulation/BaseFormation.cpp index a337c1253b..86eeac9b13 100644 --- a/source/simulation/BaseFormation.cpp +++ b/source/simulation/BaseFormation.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "BaseFormation.h" -#include "CLogger.h" -#include "CStr.h" +#include "ps/CLogger.h" +#include "ps/CStr.h" #include "maths/MathUtil.h" #define LOG_CATEGORY "Formation" diff --git a/source/simulation/BaseFormation.h b/source/simulation/BaseFormation.h index 11e1921a9b..b25cbe895a 100644 --- a/source/simulation/BaseFormation.h +++ b/source/simulation/BaseFormation.h @@ -7,7 +7,7 @@ #include #include -#include "XML/Xeromyces.h" +#include "ps/XML/Xeromyces.h" class CStr; diff --git a/source/simulation/BaseFormationCollection.cpp b/source/simulation/BaseFormationCollection.cpp index c1727bff6e..53d17818de 100644 --- a/source/simulation/BaseFormationCollection.cpp +++ b/source/simulation/BaseFormationCollection.cpp @@ -1,10 +1,10 @@ #include "precompiled.h" #include "BaseFormationCollection.h" -#include "ObjectManager.h" -#include "Model.h" -#include "CLogger.h" -#include "VFSUtil.h" +#include "graphics/ObjectManager.h" +#include "graphics/Model.h" +#include "ps/CLogger.h" +#include "ps/VFSUtil.h" #define LOG_CATEGORY "formation" diff --git a/source/simulation/BaseFormationCollection.h b/source/simulation/BaseFormationCollection.h index 7f3b84c647..e6e599c6ef 100644 --- a/source/simulation/BaseFormationCollection.h +++ b/source/simulation/BaseFormationCollection.h @@ -9,8 +9,8 @@ #define BASEFORM_COLLECTION_INCLUDED #include -#include "CStr.h" -#include "Singleton.h" +#include "ps/CStr.h" +#include "ps/Singleton.h" #include "BaseFormation.h" #define g_EntityFormationCollection CBaseFormationCollection::GetSingleton() diff --git a/source/simulation/BoundingObjects.cpp b/source/simulation/BoundingObjects.cpp index 7014dd931b..5aba5c41e8 100644 --- a/source/simulation/BoundingObjects.cpp +++ b/source/simulation/BoundingObjects.cpp @@ -1,8 +1,8 @@ #include "precompiled.h" #include "BoundingObjects.h" -#include "ogl.h" -#include "MathUtil.h" +#include "lib/ogl.h" +#include "maths/MathUtil.h" bool CBoundingObject::intersects( CBoundingObject* obj ) { diff --git a/source/simulation/BoundingObjects.h b/source/simulation/BoundingObjects.h index d1018f2428..846d4bef74 100644 --- a/source/simulation/BoundingObjects.h +++ b/source/simulation/BoundingObjects.h @@ -9,7 +9,7 @@ #ifndef BOUNDING_OBJECTS_INCLUDED #define BOUNDING_OBJECTS_INCLUDED -#include "Vector2D.h" +#include "ps/Vector2D.h" class CBoundingBox; class CBoundingCircle; diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp index 046607d014..84bd35c384 100644 --- a/source/simulation/Entity.cpp +++ b/source/simulation/Entity.cpp @@ -2,24 +2,24 @@ #include "precompiled.h" -#include "Profile.h" +#include "ps/Profile.h" #include "Entity.h" #include "EntityManager.h" #include "BaseEntityCollection.h" -#include "Unit.h" +#include "graphics/Unit.h" #include "Aura.h" #include "ProductionQueue.h" -#include "Renderer.h" -#include "Model.h" -#include "Terrain.h" -#include "Interact.h" +#include "renderer/Renderer.h" +#include "graphics/Model.h" +#include "graphics/Terrain.h" +#include "ps/Interact.h" #include "Collision.h" #include "PathfindEngine.h" -#include "Game.h" -#include "scripting/JSInterface_Vector3D.h" -#include "MathUtil.h" -#include "CConsole.h" +#include "ps/Game.h" +#include "maths/scripting/JSInterface_Vector3D.h" +#include "maths/MathUtil.h" +#include "ps/CConsole.h" #include "renderer/WaterManager.h" #include "EntityFormation.h" #include "simulation/FormationManager.h" diff --git a/source/simulation/Entity.h b/source/simulation/Entity.h index 67b5022ef5..39f6a4a739 100644 --- a/source/simulation/Entity.h +++ b/source/simulation/Entity.h @@ -28,16 +28,16 @@ #include #include "scripting/ScriptableComplex.h" -#include "Player.h" -#include "Vector2D.h" -#include "Vector3D.h" -#include "UnitManager.h" +#include "ps/Player.h" +#include "ps/Vector2D.h" +#include "maths/Vector3D.h" +#include "graphics/UnitManager.h" #include "EntityOrders.h" #include "EntityHandles.h" #include "EntityMessage.h" #include "EventHandlers.h" #include "ScriptObject.h" -#include "ObjectEntry.h" +#include "graphics/ObjectEntry.h" #include "EntitySupport.h" class CBaseEntity; diff --git a/source/simulation/EntityHandles.cpp b/source/simulation/EntityHandles.cpp index f35aaf372c..9bc2702232 100644 --- a/source/simulation/EntityHandles.cpp +++ b/source/simulation/EntityHandles.cpp @@ -2,7 +2,7 @@ #include "EntityHandles.h" #include "EntityManager.h" -#include "CStr.h" +#include "ps/CStr.h" CHandle::CHandle() { diff --git a/source/simulation/EntityHandles.h b/source/simulation/EntityHandles.h index 693c9573a1..6c53cd9704 100644 --- a/source/simulation/EntityHandles.h +++ b/source/simulation/EntityHandles.h @@ -21,7 +21,7 @@ #define ENTITY_HANDLE_INCLUDED #include "lib/types.h" -#include "Network/Serialization.h" +#include "ps/Network/Serialization.h" #define INVALID_HANDLE 65535 // The maximum numerical value of an entity handle sent over the network diff --git a/source/simulation/EntityManager.cpp b/source/simulation/EntityManager.cpp index 12b871cf33..c5f7077a46 100644 --- a/source/simulation/EntityManager.cpp +++ b/source/simulation/EntityManager.cpp @@ -3,11 +3,11 @@ #include "EntityManager.h" #include "BaseEntityCollection.h" -#include "ConfigDB.h" -#include "Profile.h" -#include "Terrain.h" -#include "Game.h" -#include "MathUtil.h" +#include "ps/ConfigDB.h" +#include "ps/Profile.h" +#include "graphics/Terrain.h" +#include "ps/Game.h" +#include "maths/MathUtil.h" int SELECTION_CIRCLE_POINTS; int SELECTION_BOX_POINTS; int SELECTION_SMOOTHNESS_UNIFIED = 9; diff --git a/source/simulation/EntityManager.h b/source/simulation/EntityManager.h index 7a747c3194..a01715e1de 100644 --- a/source/simulation/EntityManager.h +++ b/source/simulation/EntityManager.h @@ -18,7 +18,7 @@ #ifndef ENTITY_MANAGER_INCLUDED #define ENTITY_MANAGER_INCLUDED -#include "Singleton.h" +#include "ps/Singleton.h" #include "Entity.h" #include "EntityHandles.h" #include "EntityPredicate.h" diff --git a/source/simulation/EntityOrders.h b/source/simulation/EntityOrders.h index 788e143670..b63399e43f 100644 --- a/source/simulation/EntityOrders.h +++ b/source/simulation/EntityOrders.h @@ -37,7 +37,7 @@ #define ORDER_MAX_DATA 2 #include "EntityHandles.h" -#include "Vector2D.h" +#include "ps/Vector2D.h" #include "scripting/DOMEvent.h" // An order data field, which could represent different things depending on the type of order. diff --git a/source/simulation/EntityProperties.cpp b/source/simulation/EntityProperties.cpp index c9a5a62829..12948884bf 100644 --- a/source/simulation/EntityProperties.cpp +++ b/source/simulation/EntityProperties.cpp @@ -3,7 +3,7 @@ /* #include "EntityProperties.h" #include "BaseEntityCollection.h" -#include "scripting/JSInterface_BaseEntity.h" +#include "simulation/scripting/JSInterface_BaseEntity.h" #undef new // to avoid confusing warnings diff --git a/source/simulation/EntityProperties.h b/source/simulation/EntityProperties.h index 5556cb3085..fda1013740 100644 --- a/source/simulation/EntityProperties.h +++ b/source/simulation/EntityProperties.h @@ -15,12 +15,12 @@ #ifndef ENTITY_PROPERTIES_INCLUDED #define ENTITY_PROPERTIES_INCLUDED -#include "CStr.h" -#include "Vector3D.h" +#include "ps/CStr.h" +#include "maths/Vector3D.h" #include "ScriptObject.h" -#include "scripting/JSInterface_Entity.h" -#include "scripting/JSInterface_Vector3D.h" +#include "simulation/scripting/JSInterface_Entity.h" +#include "maths/scripting/JSInterface_Vector3D.h" #if !GCC_VERSION diff --git a/source/simulation/EntityStateProcessing.cpp b/source/simulation/EntityStateProcessing.cpp index 27b5cca6d3..ecf56a05dc 100644 --- a/source/simulation/EntityStateProcessing.cpp +++ b/source/simulation/EntityStateProcessing.cpp @@ -4,17 +4,17 @@ #include "Entity.h" #include "BaseEntity.h" -#include "Model.h" -#include "ObjectEntry.h" -#include "SkeletonAnim.h" -#include "SkeletonAnimDef.h" // Animation duration -#include "Unit.h" +#include "graphics/Model.h" +#include "graphics/ObjectEntry.h" +#include "graphics/SkeletonAnim.h" +#include "graphics/SkeletonAnimDef.h" // Animation duration +#include "graphics/Unit.h" #include "ProductionQueue.h" -#include "MathUtil.h" +#include "maths/MathUtil.h" #include "Collision.h" #include "PathfindEngine.h" -#include "Terrain.h" +#include "graphics/Terrain.h" #include "ps/Game.h" #include "ps/World.h" diff --git a/source/simulation/EventHandlers.h b/source/simulation/EventHandlers.h index 9a8450a076..43190528e6 100644 --- a/source/simulation/EventHandlers.h +++ b/source/simulation/EventHandlers.h @@ -6,7 +6,7 @@ #define EVENT_HANDLERS_INCLUDED #include "scripting/DOMEvent.h" -#include "Vector3D.h" +#include "maths/Vector3D.h" #include "EntityOrders.h" class CEventInitialize : public CScriptEvent diff --git a/source/simulation/FormationManager.cpp b/source/simulation/FormationManager.cpp index ca9e33cff6..54a416a383 100644 --- a/source/simulation/FormationManager.cpp +++ b/source/simulation/FormationManager.cpp @@ -2,7 +2,7 @@ #include "FormationManager.h" #include "Entity.h" -#include "CStr.h" +#include "ps/CStr.h" #include "BaseFormation.h" #include "EntityFormation.h" diff --git a/source/simulation/LOSManager.cpp b/source/simulation/LOSManager.cpp index 20492306eb..69bee4deaf 100644 --- a/source/simulation/LOSManager.cpp +++ b/source/simulation/LOSManager.cpp @@ -2,16 +2,16 @@ #include "LOSManager.h" -#include "Game.h" -#include "Player.h" -#include "Terrain.h" +#include "ps/Game.h" +#include "ps/Player.h" +#include "graphics/Terrain.h" #include "Entity.h" #include "EntityManager.h" -#include "Unit.h" -#include "Bound.h" -#include "Model.h" +#include "graphics/Unit.h" +#include "maths/Bound.h" +#include "graphics/Model.h" #include "lib/allocators.h" -#include "timer.h" +#include "lib/timer.h" using namespace std; diff --git a/source/simulation/LOSManager.h b/source/simulation/LOSManager.h index f4038fa6fa..6d58ea232c 100644 --- a/source/simulation/LOSManager.h +++ b/source/simulation/LOSManager.h @@ -16,10 +16,10 @@ #ifndef LOS_MANAGER_INCLUDED #define LOS_MANAGER_INCLUDED -#include "Singleton.h" -#include "Game.h" -#include "World.h" -#include "Player.h" +#include "ps/Singleton.h" +#include "ps/Game.h" +#include "ps/World.h" +#include "ps/Player.h" class CUnit; class CPlayer; diff --git a/source/simulation/PathfindEngine.cpp b/source/simulation/PathfindEngine.cpp index b0cd583382..addf568cca 100644 --- a/source/simulation/PathfindEngine.cpp +++ b/source/simulation/PathfindEngine.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "Profile.h" +#include "ps/Profile.h" #include "EntityOrders.h" #include "Entity.h" diff --git a/source/simulation/PathfindEngine.h b/source/simulation/PathfindEngine.h index ac9a95b69a..15e235509e 100644 --- a/source/simulation/PathfindEngine.h +++ b/source/simulation/PathfindEngine.h @@ -11,7 +11,7 @@ #ifndef PATHFIND_ENGINE_INCLUDED #define PATHFIND_ENGINE_INCLUDED -#include "Singleton.h" +#include "ps/Singleton.h" #include "EntityHandles.h" #include "Vector2D.h" #include "AStarEngine.h" diff --git a/source/simulation/PathfindSparse.cpp b/source/simulation/PathfindSparse.cpp index cd746f6eac..389e52889b 100644 --- a/source/simulation/PathfindSparse.cpp +++ b/source/simulation/PathfindSparse.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "PathfindSparse.h" -#include "Terrain.h" +#include "graphics/Terrain.h" #include "ps/Game.h" #include "ps/World.h" diff --git a/source/simulation/Projectile.cpp b/source/simulation/Projectile.cpp index 4a3d461c4e..07dd9e4096 100644 --- a/source/simulation/Projectile.cpp +++ b/source/simulation/Projectile.cpp @@ -2,14 +2,14 @@ #include "Projectile.h" #include "Entity.h" -#include "Model.h" -#include "Unit.h" -#include "Matrix3D.h" +#include "graphics/Model.h" +#include "graphics/Unit.h" +#include "maths/Matrix3D.h" #include "ScriptObject.h" -#include "Game.h" +#include "ps/Game.h" #include "Collision.h" -#include "ObjectManager.h" -#include "CLogger.h" +#include "graphics/ObjectManager.h" +#include "ps/CLogger.h" const double GRAVITY = 0.00001; const double GRAVITY_2 = GRAVITY * 0.5; diff --git a/source/simulation/Projectile.h b/source/simulation/Projectile.h index 124e5585ee..b9a7d4ff9d 100644 --- a/source/simulation/Projectile.h +++ b/source/simulation/Projectile.h @@ -7,9 +7,9 @@ #ifndef PROJECTILE_INCLUDED #define PROJECTILE_INCLUDED -#include "Vector3D.h" -#include "Vector2D.h" -#include "Singleton.h" +#include "maths/Vector3D.h" +#include "ps/Vector2D.h" +#include "ps/Singleton.h" #include "scripting/ScriptableObject.h" #include "scripting/DOMEvent.h" #include "ScriptObject.h" diff --git a/source/simulation/Scheduler.h b/source/simulation/Scheduler.h index d8de48653d..97d2c6a37c 100644 --- a/source/simulation/Scheduler.h +++ b/source/simulation/Scheduler.h @@ -14,8 +14,8 @@ #include "EntityMessage.h" #include "EntityHandles.h" -#include "Singleton.h" -#include "CStr.h" +#include "ps/Singleton.h" +#include "ps/CStr.h" #include "scripting/ScriptableObject.h" class CJSProgressTimer; diff --git a/source/simulation/ScriptObject.h b/source/simulation/ScriptObject.h index 8e6ca77ff1..53e61af673 100644 --- a/source/simulation/ScriptObject.h +++ b/source/simulation/ScriptObject.h @@ -6,10 +6,10 @@ #ifndef SCRIPTOBJECT_INCLUDED #define SCRIPTOBJECT_INCLUDED -#include "CStr.h" +#include "ps/CStr.h" #include "scripting/ScriptingHost.h" #include "EntityHandles.h" -#include "scripting/JSInterface_Entity.h" +#include "simulation/scripting/JSInterface_Entity.h" #include "scripting/DOMEvent.h" class CScriptObject diff --git a/source/simulation/Simulation.cpp b/source/simulation/Simulation.cpp index 59a33be803..dd674f9efa 100644 --- a/source/simulation/Simulation.cpp +++ b/source/simulation/Simulation.cpp @@ -2,24 +2,24 @@ #include -#include -#include "Profile.h" +#include "lib/timer.h" +#include "ps/Profile.h" #include "Simulation.h" #include "TurnManager.h" -#include "Game.h" +#include "ps/Game.h" #include "EntityManager.h" #include "Projectile.h" #include "Scheduler.h" -#include "Network/NetMessage.h" -#include "CLogger.h" -#include "CConsole.h" -#include "Unit.h" -#include "Model.h" +#include "ps/Network/NetMessage.h" +#include "ps/CLogger.h" +#include "ps/CConsole.h" +#include "graphics/Unit.h" +#include "graphics/Model.h" #include "LOSManager.h" -#include "Loader.h" -#include "LoaderThunks.h" -#include "GameAttributes.h" +#include "ps/Loader.h" +#include "ps/LoaderThunks.h" +#include "ps/GameAttributes.h" #include "renderer/Renderer.h" #include "renderer/WaterManager.h" #include "EntityFormation.h" diff --git a/source/simulation/TurnManager.cpp b/source/simulation/TurnManager.cpp index 48dd31470c..585f2a860f 100644 --- a/source/simulation/TurnManager.cpp +++ b/source/simulation/TurnManager.cpp @@ -1,10 +1,10 @@ #include "precompiled.h" #include "TurnManager.h" -#include "Network/NetMessage.h" -#include "Network/Network.h" -#include "GameRecord.h" -#include "CLogger.h" +#include "ps/Network/NetMessage.h" +#include "ps/Network/Network.h" +#include "ps/GameRecord.h" +#include "ps/CLogger.h" #include diff --git a/source/simulation/scripting/JSInterface_BaseEntity.cpp b/source/simulation/scripting/JSInterface_BaseEntity.cpp index c145af0f80..fa434b5e0d 100644 --- a/source/simulation/scripting/JSInterface_BaseEntity.cpp +++ b/source/simulation/scripting/JSInterface_BaseEntity.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" #include "JSInterface_BaseEntity.h" -#include "BaseEntity.h" -#include "EntityHandles.h" +#include "simulation/BaseEntity.h" +#include "simulation/EntityHandles.h" diff --git a/source/simulation/scripting/JSInterface_Entity.cpp b/source/simulation/scripting/JSInterface_Entity.cpp index 059ba0f347..f5d48e8de1 100644 --- a/source/simulation/scripting/JSInterface_Entity.cpp +++ b/source/simulation/scripting/JSInterface_Entity.cpp @@ -2,13 +2,13 @@ #include "JSInterface_Entity.h" #include "scripting/JSInterface_BaseEntity.h" -#include "scripting/JSInterface_Vector3D.h" -#include "EntityHandles.h" -#include "Entity.h" -#include "EntityManager.h" -#include "BaseEntityCollection.h" -#include "CConsole.h" -#include "Scheduler.h" +#include "maths/scripting/JSInterface_Vector3D.h" +#include "simulation/EntityHandles.h" +#include "simulation/Entity.h" +#include "simulation/EntityManager.h" +#include "simulation/BaseEntityCollection.h" +#include "ps/CConsole.h" +#include "simulation/Scheduler.h" /* JSClass JSI_Entity::JSI_class = { diff --git a/source/sound/CMusicPlayer.cpp b/source/sound/CMusicPlayer.cpp index a3c7bbae89..541b8c1ca5 100644 --- a/source/sound/CMusicPlayer.cpp +++ b/source/sound/CMusicPlayer.cpp @@ -1,12 +1,12 @@ #include "precompiled.h" #include "CMusicPlayer.h" -#include +#include "CLogger.h" #include #include -#include +#include "lib/res/res.h" #define LOG_CATEGORY "audio" diff --git a/source/sound/JSI_Sound.cpp b/source/sound/JSI_Sound.cpp index bc36254846..166f81912b 100644 --- a/source/sound/JSI_Sound.cpp +++ b/source/sound/JSI_Sound.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" #include "JSI_Sound.h" -#include "Vector3D.h" +#include "maths/Vector3D.h" #include "lib/res/sound/snd_mgr.h" #include "lib/res/h_mgr.h" // h_filename