less dependencies on res/res.h in headers (a bad thing) => less recompiles when I change vfs.h :)

This was SVN commit r1467.
2004-12-07 02:04:38 +00:00 · 2004-12-07 02:04:38 +00:00 · 77196dbe06
commit 77196dbe06
parent e76871e7b0
16 changed files with 11 additions and 14 deletions
--- 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
--- 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"
--- 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;

--- a/source/graphics/RenderableObject.h
+++ b/source/graphics/RenderableObject.h
@ -10,7 +10,6 @@
 #define _RENDERABLEOBJECT_H

 #include <assert.h>
-#include "res/res.h"
 #include "Bound.h"
 #include "Matrix3D.h"

--- 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
--- 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"

 //////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/source/graphics/TextureManager.cpp
+++ b/source/graphics/TextureManager.cpp
@ -3,7 +3,7 @@
 #include <algorithm>

 #include "TextureManager.h"
-#include "lib.h"
+#include "res/res.h"
 #include "ogl.h"
 #include "res/ogl_tex.h"
 #include "CLogger.h"
--- a/source/ps/FilePacker.h
+++ b/source/ps/FilePacker.h
@ -10,7 +10,7 @@
 #define _FILEPACKER_H

 #include <vector>
-#include "res/res.h"
+#include "lib/types.h"
 #include "CStr.h"

 ////////////////////////////////////////////////////////////////////////////////////////
--- 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
--- a/source/ps/FileUnpacker.h
+++ b/source/ps/FileUnpacker.h
@ -10,7 +10,7 @@
 #define _FILEUNPACKER_H

 #include <vector>
-#include "res/res.h"
+#include "types.h"
 #include "CStr.h"

 ////////////////////////////////////////////////////////////////////////////////
--- a/source/renderer/ModelRData.h
+++ b/source/renderer/ModelRData.h
@ -2,7 +2,6 @@
 #define _MODELRDATA_H

 #include <vector>
-#include "res/res.h"
 #include "Vector3D.h"
 #include "Color.h"
 #include "RenderableObject.h"
--- a/source/renderer/PatchRData.h
+++ b/source/renderer/PatchRData.h
@ -2,7 +2,6 @@
 #define _PATCHRDATA_H

 #include <vector>
-#include "res/res.h"
 #include "Color.h"
 #include "Vector3D.h"
 #include "RenderableObject.h"
--- a/source/renderer/Renderer.h
+++ b/source/renderer/Renderer.h
@ -14,7 +14,6 @@
 #define RENDERER_H

 #include <vector>
-#include "res/res.h"
 #include "ogl.h"
 #include "Camera.h"
 #include "Frustum.h"
--- 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"

--- a/source/sound/CMusicPlayer.cpp
+++ b/source/sound/CMusicPlayer.cpp
@ -6,6 +6,8 @@
 #include <sstream>
 #include <list>

+#include <res/res.h>
+
 #define LOG_CATEGORY "audio"


--- a/source/sound/CMusicPlayer.h
+++ b/source/sound/CMusicPlayer.h
@ -13,7 +13,6 @@
 #include <vorbis/vorbisfile.h>
 */

-#include "res/res.h"
 /*
 struct SOggFile
 {