diff options
Diffstat (limited to 'src/object/task')
42 files changed, 74 insertions, 450 deletions
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
{
|