diff options
Diffstat (limited to 'src/graphics')
36 files changed, 234 insertions, 274 deletions
diff --git a/src/graphics/common/blitz.cpp b/src/graphics/common/blitz.cpp index cf88fe3..0447f53 100644 --- a/src/graphics/common/blitz.cpp +++ b/src/graphics/common/blitz.cpp @@ -21,21 +21,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "terrain.h"
-#include "math3d.h"
-#include "object.h"
-#include "camera.h"
-#include "auto.h"
-#include "autopara.h"
-#include "sound.h"
-#include "blitz.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "graphics/common/terrain.h"
+#include "math/old/math3d.h"
+#include "object/object.h"
+#include "graphics/common/camera.h"
+#include "object/auto/auto.h"
+#include "object/auto/autopara.h"
+#include "sound/sound.h"
+#include "graphics/common/blitz.h"
diff --git a/src/graphics/common/blitz.h b/src/graphics/common/blitz.h index 30a34ed..2f8aee9 100644 --- a/src/graphics/common/blitz.h +++ b/src/graphics/common/blitz.h @@ -16,12 +16,11 @@ // blitz.h
-#ifndef _BLITZ_H_
-#define _BLITZ_H_
+#pragma once
-#include "misc.h"
-#include "struct.h"
+#include "common/misc.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -80,5 +79,3 @@ protected: float m_width[BLITZMAX];
};
-
-#endif //_BLITZ_H_
diff --git a/src/graphics/common/camera.cpp b/src/graphics/common/camera.cpp index e526d6c..e556c20 100644 --- a/src/graphics/common/camera.cpp +++ b/src/graphics/common/camera.cpp @@ -21,19 +21,19 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "camera.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "graphics/common/camera.h"
diff --git a/src/graphics/common/camera.h b/src/graphics/common/camera.h index f38db1a..7723dfc 100644 --- a/src/graphics/common/camera.h +++ b/src/graphics/common/camera.h @@ -16,12 +16,11 @@ // camera.h
-#ifndef _CAMERA_H_
-#define _CAMERA_H_
+#pragma once
-#include "d3dengine.h"
-#include "struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -267,5 +266,3 @@ protected: BOOL m_bCameraInvertY; // Y inversion in the edges?
};
-
-#endif //_CAMERA_H_
diff --git a/src/graphics/common/cloud.cpp b/src/graphics/common/cloud.cpp index 8d6aeae..0892962 100644 --- a/src/graphics/common/cloud.cpp +++ b/src/graphics/common/cloud.cpp @@ -21,17 +21,17 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "terrain.h"
-#include "object.h"
-#include "cloud.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/terrain.h"
+#include "object/object.h"
+#include "graphics/common/cloud.h"
diff --git a/src/graphics/common/cloud.h b/src/graphics/common/cloud.h index b912670..d0dcb97 100644 --- a/src/graphics/common/cloud.h +++ b/src/graphics/common/cloud.h @@ -16,11 +16,10 @@ // cloud.h
-#ifndef _CLOUD_H_
-#define _CLOUD_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -86,5 +85,3 @@ protected: BOOL m_bEnable;
};
-
-#endif //_CLOUD_H_
diff --git a/src/graphics/common/color.cpp b/src/graphics/common/color.cpp index 35f6596..bc5cf5d 100644 --- a/src/graphics/common/color.cpp +++ b/src/graphics/common/color.cpp @@ -16,7 +16,7 @@ // color.cpp -#include "color.h" +#include "graphics/common/color.h" // TODO diff --git a/src/graphics/common/color.h b/src/graphics/common/color.h index 9d6114a..fff4b00 100644 --- a/src/graphics/common/color.h +++ b/src/graphics/common/color.h @@ -16,16 +16,18 @@ // color.h +#pragma once + + // TODO struct Color { }; -#pragma once - D3DCOLOR RetColor(float intensity); D3DCOLOR RetColor(D3DCOLORVALUE intensity); D3DCOLORVALUE RetColor(D3DCOLOR intensity); void RGB2HSV(D3DCOLORVALUE src, ColorHSV &dest); void HSV2RGB(ColorHSV src, D3DCOLORVALUE &dest); + diff --git a/src/graphics/common/light.cpp b/src/graphics/common/light.cpp index cbb6914..0beeb50 100644 --- a/src/graphics/common/light.cpp +++ b/src/graphics/common/light.cpp @@ -23,13 +23,14 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "light.h"
+#include "math/const.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/light.h"
diff --git a/src/graphics/common/light.h b/src/graphics/common/light.h index ae2bcfb..52c2a2f 100644 --- a/src/graphics/common/light.h +++ b/src/graphics/common/light.h @@ -16,11 +16,10 @@ // light.h
-#ifndef _LIGHT_H_
-#define _LIGHT_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -109,5 +108,3 @@ protected: Light* m_lightTable;
};
-
-#endif //_LIGHT_H_
diff --git a/src/graphics/common/mainmovie.cpp b/src/graphics/common/mainmovie.cpp index 8205d16..5618406 100644 --- a/src/graphics/common/mainmovie.cpp +++ b/src/graphics/common/mainmovie.cpp @@ -23,20 +23,20 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "global.h"
-#include "event.h"
-#include "iman.h"
-#include "math3d.h"
-#include "camera.h"
-#include "object.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "interface.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "mainmovie.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "ui/interface.h"
+#include "object/robotmain.h"
+#include "sound/sound.h"
+#include "graphics/common/mainmovie.h"
diff --git a/src/graphics/common/mainmovie.h b/src/graphics/common/mainmovie.h index f31b3a9..fa65730 100644 --- a/src/graphics/common/mainmovie.h +++ b/src/graphics/common/mainmovie.h @@ -16,8 +16,7 @@ // mainmovie.h
-#ifndef _MAINMOVIE_H_
-#define _MAINMOVIE_H_
+#pragma once
class CInstanceManager;
@@ -76,5 +75,3 @@ protected: D3DVECTOR m_finalLookat[2];
};
-
-#endif //_MAINMOVIE_H_
diff --git a/src/graphics/common/model.cpp b/src/graphics/common/model.cpp index 80ce6b5..9fa2b2e 100644 --- a/src/graphics/common/model.cpp +++ b/src/graphics/common/model.cpp @@ -23,21 +23,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "water.h"
-#include "robotmain.h"
-#include "interface.h"
-#include "edit.h"
-#include "button.h"
-#include "cmdtoken.h"
-#include "modfile.h"
-#include "model.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/water.h"
+#include "object/robotmain.h"
+#include "ui/interface.h"
+#include "ui/edit.h"
+#include "ui/button.h"
+#include "script/cmdtoken.h"
+#include "common/modfile.h"
+#include "graphics/common/model.h"
diff --git a/src/graphics/common/model.h b/src/graphics/common/model.h index 35b48b6..e7b6b10 100644 --- a/src/graphics/common/model.h +++ b/src/graphics/common/model.h @@ -16,11 +16,10 @@ // model.h
-#ifndef _MODEL_H_
-#define _MODEL_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -133,5 +132,3 @@ protected: float m_max;
};
-
-#endif //_MODEL_H_
diff --git a/src/graphics/common/particule.cpp b/src/graphics/common/particule.cpp index 0a8c27d..e7bdea3 100644 --- a/src/graphics/common/particule.cpp +++ b/src/graphics/common/particule.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dmath.h"
-#include "d3dtextr.h"
-#include "d3dengine.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "iman.h"
-#include "math3d.h"
-#include "event.h"
-#include "object.h"
-#include "physics.h"
-#include "auto.h"
-#include "robotmain.h"
-#include "terrain.h"
-#include "sound.h"
-#include "water.h"
-#include "particule.h"
+#include "common/struct.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "object/auto/auto.h"
+#include "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "sound/sound.h"
+#include "graphics/common/water.h"
+#include "graphics/common/particule.h"
diff --git a/src/graphics/common/particule.h b/src/graphics/common/particule.h index 67abad3..54a6428 100644 --- a/src/graphics/common/particule.h +++ b/src/graphics/common/particule.h @@ -16,12 +16,11 @@ // particule.h
-#ifndef _PARTICULE_H_
-#define _PARTICULE_H_
+#pragma once
-#include "d3dengine.h"
-#include "sound.h"
+#include "graphics/d3d/d3dengine.h"
+#include "sound/sound.h"
class CInstanceManager;
@@ -335,5 +334,3 @@ protected: float m_absTime;
};
-
-#endif //_PARTICULE_H_
diff --git a/src/graphics/common/planet.cpp b/src/graphics/common/planet.cpp index 925b2e9..fae6d4a 100644 --- a/src/graphics/common/planet.cpp +++ b/src/graphics/common/planet.cpp @@ -23,14 +23,14 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "planet.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/planet.h"
diff --git a/src/graphics/common/planet.h b/src/graphics/common/planet.h index 9a6ba52..b931c2b 100644 --- a/src/graphics/common/planet.h +++ b/src/graphics/common/planet.h @@ -16,11 +16,10 @@ // planet.h
-#ifndef _PLANET_H_
-#define _PLANET_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -75,5 +74,3 @@ protected: BOOL m_bPlanetExist;
};
-
-#endif //_PLANET_H_
diff --git a/src/graphics/common/pyro.cpp b/src/graphics/common/pyro.cpp index 3588585..7de5405 100644 --- a/src/graphics/common/pyro.cpp +++ b/src/graphics/common/pyro.cpp @@ -23,24 +23,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "D3DEngine.h"
-#include "D3DMath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "robotmain.h"
-#include "terrain.h"
-#include "camera.h"
-#include "particule.h"
-#include "light.h"
-#include "object.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "displaytext.h"
-#include "sound.h"
-#include "pyro.h"
+#include "math/const.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/camera.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/light.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "ui/displaytext.h"
+#include "sound/sound.h"
+#include "graphics/common/pyro.h"
diff --git a/src/graphics/common/pyro.h b/src/graphics/common/pyro.h index 5eac0c9..e33b46a 100644 --- a/src/graphics/common/pyro.h +++ b/src/graphics/common/pyro.h @@ -16,13 +16,12 @@ // pyro.h
-#ifndef _PYRO_H_
-#define _PYRO_H_
+#pragma once
-#include "d3dengine.h"
-#include "object.h"
-#include "misc.h"
+#include "graphics/d3d/d3dengine.h"
+#include "object/object.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -171,5 +170,3 @@ protected: float m_crashSphereRadius[50];
};
-
-#endif //_PYRO_H_
diff --git a/src/graphics/common/terrain.cpp b/src/graphics/common/terrain.cpp index 31b1cc9..91c4c3d 100644 --- a/src/graphics/common/terrain.cpp +++ b/src/graphics/common/terrain.cpp @@ -23,18 +23,18 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "modfile.h"
-#include "water.h"
-#include "terrain.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "common/modfile.h"
+#include "graphics/common/water.h"
+#include "graphics/common/terrain.h"
#define BMPHEAD 1078
diff --git a/src/graphics/common/terrain.h b/src/graphics/common/terrain.h index 4fc4ace..fcc10e8 100644 --- a/src/graphics/common/terrain.h +++ b/src/graphics/common/terrain.h @@ -16,11 +16,10 @@ // terrain.h
-#ifndef _TERRAIN_H_
-#define _TERRAIN_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -210,5 +209,3 @@ protected: FlyingLimit m_flyingLimit[MAXFLYINGLIMIT];
};
-
-#endif //_TERRAIN_H_
diff --git a/src/graphics/common/text.cpp b/src/graphics/common/text.cpp index 88cfe0a..948ac7d 100644 --- a/src/graphics/common/text.cpp +++ b/src/graphics/common/text.cpp @@ -23,14 +23,14 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "text.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/text.h"
diff --git a/src/graphics/common/text.h b/src/graphics/common/text.h index 4407039..5d41c5c 100644 --- a/src/graphics/common/text.h +++ b/src/graphics/common/text.h @@ -16,11 +16,10 @@ // text.h
-#ifndef _TEXT_H_
-#define _TEXT_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -109,5 +108,3 @@ protected: };
-
-#endif //_TEXT_H_
diff --git a/src/graphics/common/water.cpp b/src/graphics/common/water.cpp index 59963cc..5e7e21f 100644 --- a/src/graphics/common/water.cpp +++ b/src/graphics/common/water.cpp @@ -23,19 +23,19 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "sound.h"
-#include "water.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/terrain.h"
+#include "object/object.h"
+#include "sound/sound.h"
+#include "graphics/common/water.h"
diff --git a/src/graphics/common/water.h b/src/graphics/common/water.h index dc9384d..959b12f 100644 --- a/src/graphics/common/water.h +++ b/src/graphics/common/water.h @@ -16,12 +16,11 @@ // water.h
-#ifndef _WATER_H_
-#define _WATER_H_
+#pragma once
-#include "d3dengine.h"
-#include "particule.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/common/particule.h"
class CInstanceManager;
@@ -130,5 +129,3 @@ protected: D3DCOLOR m_color;
};
-
-#endif //_WATER_H_
diff --git a/src/graphics/d3d/d3dengine.cpp b/src/graphics/d3d/d3dengine.cpp index bbfb89e..12cf4ea 100644 --- a/src/graphics/d3d/d3dengine.cpp +++ b/src/graphics/d3d/d3dengine.cpp @@ -14,7 +14,7 @@ // * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// D3DEngine.cpp
+// d3dengine.cpp
#define STRICT
#define D3D_OVERLOADS
@@ -22,28 +22,28 @@ #include <stdio.h>
#include <math.h>
-#include "struct.h"
-#include "d3dapp.h"
-#include "d3dtextr.h"
-#include "d3dutil.h"
-#include "d3dmath.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "iman.h"
-#include "event.h"
-#include "profile.h"
-#include "math3d.h"
-#include "object.h"
-#include "interface.h"
-#include "light.h"
-#include "text.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "cloud.h"
-#include "blitz.h"
-#include "planet.h"
-#include "sound.h"
+#include "common/struct.h"
+#include "app/d3dapp.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dutil.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/iman.h"
+#include "common/event.h"
+#include "common/profile.h"
+#include "math/old/math3d.h"
+#include "object/object.h"
+#include "ui/interface.h"
+#include "graphics/common/light.h"
+#include "graphics/common/text.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "graphics/common/cloud.h"
+#include "graphics/common/blitz.h"
+#include "graphics/common/planet.h"
+#include "sound/sound.h"
diff --git a/src/graphics/d3d/d3dengine.h b/src/graphics/d3d/d3dengine.h index a99db93..12e0fdb 100644 --- a/src/graphics/d3d/d3dengine.h +++ b/src/graphics/d3d/d3dengine.h @@ -16,11 +16,10 @@ // d3dengine.h
-#ifndef _D3DENGINE_H_
-#define _D3DENGINE_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CD3DApplication;
@@ -683,4 +682,3 @@ protected: };
-#endif //_D3DENGINE_H_
diff --git a/src/graphics/d3d/d3denum.cpp b/src/graphics/d3d/d3denum.cpp index 46497d8..c163bb8 100644 --- a/src/graphics/d3d/d3denum.cpp +++ b/src/graphics/d3d/d3denum.cpp @@ -25,9 +25,9 @@ #include <windowsx.h>
#include <stdio.h>
#include <tchar.h>
-#include "d3denum.h"
-#include "d3dutil.h" // For DEBUG_MSG
-#include "d3dres.h" // For dialog controls
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dutil.h" // For DEBUG_MSG
+#include "old/d3dres.h" // For dialog controls
diff --git a/src/graphics/d3d/d3denum.h b/src/graphics/d3d/d3denum.h index e728ffb..0086d57 100644 --- a/src/graphics/d3d/d3denum.h +++ b/src/graphics/d3d/d3denum.h @@ -21,8 +21,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DENUM_H
-#define D3DENUM_H
+
+#pragma once
+
#include <d3d.h>
@@ -130,7 +131,3 @@ HRESULT D3DEnum_UserChangeDevice( D3DEnum_DeviceInfo** ppDevice ); -#endif // D3DENUM_H
-
-
-
diff --git a/src/graphics/d3d/d3dframe.cpp b/src/graphics/d3d/d3dframe.cpp index 3207a4b..73c0569 100644 --- a/src/graphics/d3d/d3dframe.cpp +++ b/src/graphics/d3d/d3dframe.cpp @@ -25,8 +25,8 @@ #include <windows.h>
#include <stdio.h>
#include <tchar.h>
-#include "d3dframe.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dframe.h"
+#include "graphics/d3d/d3dutil.h"
diff --git a/src/graphics/d3d/d3dframe.h b/src/graphics/d3d/d3dframe.h index 8e41b83..2a6f902 100644 --- a/src/graphics/d3d/d3dframe.h +++ b/src/graphics/d3d/d3dframe.h @@ -34,8 +34,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DFRAME_H
-#define D3DFRAME_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -137,6 +138,4 @@ public: #define D3DFWERR_NOTINITIALIZED 0x8200000f
-#endif // D3DFRAME_H
-
diff --git a/src/graphics/d3d/d3dtextr.cpp b/src/graphics/d3d/d3dtextr.cpp index cceab99..6122029 100644 --- a/src/graphics/d3d/d3dtextr.cpp +++ b/src/graphics/d3d/d3dtextr.cpp @@ -29,10 +29,10 @@ #define STRICT
#include <tchar.h>
#include <stdio.h>
-#include "d3dtextr.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "misc.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/misc.h"
diff --git a/src/graphics/d3d/d3dtextr.h b/src/graphics/d3d/d3dtextr.h index 54a79bb..0e43fd2 100644 --- a/src/graphics/d3d/d3dtextr.h +++ b/src/graphics/d3d/d3dtextr.h @@ -26,8 +26,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DTEXTR_H
-#define D3DTEXTR_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -76,5 +77,3 @@ VOID D3DTextr_SetTexturePath( TCHAR* strTexturePath ); void D3DTextr_SetDebugMode(BOOL bDebug);
-
-#endif // D3DTEXTR_H
diff --git a/src/graphics/d3d/d3dutil.cpp b/src/graphics/d3d/d3dutil.cpp index b4a0eb7..65c3541 100644 --- a/src/graphics/d3d/d3dutil.cpp +++ b/src/graphics/d3d/d3dutil.cpp @@ -27,7 +27,7 @@ #include <math.h>
#include <stdio.h>
#include <tchar.h>
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
diff --git a/src/graphics/d3d/d3dutil.h b/src/graphics/d3d/d3dutil.h index 494722d..8fe88c9 100644 --- a/src/graphics/d3d/d3dutil.h +++ b/src/graphics/d3d/d3dutil.h @@ -21,8 +21,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DUTIL_H
-#define D3DUTIL_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -110,5 +111,3 @@ HRESULT _DbgOut( TCHAR*, DWORD, HRESULT, TCHAR* ); -
-#endif // D3DUTIL_H
|