Refactoring of #includes and forward declarations in object/

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"
 
 
 

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;

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"
 
 
 

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
 {

src/object/auto/autoconvert.cpp

@@ -15,32 +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 "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/window.h"
-#include "sound/sound.h"
-#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
 #include "object/auto/autoconvert.h"
 
+#include "common/iman.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+#include "ui/displaytext.h"
+
 
 
 

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;
 
 
 

src/object/auto/autoderrick.cpp

@@ -15,31 +15,19 @@
 // * 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 "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 "sound/sound.h"
-#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
 #include "object/auto/autoderrick.h"
 
+#include "common/iman.h"
+#include "graphics/common/terrain.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+#include "ui/displaytext.h"
+
+
 
 
 const float DERRICK_DELAY	= 10.0f;	// duration of the extraction

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

src/object/auto/autodestroyer.cpp

@@ -15,33 +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 "physics/physics.h"
-#include "graphics/common/pyro.h"
-#include "sound/sound.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"
 
+#include "common/iman.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+
 
 
 

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
 {

src/object/auto/autoegg.cpp

@@ -15,27 +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 "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"
 
+#include "math/geometry.h"
+#include "common/iman.h"
+#include "script/cmdtoken.h"
+
+
 
 
 // Object's constructor.

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

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"
 
 
 

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;
 
 
 

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

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
 {

src/object/auto/autoflag.cpp

@@ -15,25 +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 "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"
 
+#include "math/geometry.h"
+#include "graphics/common/terrain.h"
+
 
 
 #define ADJUST_ANGLE	false		// true -> adjusts the angles of the members

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;
 
 
 

src/object/auto/autohuston.cpp

@@ -15,27 +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 "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 "object/auto/auto.h"
 #include "object/auto/autohuston.h"
 
+#include "ui/interface.h"
+#include "ui/window.h"
+
 
 
 

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
 {

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

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;
 
 
 

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"
 
 

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;
 
 
 

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"
 
 
 

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;
 
 
 

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 "ui/interface.h"
-#include "ui/button.h"
-#include "ui/window.h"
-#include "ui/displaytext.h"
-#include "sound/sound.h"
+#include "math/geometry.h"
 #include "object/robotmain.h"
 #include "script/cmdtoken.h"
-#include "object/auto/auto.h"
-#include "object/auto/autolabo.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+#include "ui/displaytext.h"
 
 
 

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;
 
 
 

src/object/auto/automush.cpp

@@ -15,27 +15,13 @@
 // * 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 "script/cmdtoken.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
 #include "object/auto/automush.h"
 
+#include "common/iman.h"
+#include "script/cmdtoken.h"
+
 
 
 

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;
 
 
 

src/object/auto/autonest.cpp

@@ -15,25 +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 "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"
 
+#include "common/iman.h"
+#include "graphics/common/terrain.h"
+#include "script/cmdtoken.h"
+
 
 
 

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;
 
 
 

src/object/auto/autonuclear.cpp

@@ -15,33 +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/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 "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"
 
+#include "common/iman.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+#include "ui/displaytext.h"
+
 
 
 const float NUCLEAR_DELAY = 30.0f;	// duration of the generation

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;
 
 
 

src/object/auto/autopara.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/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 "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/window.h"
-#include "sound/sound.h"
-#include "ui/displaytext.h"
-#include "script/cmdtoken.h"
-#include "object/auto/auto.h"
 #include "object/auto/autopara.h"
 
 
+#include "common/iman.h"
+#include "math/geometry.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+
+
 
 
 // Object's constructor.

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;
 
 
 

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
 

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;
 
 
 

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 "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/gauge.h"
-#include "sound/sound.h"
-#include "object/auto/auto.h"
 #include "object/auto/autoradar.h"
 
-
+#include "common/iman.h"
+#include "math/geometry.h"
+#include "ui/interface.h"
+#include "ui/window.h"
+#include "ui/gauge.h"
 
 
 // Object's constructor.

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;
 
 
 

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 "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 "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"
 
-
+#include "common/iman.h"
+#include "physics/physics.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/window.h"
 
 
 // Object's constructor.

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;
 
 
 

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
 
 
 

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;
 
 
 

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"
 
 
 

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;
 
 
 

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 "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 "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 "common/iman.h"
+#include "math/geometry.h"
+#include "object/robotmain.h"
+#include "script/cmdtoken.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)

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;
 
 
 

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"
 
 
 

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;
 
 
 

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 "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 "physics/physics.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 "common/iman.h"
+#include "math/geometry.h"
+#include "physics/physics.h"
+#include "script/cmdtoken.h"
+#include "ui/interface.h"
+#include "ui/displaytext.h"
+#include "ui/window.h"
+#include "ui/gauge.h"
 
 
 const float TOWER_SCOPE		= 200.0f;	// range of beam

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;
 
 
 

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"
 
 
 

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"

src/object/mainmovie.cpp

@@ -17,26 +17,16 @@
 // mainmovie.cpp
 
 
-#include <windows.h>
 #include <stdio.h>
-#include <d3d.h>
 
-#include "common/struct.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"
 
+#include "math/geometry.h"
+#include "common/iman.h"
+#include "object/motion/motionhuman.h"
+#include "object/robotmain.h"
+
 
 
 

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;
 
 
 

src/object/motion/motion.cpp

@@ -17,31 +17,13 @@
 // 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 "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"
 
+#include "common/iman.h"
+#include "script/cmdtoken.h"
+
 
 
 

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;

src/object/motion/motionant.cpp

@@ -17,29 +17,14 @@
 // 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 "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"
 
+#include "common/modfile.h"
+#include "graphics/common/particule.h"
+#include "physics/physics.h"
+
 
 
 #define ADJUST_ANGLE		false		// true -> adjusts the angles of the members

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
 {

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

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
 {

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"
 
 
 

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
 {

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

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
 {

src/object/motion/motionspider.cpp

@@ -17,29 +17,14 @@
 // 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 "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"
 
+#include "common/modfile.h"
+#include "graphics/common/particule.h"
+#include "physics/physics.h"
+
 
 
 #define ADJUST_ANGLE		false		// true -> adjusts the angles of the members

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
 {

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"
 
 
 

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
 {

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

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
 {

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

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
 {

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"
 
 
 

src/object/task/task.h

@@ -25,7 +25,6 @@
 
 class CInstanceManager;
 class CD3DEngine;
-class CEngine;
 class CLight;
 class CParticule;
 class CTerrain;

src/object/task/taskadvance.cpp

@@ -17,24 +17,13 @@
 // taskadvance.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/terrain.h"
-#include "object/object.h"
-#include "physics/physics.h"
-#include "object/brain.h"
-#include "object/task/task.h"
 #include "object/task/taskadvance.h"
 
+#include "math/geometry.h"
+#include "physics/physics.h"
+
 
 
 

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
 {

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"
 
 
 

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"
 
 
 

src/object/task/taskfire.cpp

@@ -17,26 +17,14 @@
 // 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 "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 "object/task/task.h"
 #include "object/task/taskfire.h"
 
+#include "graphics/common/particule.h"
+#include "math/geometry.h"
+#include "physics/physics.h"
+
 
 
 const float ENERGY_FIRE 	= (0.25f/2.5f);	// energy consumed/shot

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
 {

src/object/task/taskfireant.cpp

@@ -17,27 +17,15 @@
 // 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 "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 "object/motion/motionant.h"
-#include "object/task/task.h"
 #include "object/task/taskfireant.h"
 
+#include "graphics/common/particule.h"
+#include "math/geometry.h"
+#include "object/motion/motionant.h"
+#include "physics/physics.h"
+
 
 
 

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"
 
 
 

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"
 
 
 

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"
 
 
 

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"
 
 
 

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"
 
 
 

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

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
 {

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

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
 {

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"
 
 
 

src/object/task/taskmanager.h

@@ -27,10 +27,6 @@
 #include "object/task/taskflag.h"
 
 
-class CInstanceManager;
-class CTask;
-
-
 
 class CTaskManager
 {

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;

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"
 
 
 

src/object/task/taskpen.cpp

@@ -17,29 +17,14 @@
 // 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 "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 "object/motion/motion.h"
-#include "object/motion/motionant.h"
-#include "object/motion/motionspider.h"
-#include "object/task/task.h"
 #include "object/task/taskpen.h"
 
+#include "graphics/common/particule.h"
+#include "math/geometry.h"
+#include "object/object.h"
+
 
 
 // Object's constructor.

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"
 
 
 

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

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"