diff options
Diffstat (limited to 'src/object/motion')
-rw-r--r-- | src/object/motion/motion.cpp | 37 | ||||
-rw-r--r-- | src/object/motion/motion.h | 7 | ||||
-rw-r--r-- | src/object/motion/motionant.cpp | 34 | ||||
-rw-r--r-- | src/object/motion/motionant.h | 7 | ||||
-rw-r--r-- | src/object/motion/motionbee.cpp | 34 | ||||
-rw-r--r-- | src/object/motion/motionbee.h | 7 | ||||
-rw-r--r-- | src/object/motion/motionhuman.cpp | 38 | ||||
-rw-r--r-- | src/object/motion/motionhuman.h | 9 | ||||
-rw-r--r-- | src/object/motion/motionmother.cpp | 34 | ||||
-rw-r--r-- | src/object/motion/motionmother.h | 7 | ||||
-rw-r--r-- | src/object/motion/motionspider.cpp | 34 | ||||
-rw-r--r-- | src/object/motion/motionspider.h | 7 | ||||
-rw-r--r-- | src/object/motion/motiontoto.cpp | 36 | ||||
-rw-r--r-- | src/object/motion/motiontoto.h | 11 | ||||
-rw-r--r-- | src/object/motion/motionvehicle.cpp | 34 | ||||
-rw-r--r-- | src/object/motion/motionvehicle.h | 7 | ||||
-rw-r--r-- | src/object/motion/motionworm.cpp | 34 | ||||
-rw-r--r-- | src/object/motion/motionworm.h | 7 |
18 files changed, 179 insertions, 205 deletions
diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index 642108b..27e5f9c 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -23,24 +23,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "motion.h"
+#include "math/all.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 "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 5aa0afb..ce7b522 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -16,11 +16,10 @@ // motion.h
-#ifndef _MOTION_H_
-#define _MOTION_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -90,5 +89,3 @@ protected: D3DVECTOR m_inclinaison; // tilt
};
-
-#endif //_MOTION_H_
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index 3273f76..ca7505b 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionant.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 "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 e8d79c6..4d5781a 100644 --- a/src/object/motion/motionant.h +++ b/src/object/motion/motionant.h @@ -16,11 +16,10 @@ // motionant.h
-#ifndef _MOTIONANT_H_
-#define _MOTIONANT_H_
+#pragma once
-#include "motion.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -76,5 +75,3 @@ protected: float m_lastParticule;
};
-
-#endif //_MOTIONANT_H_
diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index 1325a11..21a465a 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionbee.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 "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"
diff --git a/src/object/motion/motionbee.h b/src/object/motion/motionbee.h index facf650..e73e2d3 100644 --- a/src/object/motion/motionbee.h +++ b/src/object/motion/motionbee.h @@ -16,11 +16,10 @@ // motionbee.h
-#ifndef _MOTIONBEE_H_
-#define _MOTIONBEE_H_
+#pragma once
-#include "motion.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -69,5 +68,3 @@ protected: BOOL m_bArmStop;
};
-
-#endif //_MOTIONBEE_H_
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index de1981e..c164570 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -23,25 +23,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionhuman.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 "graphics/common/camera.h"
+#include "common/modfile.h"
+#include "object/robotmain.h"
+#include "sound/sound.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h index 44a0c4c..2cb685a 100644 --- a/src/object/motion/motionhuman.h +++ b/src/object/motion/motionhuman.h @@ -16,12 +16,11 @@ // motionhuman.h
-#ifndef _MOTIONHUMAN_H_
-#define _MOTIONHUMAN_H_
+#pragma once
-#include "motion.h"
-#include "misc.h"
+#include "common/misc.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -98,5 +97,3 @@ protected: BOOL m_bDisplayPerso;
};
-
-#endif //_MOTIONHUMAN_H_
diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp index 697521f..8e0073b 100644 --- a/src/object/motion/motionmother.cpp +++ b/src/object/motion/motionmother.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionmother.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 "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"
diff --git a/src/object/motion/motionmother.h b/src/object/motion/motionmother.h index 6e8eb32..3c5cb94 100644 --- a/src/object/motion/motionmother.h +++ b/src/object/motion/motionmother.h @@ -16,11 +16,10 @@ // motionmother.h
-#ifndef _MOTIONMOTHER_H_
-#define _MOTIONMOTHER_H_
+#pragma once
-#include "motion.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -63,5 +62,3 @@ protected: BOOL m_bArmStop;
};
-
-#endif //_MOTIONMOTHER_H_
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index e35b4b3..7b51290 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionspider.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 "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 294daf3..f642afe 100644 --- a/src/object/motion/motionspider.h +++ b/src/object/motion/motionspider.h @@ -16,11 +16,10 @@ // motionspider.h
-#ifndef _MOTIONSPIDER_H_
-#define _MOTIONSPIDER_H_
+#pragma once
-#include "motion.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -74,5 +73,3 @@ protected: float m_lastParticule;
};
-
-#endif //_MOTIONSPIDER_H_
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index c61980a..7ba4192 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -23,24 +23,24 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "modfile.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "motion.h"
-#include "motiontoto.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 "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 22955bb..3549638 100644 --- a/src/object/motion/motiontoto.h +++ b/src/object/motion/motiontoto.h @@ -16,13 +16,12 @@ // motiontoto.h
-#ifndef _MOTIONTOTO_H_
-#define _MOTIONTOTO_H_
+#pragma once
-#include "struct.h"
-#include "object.h"
-#include "motion.h"
+#include "common/struct.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -77,5 +76,3 @@ protected: FPOINT m_mousePos;
};
-
-#endif //_MOTIONTOTO_H_
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 68a0f3e..61b4db5 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionvehicle.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 "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/motionvehicle.h"
diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h index 1b351c4..23e6ebc 100644 --- a/src/object/motion/motionvehicle.h +++ b/src/object/motion/motionvehicle.h @@ -16,11 +16,10 @@ // motionvehicle.h
-#ifndef _MOTIONVEHICLE_H_
-#define _MOTIONVEHICLE_H_
+#pragma once
-#include "motion.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -78,5 +77,3 @@ protected: float m_traceWidth;
};
-
-#endif //_MOTIONVEHICLE_H_
diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index 5da2b2c..03c6a12 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "modfile.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionworm.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 "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/motionworm.h"
diff --git a/src/object/motion/motionworm.h b/src/object/motion/motionworm.h index cabb2ba..3422e49 100644 --- a/src/object/motion/motionworm.h +++ b/src/object/motion/motionworm.h @@ -16,11 +16,10 @@ // motionworm.h
-#ifndef _MOTIONWORM_H_
-#define _MOTIONWORM_H_
+#pragma once
-#include "motion.h"
+#include "object/motion/motion.h"
class CInstanceManager;
@@ -71,5 +70,3 @@ protected: float m_lastParticule;
};
-
-#endif //_MOTIONWORM_H_
|