diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 00:18:08 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 00:18:08 +0200 |
commit | 680af178196217bdd255d2bc851f240983144ac1 (patch) | |
tree | 77d713bace78c1becb1c96a2b36dd09e44d8d330 /src/object/task | |
parent | d6525b5661c364a46514aaa772c090ecb0bfd26c (diff) | |
download | colobot-680af178196217bdd255d2bc851f240983144ac1.tar.gz colobot-680af178196217bdd255d2bc851f240983144ac1.tar.bz2 colobot-680af178196217bdd255d2bc851f240983144ac1.zip |
Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
Diffstat (limited to 'src/object/task')
42 files changed, 394 insertions, 454 deletions
diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp index 6b8222e..ad1c848 100644 --- a/src/object/task/task.cpp +++ b/src/object/task/task.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 "motion.h"
-#include "camera.h"
-#include "sound.h"
-#include "robotmain.h"
-#include "displaytext.h"
-#include "task.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"
diff --git a/src/object/task/task.h b/src/object/task/task.h index f5685ef..1970f7f 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -16,11 +16,10 @@ // task.h
-#ifndef _TASK_H_
-#define _TASK_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -85,5 +84,3 @@ protected: CSound* m_sound;
};
-
-#endif //_TASK_H_
diff --git a/src/object/task/taskadvance.cpp b/src/object/task/taskadvance.cpp index 7860cb2..8bbc7b3 100644 --- a/src/object/task/taskadvance.cpp +++ b/src/object/task/taskadvance.cpp @@ -23,18 +23,18 @@ #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 "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "task.h"
-#include "taskadvance.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/taskadvance.h"
diff --git a/src/object/task/taskadvance.h b/src/object/task/taskadvance.h index 284cf12..8717728 100644 --- a/src/object/task/taskadvance.h +++ b/src/object/task/taskadvance.h @@ -16,12 +16,11 @@ // taskadvance.h
-#ifndef _TASKADVANCE_H_
-#define _TASKADVANCE_H_
+#pragma once
-#include "misc.h"
-#include "d3dengine.h"
+#include "common/misc.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -55,5 +54,3 @@ protected: BOOL m_bError;
};
-
-#endif //_TASKADVANCE_H_
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index cc1303b..5992e5d 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -23,28 +23,28 @@ #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 "auto.h"
-#include "camera.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "task.h"
-#include "taskbuild.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/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 "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 75a44f7..4f045b1 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -16,12 +16,11 @@ // taskbuild.h
-#ifndef _TASKBUILD_H_
-#define _TASKBUILD_H_
+#pragma once
-#include "misc.h"
-#include "object.h"
+#include "common/misc.h"
+#include "object/object.h"
class CInstanceManager;
@@ -89,5 +88,3 @@ protected: int m_soundChannel;
};
-
-#endif //_TASKBUILD_H_
diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 4fc0af5..0944931 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -23,20 +23,20 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "sound.h"
-#include "task.h"
-#include "taskfire.h"
+#include "common/struct.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"
diff --git a/src/object/task/taskfire.h b/src/object/task/taskfire.h index af371b2..72b5402 100644 --- a/src/object/task/taskfire.h +++ b/src/object/task/taskfire.h @@ -16,11 +16,10 @@ // taskfire.h
-#ifndef _TASKFIRE_H_
-#define _TASKTIRE_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -57,5 +56,3 @@ protected: int m_soundChannel;
};
-
-#endif //_TASKFIRE_H_
diff --git a/src/object/task/taskfireant.cpp b/src/object/task/taskfireant.cpp index 2c47adf..6947c1b 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -23,21 +23,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "motion.h"
-#include "motionant.h"
-#include "task.h"
-#include "taskfireant.h"
+#include "common/struct.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"
diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index 2504241..18eef90 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -16,11 +16,10 @@ // taskfireant.h
-#ifndef _TASKFIREANT_H_
-#define _TASKTIREANT_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -68,5 +67,3 @@ protected: float m_lastParticule;
};
-
-#endif //_TASKFIREANT_H_
diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index b965d08..6c228c4 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -23,25 +23,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "pyro.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "sound.h"
-#include "task.h"
-#include "taskflag.h"
+#include "common/struct.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 aa979f8..4c06630 100644 --- a/src/object/task/taskflag.h +++ b/src/object/task/taskflag.h @@ -15,11 +15,10 @@ // * along with this program. If not, see http://www.gnu.org/licenses/.
// taskflag.h
-#ifndef _TASKFLAG_H_
-#define _TASKFLAG_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -62,5 +61,3 @@ protected: BOOL m_bError;
};
-
-#endif //_TASKFLAG_H_
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index a6c836f..ec10f0a 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -23,19 +23,19 @@ #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 "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "task.h"
-#include "taskgoto.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 "graphics/common/water.h"
+#include "object/object.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 be54286..ed51d3b 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -16,12 +16,11 @@ // taskgoto.h
-#ifndef _TASKGOTO_H_
-#define _TASKGOTO_H_
+#pragma once
-#include "misc.h"
-#include "d3dengine.h"
+#include "common/misc.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -163,5 +162,3 @@ protected: BOOL m_bLeakRecede;
};
-
-#endif //_TASKGOTO_H_
diff --git a/src/object/task/taskgungoal.cpp b/src/object/task/taskgungoal.cpp index 7178d6c..013c3d4 100644 --- a/src/object/task/taskgungoal.cpp +++ b/src/object/task/taskgungoal.cpp @@ -23,16 +23,16 @@ #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 "object.h"
-#include "sound.h"
-#include "task.h"
-#include "taskgungoal.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"
diff --git a/src/object/task/taskgungoal.h b/src/object/task/taskgungoal.h index 4b6cbc7..14e42b4 100644 --- a/src/object/task/taskgungoal.h +++ b/src/object/task/taskgungoal.h @@ -16,11 +16,10 @@ // taskgungoal.h
-#ifndef _TASKGUNGOAL_H_
-#define _TASKGUNGOAL_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -53,5 +52,3 @@ protected: float m_finalDirH; // direction to reach
};
-
-#endif //_TASKGUNGOAL_H_
diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 51deb79..ba36cec 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -23,21 +23,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "sound.h"
-#include "auto.h"
-#include "autoinfo.h"
-#include "task.h"
-#include "taskinfo.h"
+#include "common/struct.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 "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 26b2071..1461c3e 100644 --- a/src/object/task/taskinfo.h +++ b/src/object/task/taskinfo.h @@ -16,11 +16,10 @@ // taskinfo.h
-#ifndef _TASKINFO_H_
-#define _TASKINFO_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -53,5 +52,3 @@ protected: BOOL m_bError;
};
-
-#endif //_TASKINFO_H_
diff --git a/src/object/task/taskmanager.cpp b/src/object/task/taskmanager.cpp index ffc0d05..43ac2af 100644 --- a/src/object/task/taskmanager.cpp +++ b/src/object/task/taskmanager.cpp @@ -23,33 +23,33 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "misc.h"
-#include "iman.h"
-#include "event.h"
-#include "object.h"
-#include "task.h"
-#include "taskwait.h"
-#include "taskadvance.h"
-#include "taskturn.h"
-#include "taskgoto.h"
-#include "tasktake.h"
-#include "taskmanip.h"
-#include "taskflag.h"
-#include "taskbuild.h"
-#include "tasksearch.h"
-#include "taskterraform.h"
-#include "taskpen.h"
-#include "taskrecover.h"
-#include "taskshield.h"
-#include "taskinfo.h"
-#include "taskfire.h"
-#include "taskfireant.h"
-#include "taskgungoal.h"
-#include "taskspiderexplo.h"
-#include "taskreset.h"
-#include "taskmanager.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/misc.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 2c6c21f..8c7e093 100644 --- a/src/object/task/taskmanager.h +++ b/src/object/task/taskmanager.h @@ -16,15 +16,15 @@ // taskmanager.h
-#ifndef _TASKMANAGER_H_
-#define _TASKMANAGER_H_
+#pragma once
-#include "misc.h"
-#include "object.h"
-#include "taskmanip.h"
-#include "taskgoto.h"
-#include "taskshield.h"
-#include "taskflag.h"
+
+#include "common/misc.h"
+#include "object/object.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskgoto.h"
+#include "object/task/taskshield.h"
+#include "object/task/taskflag.h"
class CInstanceManager;
@@ -73,5 +73,3 @@ protected: BOOL m_bPilot;
};
-
-#endif //_TASKMANAGER_H_
diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 672b96e..90dc016 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "terrain.h"
-#include "object.h"
-#include "pyro.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "sound.h"
-#include "robotmain.h"
-#include "task.h"
-#include "taskmanip.h"
+#include "common/struct.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 "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 "object/robotmain.h"
+#include "object/task/task.h"
+#include "object/task/taskmanip.h"
//?#define MARGIN_FRONT 2.0f
diff --git a/src/object/task/taskmanip.h b/src/object/task/taskmanip.h index bc746cf..db25dd3 100644 --- a/src/object/task/taskmanip.h +++ b/src/object/task/taskmanip.h @@ -16,13 +16,12 @@ // taskmanip.h
-#ifndef _TASKMANIP_H_
-#define _TASKMANIP_H_
+#pragma once
-#include "task.h"
-#include "misc.h"
-#include "d3dengine.h"
+#include "object/task/task.h"
+#include "common/misc.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -105,5 +104,3 @@ protected: ObjectType m_fretType;
};
-
-#endif //_TASKMANIP_H_
diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 7d95f21..267c221 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionant.h"
-#include "motionspider.h"
-#include "task.h"
-#include "taskpen.h"
+#include "common/struct.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"
diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h index 752a52d..4beb9ac 100644 --- a/src/object/task/taskpen.h +++ b/src/object/task/taskpen.h @@ -16,11 +16,10 @@ // taskpen.h
-#ifndef _TASKSPEN_H_
-#define _TASKSPEN_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -73,5 +72,3 @@ protected: float m_timeDown;
};
-
-#endif //_TASKSPEN_H_
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 1284bb5..070d429 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -23,21 +23,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "task.h"
-#include "taskrecover.h"
+#include "common/struct.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"
#define ENERGY_RECOVER 0.25f // energy consumed by recovery
diff --git a/src/object/task/taskrecover.h b/src/object/task/taskrecover.h index cc2adce..d8625ad 100644 --- a/src/object/task/taskrecover.h +++ b/src/object/task/taskrecover.h @@ -16,11 +16,10 @@ // taskrecover.h
-#ifndef _TASKSRECOVER_H_
-#define _TASKSRECOVER_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -71,5 +70,3 @@ protected: int m_soundChannel;
};
-
-#endif //_TASKSRECOVER_H_
diff --git a/src/object/task/taskreset.cpp b/src/object/task/taskreset.cpp index a626c02..5616c0c 100644 --- a/src/object/task/taskreset.cpp +++ b/src/object/task/taskreset.cpp @@ -23,21 +23,21 @@ #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 "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "sound.h"
-#include "robotmain.h"
-#include "task.h"
-#include "taskreset.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/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"
diff --git a/src/object/task/taskreset.h b/src/object/task/taskreset.h index a866d1f..6665bce 100644 --- a/src/object/task/taskreset.h +++ b/src/object/task/taskreset.h @@ -16,12 +16,11 @@ // taskreset.h
-#ifndef _TASKRESET_H_
-#define _TASKRESET_H_
+#pragma once
-#include "misc.h"
-#include "d3dengine.h"
+#include "common/misc.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -69,5 +68,3 @@ protected: float m_iAngle;
};
-
-#endif //_TASKRESET_H_
diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 8857e35..7007691 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -23,21 +23,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "task.h"
-#include "tasksearch.h"
+#include "common/struct.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 80970e1..18254cc 100644 --- a/src/object/task/tasksearch.h +++ b/src/object/task/tasksearch.h @@ -16,11 +16,10 @@ // tasksearch.h
-#ifndef _TASKSEARCH_H_
-#define _TASKSEARCH_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -75,5 +74,3 @@ protected: BOOL m_bError;
};
-
-#endif //_TASKSEARCH_H_
diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 9269c4b..03cc571 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -23,21 +23,22 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "camera.h"
-#include "light.h"
-#include "sound.h"
-#include "task.h"
-#include "taskshield.h"
+#include "math/const.h"
+#include "common/struct.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 "graphics/common/light.h"
+#include "sound/sound.h"
+#include "object/task/task.h"
+#include "object/task/taskshield.h"
#define ENERGY_TIME 20.0f // maximum duration if full battery
diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index 8ec2d05..6fa1540 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -16,12 +16,11 @@ // taskshield.h
-#ifndef _TASKSHIELD_H_
-#define _TASKSHIELD_H_
+#pragma once
-#include "misc.h"
-#include "d3dengine.h"
+#include "common/misc.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -90,5 +89,3 @@ protected: int m_effectLight;
};
-
-#endif //_TASKSHIELD_H_
diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index b655fe6..2f7717c 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -23,19 +23,19 @@ #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 "object.h"
-#include "physics.h"
-#include "pyro.h"
-#include "motion.h"
-#include "motionspider.h"
-#include "task.h"
-#include "taskspiderexplo.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 "graphics/common/pyro.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionspider.h"
+#include "object/task/task.h"
+#include "object/task/taskspiderexplo.h"
diff --git a/src/object/task/taskspiderexplo.h b/src/object/task/taskspiderexplo.h index fb7f5f6..3e68279 100644 --- a/src/object/task/taskspiderexplo.h +++ b/src/object/task/taskspiderexplo.h @@ -16,11 +16,10 @@ // taskspiderexplo.h
-#ifndef _TASKSPIDEREXPLO_H_
-#define _TASKSPIDEREXPLO_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -49,5 +48,3 @@ protected: BOOL m_bError;
};
-
-#endif //_TASKSPIDEREXPLO_H_
diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 35de2b7..912033f 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -23,25 +23,26 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "water.h"
-#include "camera.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "sound.h"
-#include "robotmain.h"
-#include "task.h"
-#include "tasktake.h"
+#include "math/const.h"
+#include "common/struct.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 "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 "object/motion/motionhuman.h"
+#include "sound/sound.h"
+#include "object/robotmain.h"
+#include "object/task/task.h"
+#include "object/task/tasktake.h"
diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index 80b8736..31ccfef 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -16,12 +16,11 @@ // tasktake.h
-#ifndef _TASKTAKE_H_
-#define _TASKTAKE_H_
+#pragma once
-#include "misc.h"
-#include "object.h"
+#include "common/misc.h"
+#include "object/object.h"
class CInstanceManager;
@@ -81,5 +80,3 @@ protected: ObjectType m_fretType;
};
-
-#endif //_TASKTAKE_H_
diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index e2f75fc..9e07e05 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -23,25 +23,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "language.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "pyro.h"
-#include "brain.h"
-#include "camera.h"
-#include "sound.h"
-#include "motion.h"
-#include "motionant.h"
-#include "motionspider.h"
-#include "task.h"
-#include "taskterraform.h"
+#include "common/struct.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"
#define ENERGY_TERRA 0.40f // energy consumed by blow
diff --git a/src/object/task/taskterraform.h b/src/object/task/taskterraform.h index 254e363..bc66c66 100644 --- a/src/object/task/taskterraform.h +++ b/src/object/task/taskterraform.h @@ -16,12 +16,11 @@ // taskterraform.h
-#ifndef _TASKSTERRAFORM_H_
-#define _TASKSTERRAFORM_H_
+#pragma once
-#include "misc.h"
-#include "d3dengine.h"
+#include "common/misc.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -68,5 +67,3 @@ protected: D3DVECTOR m_terraPos;
};
-
-#endif //_TASKSTERRAFORM_H_
diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index 832f523..d75f9d1 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -23,18 +23,18 @@ #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 "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "task.h"
-#include "taskturn.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/taskturn.h"
diff --git a/src/object/task/taskturn.h b/src/object/task/taskturn.h index abaef57..27cba98 100644 --- a/src/object/task/taskturn.h +++ b/src/object/task/taskturn.h @@ -16,11 +16,10 @@ // taskturn.h
-#ifndef _TASKTURN_H_
-#define _TASKTURN_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -51,5 +50,3 @@ protected: BOOL m_bError;
};
-
-#endif //_TASKTURN_H_
diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index af06383..7560e9a 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -23,18 +23,18 @@ #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 "terrain.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "task.h"
-#include "taskwait.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"
diff --git a/src/object/task/taskwait.h b/src/object/task/taskwait.h index e8ba2b6..7a33f49 100644 --- a/src/object/task/taskwait.h +++ b/src/object/task/taskwait.h @@ -16,11 +16,10 @@ // taskwait.h
-#ifndef _TASKWAIT_H_
-#define _TASKWAIT_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -49,5 +48,3 @@ protected: BOOL m_bEnded;
};
-
-#endif //_TASKWAIT_H_
|