From 77196dbe0682dce92c1592c20afe823ffb8fb19b Mon Sep 17 00:00:00 2001 From: janwas Date: Tue, 7 Dec 2004 02:04:38 +0000 Subject: [PATCH] less dependencies on res/res.h in headers (a bad thing) => less recompiles when I change vfs.h :) This was SVN commit r1467. --- source/graphics/HFTracer.h | 2 -- source/graphics/MapReader.h | 1 + source/graphics/MiniPatch.h | 2 +- source/graphics/RenderableObject.h | 1 - source/graphics/Texture.h | 2 +- source/graphics/TextureEntry.h | 2 +- source/graphics/TextureManager.cpp | 2 +- source/ps/FilePacker.h | 2 +- source/ps/FileUnpacker.cpp | 2 +- source/ps/FileUnpacker.h | 2 +- source/renderer/ModelRData.h | 1 - source/renderer/PatchRData.h | 1 - source/renderer/Renderer.h | 1 - source/simulation/BaseEntityCollection.cpp | 1 + source/sound/CMusicPlayer.cpp | 2 ++ source/sound/CMusicPlayer.h | 1 - 16 files changed, 11 insertions(+), 14 deletions(-) diff --git a/source/graphics/HFTracer.h b/source/graphics/HFTracer.h index 81581713de..de3d3169a2 100755 --- a/source/graphics/HFTracer.h +++ b/source/graphics/HFTracer.h @@ -12,8 +12,6 @@ class CVector3D; class CTerrain; -#include "res/res.h" - /////////////////////////////////////////////////////////////////////////////// // CHFTracer: a class for determining ray intersections with a heightfield class CHFTracer diff --git a/source/graphics/MapReader.h b/source/graphics/MapReader.h index 90dcd2e666..09eb8d346c 100755 --- a/source/graphics/MapReader.h +++ b/source/graphics/MapReader.h @@ -2,6 +2,7 @@ #define _MAPREADER_H #include "MapIO.h" +#include "res/handle.h" #include "CStr.h" #include "LightEnv.h" #include "FileUnpacker.h" diff --git a/source/graphics/MiniPatch.h b/source/graphics/MiniPatch.h index 36a3eb7fa3..c923569569 100755 --- a/source/graphics/MiniPatch.h +++ b/source/graphics/MiniPatch.h @@ -9,7 +9,7 @@ #ifndef _MINIPATCH_H #define _MINIPATCH_H -#include "res/res.h" +#include "res/handle.h" class CPatch; diff --git a/source/graphics/RenderableObject.h b/source/graphics/RenderableObject.h index 8cd264e3d4..5c92190ccf 100755 --- a/source/graphics/RenderableObject.h +++ b/source/graphics/RenderableObject.h @@ -10,7 +10,6 @@ #define _RENDERABLEOBJECT_H #include -#include "res/res.h" #include "Bound.h" #include "Matrix3D.h" diff --git a/source/graphics/Texture.h b/source/graphics/Texture.h index e48a73e279..aebc380b85 100755 --- a/source/graphics/Texture.h +++ b/source/graphics/Texture.h @@ -12,7 +12,7 @@ #ifndef _TEXTURE_H #define _TEXTURE_H -#include "res/res.h" +#include "res/handle.h" #include "CStr.h" class CTexture diff --git a/source/graphics/TextureEntry.h b/source/graphics/TextureEntry.h index e05101d54b..0ad3786e06 100755 --- a/source/graphics/TextureEntry.h +++ b/source/graphics/TextureEntry.h @@ -1,7 +1,7 @@ #ifndef _TEXTUREENTRY_H #define _TEXTUREENTRY_H -#include "res/res.h" +#include "res/handle.h" #include "CStr.h" ////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/graphics/TextureManager.cpp b/source/graphics/TextureManager.cpp index 600e42680d..789f49294c 100755 --- a/source/graphics/TextureManager.cpp +++ b/source/graphics/TextureManager.cpp @@ -3,7 +3,7 @@ #include #include "TextureManager.h" -#include "lib.h" +#include "res/res.h" #include "ogl.h" #include "res/ogl_tex.h" #include "CLogger.h" diff --git a/source/ps/FilePacker.h b/source/ps/FilePacker.h index 0a0724e521..f8566dfb1f 100755 --- a/source/ps/FilePacker.h +++ b/source/ps/FilePacker.h @@ -10,7 +10,7 @@ #define _FILEPACKER_H #include -#include "res/res.h" +#include "lib/types.h" #include "CStr.h" //////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/ps/FileUnpacker.cpp b/source/ps/FileUnpacker.cpp index 208ba70ef3..98e3267691 100755 --- a/source/ps/FileUnpacker.cpp +++ b/source/ps/FileUnpacker.cpp @@ -9,7 +9,7 @@ #include "precompiled.h" #include "FileUnpacker.h" -#include "res/vfs.h" +#include "res/res.h" //////////////////////////////////////////////////////////////////////////////////////// // CFileUnpacker constructor diff --git a/source/ps/FileUnpacker.h b/source/ps/FileUnpacker.h index 439aa48ee5..4a869e691a 100755 --- a/source/ps/FileUnpacker.h +++ b/source/ps/FileUnpacker.h @@ -10,7 +10,7 @@ #define _FILEUNPACKER_H #include -#include "res/res.h" +#include "types.h" #include "CStr.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/source/renderer/ModelRData.h b/source/renderer/ModelRData.h index baa4ca1e21..8d62a94077 100755 --- a/source/renderer/ModelRData.h +++ b/source/renderer/ModelRData.h @@ -2,7 +2,6 @@ #define _MODELRDATA_H #include -#include "res/res.h" #include "Vector3D.h" #include "Color.h" #include "RenderableObject.h" diff --git a/source/renderer/PatchRData.h b/source/renderer/PatchRData.h index 5dbeaa7a96..088629f94b 100755 --- a/source/renderer/PatchRData.h +++ b/source/renderer/PatchRData.h @@ -2,7 +2,6 @@ #define _PATCHRDATA_H #include -#include "res/res.h" #include "Color.h" #include "Vector3D.h" #include "RenderableObject.h" diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h index 1d2ab387d3..f5bc198a2b 100755 --- a/source/renderer/Renderer.h +++ b/source/renderer/Renderer.h @@ -14,7 +14,6 @@ #define RENDERER_H #include -#include "res/res.h" #include "ogl.h" #include "Camera.h" #include "Frustum.h" diff --git a/source/simulation/BaseEntityCollection.cpp b/source/simulation/BaseEntityCollection.cpp index e84d2d54d8..924f7bdc68 100755 --- a/source/simulation/BaseEntityCollection.cpp +++ b/source/simulation/BaseEntityCollection.cpp @@ -4,6 +4,7 @@ #include "ObjectManager.h" #include "Model.h" #include "CLogger.h" +#include "res/res.h" #define LOG_CATEGORY "entity" diff --git a/source/sound/CMusicPlayer.cpp b/source/sound/CMusicPlayer.cpp index 8e01bdc641..3fcac3e121 100755 --- a/source/sound/CMusicPlayer.cpp +++ b/source/sound/CMusicPlayer.cpp @@ -6,6 +6,8 @@ #include #include +#include + #define LOG_CATEGORY "audio" diff --git a/source/sound/CMusicPlayer.h b/source/sound/CMusicPlayer.h index 8559e6ac2f..df345b3f0f 100755 --- a/source/sound/CMusicPlayer.h +++ b/source/sound/CMusicPlayer.h @@ -13,7 +13,6 @@ #include */ -#include "res/res.h" /* struct SOggFile {