diff options
Diffstat (limited to 'src/object/motion')
-rw-r--r-- | src/object/motion/motion.cpp | 24 | ||||
-rw-r--r-- | src/object/motion/motion.h | 3 | ||||
-rw-r--r-- | src/object/motion/motionant.cpp | 23 | ||||
-rw-r--r-- | src/object/motion/motionant.h | 9 | ||||
-rw-r--r-- | src/object/motion/motionbee.cpp | 24 | ||||
-rw-r--r-- | src/object/motion/motionbee.h | 10 | ||||
-rw-r--r-- | src/object/motion/motionhuman.cpp | 25 | ||||
-rw-r--r-- | src/object/motion/motionhuman.h | 11 | ||||
-rw-r--r-- | src/object/motion/motionmother.cpp | 24 | ||||
-rw-r--r-- | src/object/motion/motionmother.h | 10 | ||||
-rw-r--r-- | src/object/motion/motionspider.cpp | 23 | ||||
-rw-r--r-- | src/object/motion/motionspider.h | 10 | ||||
-rw-r--r-- | src/object/motion/motiontoto.cpp | 18 | ||||
-rw-r--r-- | src/object/motion/motiontoto.h | 11 | ||||
-rw-r--r-- | src/object/motion/motionvehicle.cpp | 24 | ||||
-rw-r--r-- | src/object/motion/motionvehicle.h | 10 | ||||
-rw-r--r-- | src/object/motion/motionworm.cpp | 22 | ||||
-rw-r--r-- | src/object/motion/motionworm.h | 10 |
18 files changed, 38 insertions, 253 deletions
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
{
|