diff options
116 files changed, 222 insertions, 1453 deletions
diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 7440584..9635265 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -15,38 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/auto.h"
+
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "graphics/common/cloud.h"
-#include "graphics/common/planet.h"
-#include "graphics/common/blitz.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "common/modfile.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
-#include "ui/list.h"
-#include "ui/label.h"
#include "ui/gauge.h"
#include "ui/window.h"
-#include "object/robotmain.h"
-#include "ui/displaytext.h"
-#include "sound/sound.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index 68fcacb..3928d28 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -33,7 +33,6 @@ class CCloud; class CPlanet;
class CBlitz;
class CCamera;
-class CObject;
class CInterface;
class CRobotMain;
class CDisplayText;
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index abd231f..277ed71 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -15,35 +15,21 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/language.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autobase.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "graphics/common/cloud.h"
#include "graphics/common/planet.h"
#include "graphics/common/blitz.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "object/robotmain.h"
#include "physics/physics.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
#include "ui/displaytext.h"
-#include "object/robotmain.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
-#include "object/auto/autobase.h"
diff --git a/src/object/auto/autobase.h b/src/object/auto/autobase.h index aed5a47..0f71ef6 100644 --- a/src/object/auto/autobase.h +++ b/src/object/auto/autobase.h @@ -20,16 +20,8 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
-
enum AutoBaseParam
{
diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index ef5fbb1..ffe7d59 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -15,31 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autoconvert.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "sound/sound.h"
#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoconvert.h"
diff --git a/src/object/auto/autoconvert.h b/src/object/auto/autoconvert.h index 10d829c..b907c3a 100644 --- a/src/object/auto/autoconvert.h +++ b/src/object/auto/autoconvert.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 3e33466..8360639 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -15,30 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autoderrick.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "sound/sound.h"
#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoderrick.h"
+
diff --git a/src/object/auto/autoderrick.h b/src/object/auto/autoderrick.h index fb39bc3..e211c0f 100644 --- a/src/object/auto/autoderrick.h +++ b/src/object/auto/autoderrick.h @@ -20,16 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
-
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index 76648f1..f1f018c 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -15,32 +15,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autodestroyer.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "graphics/common/pyro.h"
-#include "sound/sound.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "object/robotmain.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autodestroyer.h"
diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h index 521273f..a233b88 100644 --- a/src/object/auto/autodestroyer.h +++ b/src/object/auto/autodestroyer.h @@ -19,18 +19,9 @@ #pragma once
-#include "common/misc.h"
#include "object/auto/auto.h"
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
-
-
enum AutoDestroyerPhase
{
diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 56a2899..773718c 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -15,26 +15,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/auto/autoegg.h"
+
#include "math/geometry.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/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "graphics/common/pyro.h"
#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoegg.h"
+
diff --git a/src/object/auto/autoegg.h b/src/object/auto/autoegg.h index d9a749f..fcdf760 100644 --- a/src/object/auto/autoegg.h +++ b/src/object/auto/autoegg.h @@ -19,18 +19,7 @@ #pragma once
-#include "object/object.h"
#include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
-
enum AutoEggPhase
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index 351db83..90f19ba 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -15,33 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "math/const.h"
-#include "math/geometry.h"
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autoenergy.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/gauge.h"
#include "ui/window.h"
#include "ui/displaytext.h"
-#include "sound/sound.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoenergy.h"
diff --git a/src/object/auto/autoenergy.h b/src/object/auto/autoenergy.h index f9f096e..300ee45 100644 --- a/src/object/auto/autoenergy.h +++ b/src/object/auto/autoenergy.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index f552440..be5a189 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -15,37 +15,20 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "math/const.h"
-#include "math/geometry.h"
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/restext.h"
+#include "object/auto/autofactory.h"
+
#include "common/global.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/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "object/robotmain.h"
#include "physics/physics.h"
-#include "object/brain.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
#include "ui/displaytext.h"
-#include "object/robotmain.h"
-#include "sound/sound.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autofactory.h"
+
diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h index 30692c8..d41dd62 100644 --- a/src/object/auto/autofactory.h +++ b/src/object/auto/autofactory.h @@ -22,14 +22,6 @@ #include "object/auto/auto.h"
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
-
-
enum AutoFactoryPhase
{
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index b6497eb..c062d84 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -15,24 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/auto/autoflag.h"
+
#include "math/geometry.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/particule.h"
#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoflag.h"
diff --git a/src/object/auto/autoflag.h b/src/object/auto/autoflag.h index c52a25a..b503363 100644 --- a/src/object/auto/autoflag.h +++ b/src/object/auto/autoflag.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp index 256d394..3495437 100644 --- a/src/object/auto/autohuston.cpp +++ b/src/object/auto/autohuston.cpp @@ -15,26 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+
+#include "object/auto/autohuston.h"
+
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "object/auto/auto.h"
-#include "object/auto/autohuston.h"
diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h index 4e79a9c..68c9cdf 100644 --- a/src/object/auto/autohuston.h +++ b/src/object/auto/autohuston.h @@ -20,18 +20,9 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
#include "graphics/common/particule.h"
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
-
-
struct HustonLens
{
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp index 783dd56..6e00d44 100644 --- a/src/object/auto/autoinfo.cpp +++ b/src/object/auto/autoinfo.cpp @@ -15,30 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+
+#include "object/auto/autoinfo.h"
+
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/list.h"
#include "ui/window.h"
-#include "sound/sound.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoinfo.h"
+
diff --git a/src/object/auto/autoinfo.h b/src/object/auto/autoinfo.h index 7596c41..cf3d1d4 100644 --- a/src/object/auto/autoinfo.h +++ b/src/object/auto/autoinfo.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp index c2e3eea..6917ae7 100644 --- a/src/object/auto/autojostle.cpp +++ b/src/object/auto/autojostle.cpp @@ -15,29 +15,8 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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 "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "ui/interface.h"
-#include "ui/button.h"
-#include "ui/list.h"
-#include "ui/window.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
+
#include "object/auto/autojostle.h"
diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h index c3a1bd8..c76f953 100644 --- a/src/object/auto/autojostle.h +++ b/src/object/auto/autojostle.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index f2f90b3..c96cc44 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -15,27 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "sound/sound.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
+
#include "object/auto/autokid.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/water.h"
diff --git a/src/object/auto/autokid.h b/src/object/auto/autokid.h index 677d1f0..900eb92 100644 --- a/src/object/auto/autokid.h +++ b/src/object/auto/autokid.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 828e1c2..b675581 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -15,34 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/const.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "object/auto/autolabo.h"
+
#include "common/global.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/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "object/robotmain.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
#include "ui/displaytext.h"
-#include "sound/sound.h"
-#include "object/robotmain.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autolabo.h"
diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 53faa0a..d94eb9e 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index 90dc13a..366dbb5 100644 --- a/src/object/auto/automush.cpp +++ b/src/object/auto/automush.cpp @@ -15,26 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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 "object/auto/automush.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
#include "script/cmdtoken.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
-#include "object/auto/automush.h"
diff --git a/src/object/auto/automush.h b/src/object/auto/automush.h index 62bd322..5c8d62d 100644 --- a/src/object/auto/automush.h +++ b/src/object/auto/automush.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 3644318..4405377 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -15,24 +15,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autonest.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autonest.h"
diff --git a/src/object/auto/autonest.h b/src/object/auto/autonest.h index faf9235..e697a3b 100644 --- a/src/object/auto/autonest.h +++ b/src/object/auto/autonest.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp index 8b9ff36..435bfc6 100644 --- a/src/object/auto/autonuclear.cpp +++ b/src/object/auto/autonuclear.cpp @@ -15,32 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/global.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autonuclear.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "sound/sound.h"
#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autonuclear.h"
diff --git a/src/object/auto/autonuclear.h b/src/object/auto/autonuclear.h index df34601..3054887 100644 --- a/src/object/auto/autonuclear.h +++ b/src/object/auto/autonuclear.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp index 568156b..31e214d 100644 --- a/src/object/auto/autopara.cpp +++ b/src/object/auto/autopara.cpp @@ -15,32 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/global.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autopara.h"
+
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "sound/sound.h"
-#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autopara.h"
diff --git a/src/object/auto/autopara.h b/src/object/auto/autopara.h index 6878c42..e28aa47 100644 --- a/src/object/auto/autopara.h +++ b/src/object/auto/autopara.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 388bfcc..ee3376f 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -15,32 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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 "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "ui/interface.h"
-#include "ui/button.h"
-#include "ui/window.h"
-#include "ui/displaytext.h"
-#include "object/robotmain.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
+
#include "object/auto/autoportico.h"
+#include "object/robotmain.h"
+
+
+
const int PARAM_DEPOSE = 2; // run=2 -> deposits the spaceship
diff --git a/src/object/auto/autoportico.h b/src/object/auto/autoportico.h index c6ce6d7..566c358 100644 --- a/src/object/auto/autoportico.h +++ b/src/object/auto/autoportico.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 0f91d08..b8bee44 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -15,31 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autoradar.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
#include "ui/gauge.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoradar.h"
-
-
// Object's constructor.
diff --git a/src/object/auto/autoradar.h b/src/object/auto/autoradar.h index 9681789..5a5020b 100644 --- a/src/object/auto/autoradar.h +++ b/src/object/auto/autoradar.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index fdfb072..b56f771 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -15,34 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.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 "object/auto/autorepair.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "sound/sound.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/window.h"
-#include "object/robotmain.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autorepair.h"
-
-
// Object's constructor.
diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h index 6d52c7a..1178529 100644 --- a/src/object/auto/autorepair.h +++ b/src/object/auto/autorepair.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index 07c64c1..abf228c 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -15,38 +15,22 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "math/const.h"
-#include "math/geometry.h"
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "object/auto/autoresearch.h"
+
#include "common/global.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 "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
+#include "object/robotmain.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/gauge.h"
#include "ui/window.h"
#include "ui/displaytext.h"
-#include "sound/sound.h"
-#include "object/robotmain.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoresearch.h"
-#define SEARCH_TIME 30.0f // duration of a research
+const float SEARCH_TIME = 30.0f; // duration of a research
diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h index 6a43570..c36edd6 100644 --- a/src/object/auto/autoresearch.h +++ b/src/object/auto/autoresearch.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index df7f0cb..ad87175 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -15,24 +15,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.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/auto/autoroot.h"
+
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "object/auto/auto.h"
-#include "object/auto/autoroot.h"
+#include "math/geometry.h"
diff --git a/src/object/auto/autoroot.h b/src/object/auto/autoroot.h index 8e2a279..8bf397d 100644 --- a/src/object/auto/autoroot.h +++ b/src/object/auto/autoroot.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp index 97434f9..6965851 100644 --- a/src/object/auto/autosafe.cpp +++ b/src/object/auto/autosafe.cpp @@ -15,41 +15,21 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/global.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autosafe.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
-#include "ui/interface.h"
-#include "ui/button.h"
+#include "math/geometry.h"
#include "object/robotmain.h"
-#include "ui/window.h"
-#include "sound/sound.h"
-#include "ui/displaytext.h"
#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autosafe.h"
-
+#include "ui/interface.h"
+#include "ui/window.h"
const float OPEN_DELAY = 8.0f; // duration of opening
-
-
// Object's constructor.
CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object)
diff --git a/src/object/auto/autosafe.h b/src/object/auto/autosafe.h index 083f06b..4194349 100644 --- a/src/object/auto/autosafe.h +++ b/src/object/auto/autosafe.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 9ec48d5..9858ba9 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -15,30 +15,17 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autostation.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
#include "graphics/common/particule.h"
-#include "graphics/common/light.h"
#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
#include "ui/interface.h"
-#include "ui/button.h"
#include "ui/gauge.h"
#include "ui/window.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
-#include "object/auto/autostation.h"
diff --git a/src/object/auto/autostation.h b/src/object/auto/autostation.h index f2b50a8..b4584f2 100644 --- a/src/object/auto/autostation.h +++ b/src/object/auto/autostation.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 227a1e9..ec92341 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -15,35 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/const.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "common/global.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/auto/autotower.h"
+
#include "common/iman.h"
-#include "math/old/math3d.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/camera.h"
-#include "object/object.h"
+#include "math/geometry.h"
#include "physics/physics.h"
+#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/button.h"
-#include "ui/gauge.h"
-#include "ui/window.h"
-#include "sound/sound.h"
#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autotower.h"
-
+#include "ui/window.h"
+#include "ui/gauge.h"
const float TOWER_SCOPE = 200.0f; // range of beam
diff --git a/src/object/auto/autotower.h b/src/object/auto/autotower.h index 57b941d..b64ad3d 100644 --- a/src/object/auto/autotower.h +++ b/src/object/auto/autotower.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h"
-#include "common/misc.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CObject;
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index c692b88..e3bbfa8 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -15,9 +15,9 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
+
+#include "object/brain.h"
#include "CBot/CBotDll.h"
#include "common/struct.h"
@@ -65,7 +65,6 @@ #include "sound/sound.h"
#include "graphics/common/particule.h"
#include "script/cmdtoken.h"
-#include "object/brain.h"
diff --git a/src/object/brain.h b/src/object/brain.h index 895675e..7c258ae 100644 --- a/src/object/brain.h +++ b/src/object/brain.h @@ -19,6 +19,8 @@ #pragma once
+#include <stdio.h>
+
#include "common/misc.h"
#include "common/event.h"
#include "object/object.h"
diff --git a/src/object/mainmovie.cpp b/src/object/mainmovie.cpp index 8393d5a..082027d 100644 --- a/src/object/mainmovie.cpp +++ b/src/object/mainmovie.cpp @@ -17,25 +17,15 @@ // mainmovie.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+
+#include "object/mainmovie.h"
+
#include "math/geometry.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 "object/mainmovie.h"
diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h index d7ac4ab..3d4f375 100644 --- a/src/object/mainmovie.h +++ b/src/object/mainmovie.h @@ -20,7 +20,8 @@ #include "common/event.h"
-#include "graphics/d3d/d3dengine.h"
+#include "math/vector.h"
+
class CInstanceManager;
class CEvent;
@@ -29,7 +30,6 @@ class CInterface; class CRobotMain;
class CCamera;
class CSound;
-class CObject;
diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index f769dae..3231f7a 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -17,30 +17,12 @@ // motion.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "math/const.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+
+#include "object/motion/motion.h"
+
#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "object/robotmain.h"
-#include "sound/sound.h"
#include "script/cmdtoken.h"
-#include "object/motion/motion.h"
diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index ca2ef79..bdb9ce0 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -22,11 +22,10 @@ #include "common/event.h"
#include "common/misc.h"
#include "object/object.h"
-#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
-class CEngine;
+class CD3DEngine;
class CLight;
class CParticule;
class CTerrain;
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index bdfe773..47d2cca 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -17,28 +17,13 @@ // motionant.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "math/func.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
+
+#include "object/motion/motionant.h"
+
+#include "common/modfile.h"
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionant.h"
diff --git a/src/object/motion/motionant.h b/src/object/motion/motionant.h index 499e18e..71a11e4 100644 --- a/src/object/motion/motionant.h +++ b/src/object/motion/motionant.h @@ -22,15 +22,6 @@ #include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
enum MotionAntAction
{
diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index c072ea2..0a84662 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.cpp @@ -17,29 +17,13 @@ // motionbee.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "math/func.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
+
#include "object/motion/motionbee.h"
+#include "common/modfile.h"
+#include "physics/physics.h"
+
#define ADJUST_ANGLE false // true -> adjusts the angles of the members
diff --git a/src/object/motion/motionbee.h b/src/object/motion/motionbee.h index 7dce32b..94ac7fa 100644 --- a/src/object/motion/motionbee.h +++ b/src/object/motion/motionbee.h @@ -22,16 +22,6 @@ #include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
-
enum MotionBeeAction
{
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index bf4e588..d60b1d4 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -17,31 +17,16 @@ // motionhuman.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/func.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
+#include "object/motion/motionhuman.h"
+
+#include "common/modfile.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
+#include "math/geometry.h"
#include "object/robotmain.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionhuman.h"
+#include "physics/physics.h"
diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h index f83bc13..ab7b0f9 100644 --- a/src/object/motion/motionhuman.h +++ b/src/object/motion/motionhuman.h @@ -19,20 +19,9 @@ #pragma once
-#include "common/misc.h"
#include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
-
enum MotionHumanAction
{
diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp index d8d049c..4c2e68c 100644 --- a/src/object/motion/motionmother.cpp +++ b/src/object/motion/motionmother.cpp @@ -17,29 +17,13 @@ // motionmother.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "math/func.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
+
#include "object/motion/motionmother.h"
+#include "common/modfile.h"
+#include "physics/physics.h"
+
#define ADJUST_ANGLE false // true -> adjusts the angles of the members
diff --git a/src/object/motion/motionmother.h b/src/object/motion/motionmother.h index 6578f91..7d67f5b 100644 --- a/src/object/motion/motionmother.h +++ b/src/object/motion/motionmother.h @@ -22,16 +22,6 @@ #include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CMotionMother : public CMotion
{
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index 5447c35..2e0aa0f 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -17,28 +17,13 @@ // motionspider.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "math/func.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
+
+#include "object/motion/motionspider.h"
+
+#include "common/modfile.h"
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionspider.h"
diff --git a/src/object/motion/motionspider.h b/src/object/motion/motionspider.h index 3c6fa17..6b34974 100644 --- a/src/object/motion/motionspider.h +++ b/src/object/motion/motionspider.h @@ -22,16 +22,6 @@ #include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
-
enum MotionSpiderAction
{
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 9a66362..3fa3aba 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -17,29 +17,15 @@ // motiontoto.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/motion/motiontoto.h"
+
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
#include "common/modfile.h"
#include "object/robotmain.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motiontoto.h"
diff --git a/src/object/motion/motiontoto.h b/src/object/motion/motiontoto.h index a2c46d5..8edeec0 100644 --- a/src/object/motion/motiontoto.h +++ b/src/object/motion/motiontoto.h @@ -19,20 +19,9 @@ #pragma once
-#include "common/struct.h"
-#include "object/object.h"
#include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-
enum MotionTotoAction
{
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index c112900..181426c 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -17,29 +17,17 @@ // motionvehicle.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/func.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
+#include "object/motion/motionvehicle.h"
+
+#include "common/modfile.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
+#include "math/geometry.h"
#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionvehicle.h"
+#include "physics/physics.h"
+
diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h index 8bc4dd2..d3e00f9 100644 --- a/src/object/motion/motionvehicle.h +++ b/src/object/motion/motionvehicle.h @@ -22,16 +22,6 @@ #include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CMotionVehicle : public CMotion
{
diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index 0918a0f..bf1871f 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -17,28 +17,16 @@ // motionworm.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
+#include "object/motion/motionworm.h"
+
+#include "common/modfile.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "object/object.h"
+#include "math/geometry.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "common/modfile.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionworm.h"
+
diff --git a/src/object/motion/motionworm.h b/src/object/motion/motionworm.h index 687435e..f159e5c 100644 --- a/src/object/motion/motionworm.h +++ b/src/object/motion/motionworm.h @@ -22,16 +22,6 @@ #include "object/motion/motion.h"
-class CInstanceManager;
-class CEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CCamera;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CMotionWorm : public CMotion
{
diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp index ae92db5..593d4e6 100644 --- a/src/object/task/task.cpp +++ b/src/object/task/task.cpp @@ -17,30 +17,12 @@ // task.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "object/motion/motion.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
-#include "object/robotmain.h"
-#include "ui/displaytext.h"
#include "object/task/task.h"
+#include "common/iman.h"
+#include "object/object.h"
diff --git a/src/object/task/task.h b/src/object/task/task.h index 1d123a3..8a1255e 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -25,7 +25,6 @@ class CInstanceManager;
class CD3DEngine;
-class CEngine;
class CLight;
class CParticule;
class CTerrain;
diff --git a/src/object/task/taskadvance.cpp b/src/object/task/taskadvance.cpp index c7326c4..c5a87d3 100644 --- a/src/object/task/taskadvance.cpp +++ b/src/object/task/taskadvance.cpp @@ -17,23 +17,12 @@ // taskadvance.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/task/taskadvance.h"
+
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "object/task/task.h"
-#include "object/task/taskadvance.h"
diff --git a/src/object/task/taskadvance.h b/src/object/task/taskadvance.h index a109962..b0f09b1 100644 --- a/src/object/task/taskadvance.h +++ b/src/object/task/taskadvance.h @@ -20,15 +20,9 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
+#include "math/vector.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CTaskAdvance : public CTask
{
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 6a448c9..6be7852 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -17,33 +17,20 @@ // taskbuild.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/task/taskbuild.h"
+
#include "common/iman.h"
#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
+#include "math/geometry.h"
#include "object/auto/auto.h"
-#include "graphics/common/camera.h"
-#include "object/motion/motion.h"
#include "object/motion/motionhuman.h"
#include "object/robotmain.h"
-#include "sound/sound.h"
+#include "physics/physics.h"
#include "ui/displaytext.h"
-#include "object/task/task.h"
-#include "object/task/taskbuild.h"
diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index f1908d0..0ca7b9b 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -21,12 +21,7 @@ #include "object/task/task.h"
#include "object/object.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
+#include "math/vector.h"
diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 4e28d35..c319dd1 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -17,25 +17,13 @@ // taskfire.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
+#include "object/task/taskfire.h"
+
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
+#include "math/geometry.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
-#include "object/task/task.h"
-#include "object/task/taskfire.h"
diff --git a/src/object/task/taskfire.h b/src/object/task/taskfire.h index 507979f..43f654e 100644 --- a/src/object/task/taskfire.h +++ b/src/object/task/taskfire.h @@ -22,12 +22,6 @@ #include "object/task/task.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CTaskFire : public CTask
{
diff --git a/src/object/task/taskfireant.cpp b/src/object/task/taskfireant.cpp index f2fbd09..1e50851 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -17,26 +17,14 @@ // taskfireant.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
+#include "object/task/taskfireant.h"
+
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "object/motion/motion.h"
+#include "math/geometry.h"
#include "object/motion/motionant.h"
-#include "object/task/task.h"
-#include "object/task/taskfireant.h"
+#include "physics/physics.h"
diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index 46df388..5b45775 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index 0899737..fc28a6f 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -17,30 +17,16 @@ // taskflag.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/task/taskflag.h"
+
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
-#include "object/object.h"
#include "graphics/common/pyro.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "object/motion/motion.h"
#include "object/motion/motionhuman.h"
-#include "sound/sound.h"
-#include "object/task/task.h"
-#include "object/task/taskflag.h"
diff --git a/src/object/task/taskflag.h b/src/object/task/taskflag.h index dc15e27..4a56357 100644 --- a/src/object/task/taskflag.h +++ b/src/object/task/taskflag.h @@ -19,14 +19,8 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
#include "object/object.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
+#include "math/vector.h"
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 06980c2..6648f97 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -17,24 +17,16 @@ // taskgoto.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
+#include "object/task/taskgoto.h"
+
#include "common/event.h"
-#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
-#include "object/object.h"
+#include "math/geometry.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "object/task/task.h"
-#include "object/task/taskgoto.h"
diff --git a/src/object/task/taskgoto.h b/src/object/task/taskgoto.h index 97009d4..ae83459 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/taskgungoal.cpp b/src/object/task/taskgungoal.cpp index d4db1c8..0635b97 100644 --- a/src/object/task/taskgungoal.cpp +++ b/src/object/task/taskgungoal.cpp @@ -17,21 +17,12 @@ // taskgungoal.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "object/object.h"
-#include "sound/sound.h"
-#include "object/task/task.h"
+
#include "object/task/taskgungoal.h"
+#include "object/object.h"
+
diff --git a/src/object/task/taskgungoal.h b/src/object/task/taskgungoal.h index d8cca60..4759cbc 100644 --- a/src/object/task/taskgungoal.h +++ b/src/object/task/taskgungoal.h @@ -22,12 +22,6 @@ #include "object/task/task.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CTaskGunGoal : public CTask
{
diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 7ce0a36..9e9cd24 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -17,25 +17,14 @@ // taskinfo.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/task/taskinfo.h"
+
#include "common/iman.h"
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
#include "object/auto/autoinfo.h"
-#include "object/task/task.h"
-#include "object/task/taskinfo.h"
+
diff --git a/src/object/task/taskinfo.h b/src/object/task/taskinfo.h index 9c0ae12..8f6e4f2 100644 --- a/src/object/task/taskinfo.h +++ b/src/object/task/taskinfo.h @@ -22,13 +22,6 @@ #include "object/task/task.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
-
class CTaskInfo : public CTask
{
diff --git a/src/object/task/taskmanager.cpp b/src/object/task/taskmanager.cpp index a4956b5..f6f8b97 100644 --- a/src/object/task/taskmanager.cpp +++ b/src/object/task/taskmanager.cpp @@ -17,37 +17,26 @@ // taskmanager.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "common/misc.h"
+#include "object/task/taskmanager.h"
+
#include "common/iman.h"
-#include "common/event.h"
-#include "object/object.h"
-#include "object/task/task.h"
#include "object/task/taskwait.h"
#include "object/task/taskadvance.h"
#include "object/task/taskturn.h"
-#include "object/task/taskgoto.h"
#include "object/task/tasktake.h"
-#include "object/task/taskmanip.h"
-#include "object/task/taskflag.h"
#include "object/task/taskbuild.h"
#include "object/task/tasksearch.h"
#include "object/task/taskterraform.h"
#include "object/task/taskpen.h"
#include "object/task/taskrecover.h"
-#include "object/task/taskshield.h"
#include "object/task/taskinfo.h"
#include "object/task/taskfire.h"
#include "object/task/taskfireant.h"
#include "object/task/taskgungoal.h"
#include "object/task/taskspiderexplo.h"
#include "object/task/taskreset.h"
-#include "object/task/taskmanager.h"
diff --git a/src/object/task/taskmanager.h b/src/object/task/taskmanager.h index 410efcf..30b6c81 100644 --- a/src/object/task/taskmanager.h +++ b/src/object/task/taskmanager.h @@ -27,10 +27,6 @@ #include "object/task/taskflag.h"
-class CInstanceManager;
-class CTask;
-
-
class CTaskManager
{
diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 6f20cad..827fb0f 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -17,28 +17,16 @@ // taskmanip.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/task/taskmanip.h"
+
#include "common/iman.h"
#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "graphics/common/pyro.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
+#include "math/geometry.h"
#include "object/robotmain.h"
-#include "object/task/task.h"
-#include "object/task/taskmanip.h"
+#include "physics/physics.h"
//?const float MARGIN_FRONT = 2.0f;
diff --git a/src/object/task/taskmanip.h b/src/object/task/taskmanip.h index 77360f3..d915558 100644 --- a/src/object/task/taskmanip.h +++ b/src/object/task/taskmanip.h @@ -20,15 +20,8 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
#include "object/object.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 3e29d30..0e817d1 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -17,28 +17,13 @@ // taskpen.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/geometry.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
+#include "object/task/taskpen.h"
+
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "math/geometry.h"
#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionant.h"
-#include "object/motion/motionspider.h"
-#include "object/task/task.h"
-#include "object/task/taskpen.h"
diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h index 918384b..3c65d2e 100644 --- a/src/object/task/taskpen.h +++ b/src/object/task/taskpen.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index a7e372a..54f3f46 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -17,27 +17,15 @@ // taskrecover.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/func.h"
+#include "object/task/taskrecover.h"
+
#include "math/geometry.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
#include "ui/displaytext.h"
-#include "object/task/task.h"
-#include "object/task/taskrecover.h"
const float ENERGY_RECOVER = 0.25f; // energy consumed by recovery
diff --git a/src/object/task/taskrecover.h b/src/object/task/taskrecover.h index 4632b0b..5ee696a 100644 --- a/src/object/task/taskrecover.h +++ b/src/object/task/taskrecover.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/taskreset.cpp b/src/object/task/taskreset.cpp index 0d18c6d..ab41076 100644 --- a/src/object/task/taskreset.cpp +++ b/src/object/task/taskreset.cpp @@ -17,30 +17,18 @@ // taskreset.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/task/taskreset.h"
+
#include "common/iman.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
#include "object/brain.h"
-#include "sound/sound.h"
#include "object/robotmain.h"
-#include "object/task/task.h"
-#include "object/task/taskreset.h"
-#define RESET_DELAY_ZOOM 0.7f
-#define RESET_DELAY_MOVE 0.7f
+const float RESET_DELAY_ZOOM = 0.7f;
+const float RESET_DELAY_MOVE = 0.7f;
diff --git a/src/object/task/taskreset.h b/src/object/task/taskreset.h index 603aef2..2c885f9 100644 --- a/src/object/task/taskreset.h +++ b/src/object/task/taskreset.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 7660bfa..09b54a0 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -17,26 +17,16 @@ // tasksearch.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/task/tasksearch.h"
+
#include "math/geometry.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
#include "ui/displaytext.h"
-#include "object/task/task.h"
-#include "object/task/tasksearch.h"
diff --git a/src/object/task/tasksearch.h b/src/object/task/tasksearch.h index 76c0b6d..040c606 100644 --- a/src/object/task/tasksearch.h +++ b/src/object/task/tasksearch.h @@ -20,13 +20,7 @@ #include "object/task/task.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "object/object.h"
diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index cedce35..0358a31 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -17,27 +17,16 @@ // taskshield.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "math/const.h"
-#include "math/geometry.h"
-#include "common/struct.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/task/taskshield.h"
+
#include "common/iman.h"
+#include "graphics/common/light.h"
#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
+#include "math/geometry.h"
#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "graphics/common/light.h"
-#include "sound/sound.h"
-#include "object/task/task.h"
-#include "object/task/taskshield.h"
+#include "physics/physics.h"
const float ENERGY_TIME = 20.0f; // maximum duration if full battery
diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index 0e36e49..7749f52 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
const float RADIUS_SHIELD_MIN = 40.0f; // minimum radius of the protected zone
diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index f545b7e..24abe08 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -17,23 +17,13 @@ // taskspiderexplo.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "object/object.h"
-#include "physics/physics.h"
+
+#include "object/task/taskspiderexplo.h"
+
#include "graphics/common/pyro.h"
-#include "object/motion/motion.h"
#include "object/motion/motionspider.h"
-#include "object/task/task.h"
-#include "object/task/taskspiderexplo.h"
+#include "physics/physics.h"
diff --git a/src/object/task/taskspiderexplo.h b/src/object/task/taskspiderexplo.h index 0b60f34..df77b62 100644 --- a/src/object/task/taskspiderexplo.h +++ b/src/object/task/taskspiderexplo.h @@ -22,12 +22,6 @@ #include "object/task/task.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CTaskSpiderExplo : public CTask
{
diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 7817b90..6f1640a 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -17,31 +17,17 @@ // tasktake.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "math/const.h"
-#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
+#include "object/task/tasktake.h"
+
#include "common/iman.h"
#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
#include "graphics/common/water.h"
-#include "graphics/common/camera.h"
-#include "object/motion/motion.h"
+#include "math/geometry.h"
#include "object/motion/motionhuman.h"
-#include "sound/sound.h"
#include "object/robotmain.h"
-#include "object/task/task.h"
-#include "object/task/tasktake.h"
+#include "physics/physics.h"
diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index b9dc053..b8203a8 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -23,13 +23,6 @@ #include "object/object.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
-
enum TaskTakeOrder
{
diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 5d06956..4a7dacc 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -17,30 +17,19 @@ // taskterraform.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
+#include "object/task/taskterraform.h"
+
#include "math/geometry.h"
-#include "common/language.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
#include "graphics/common/pyro.h"
#include "object/brain.h"
-#include "graphics/common/camera.h"
-#include "sound/sound.h"
-#include "object/motion/motion.h"
#include "object/motion/motionant.h"
#include "object/motion/motionspider.h"
-#include "object/task/task.h"
-#include "object/task/taskterraform.h"
const float ENERGY_TERRA = 0.40f; // energy consumed by blow
diff --git a/src/object/task/taskterraform.h b/src/object/task/taskterraform.h index c3ab957..d4798e6 100644 --- a/src/object/task/taskterraform.h +++ b/src/object/task/taskterraform.h @@ -20,14 +20,7 @@ #include "object/task/task.h"
-#include "graphics/d3d/d3dengine.h"
-
-
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
+#include "math/vector.h"
diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index 9b02a0c..a169700 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -17,22 +17,12 @@ // taskturn.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
+
+#include "object/task/taskturn.h"
+
#include "graphics/common/terrain.h"
-#include "object/object.h"
#include "physics/physics.h"
-#include "object/brain.h"
-#include "object/task/task.h"
-#include "object/task/taskturn.h"
diff --git a/src/object/task/taskturn.h b/src/object/task/taskturn.h index 880c4b5..bfbd064 100644 --- a/src/object/task/taskturn.h +++ b/src/object/task/taskturn.h @@ -22,12 +22,6 @@ #include "object/task/task.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CTaskTurn : public CTask
{
diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index 9bd5197..6270b00 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -17,23 +17,11 @@ // taskwait.cpp
-#include <windows.h>
#include <stdio.h>
-#include <d3d.h>
-#include "common/struct.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "object/task/task.h"
#include "object/task/taskwait.h"
+#include "graphics/d3d/d3dengine.h"
diff --git a/src/object/task/taskwait.h b/src/object/task/taskwait.h index 5fec9ae..3439bc8 100644 --- a/src/object/task/taskwait.h +++ b/src/object/task/taskwait.h @@ -22,12 +22,6 @@ #include "object/task/task.h"
-class CInstanceManager;
-class CTerrain;
-class CBrain;
-class CPhysics;
-class CObject;
-
class CTaskWait : public CTask
{
|