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 | |
| 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')
118 files changed, 1344 insertions, 1507 deletions
diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 9711423..0600d86 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -21,34 +21,34 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "water.h"
-#include "cloud.h"
-#include "planet.h"
-#include "blitz.h"
-#include "camera.h"
-#include "object.h"
-#include "modfile.h"
-#include "interface.h"
-#include "button.h"
-#include "list.h"
-#include "label.h"
-#include "gauge.h"
-#include "window.h"
-#include "robotmain.h"
-#include "displaytext.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "auto.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/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 "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"
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index 4cc9389..96f0212 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -16,11 +16,10 @@ // auto.h
-#ifndef _AUTO_H_
-#define _AUTO_H_
+#pragma once
-#include "object.h"
+#include "object/object.h"
class CInstanceManager;
@@ -110,5 +109,3 @@ protected: float m_progressTotal;
};
-
-#endif //_AUTO_H_
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index ca29fd2..f7c3ca6 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -21,30 +21,30 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "cloud.h"
-#include "planet.h"
-#include "blitz.h"
-#include "camera.h"
-#include "object.h"
-#include "physics.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "displaytext.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "auto.h"
-#include "autobase.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.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/cloud.h"
+#include "graphics/common/planet.h"
+#include "graphics/common/blitz.h"
+#include "graphics/common/camera.h"
+#include "object/object.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"
diff --git a/src/object/auto/autobase.h b/src/object/auto/autobase.h index 7e0093a..5610d6e 100644 --- a/src/object/auto/autobase.h +++ b/src/object/auto/autobase.h @@ -16,12 +16,11 @@ // autobase.h
-#ifndef _AUTOBASE_H_
-#define _AUTOBASE_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -118,5 +117,3 @@ protected: D3DCOLOR m_bgCloudDown;
};
-
-#endif //_AUTOBASE_H_
diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index c1fa75c..54d495a 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -21,26 +21,26 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autoconvert.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/window.h"
+#include "sound/sound.h"
+#include "ui/displaytext.h"
+#include "script/cmdtoken.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoconvert.h"
diff --git a/src/object/auto/autoconvert.h b/src/object/auto/autoconvert.h index 2e35e24..dbe7b26 100644 --- a/src/object/auto/autoconvert.h +++ b/src/object/auto/autoconvert.h @@ -16,12 +16,11 @@ // autoconvert.h
-#ifndef _AUTOCONVERT_H_
-#define _AUTOCONVERT_H_
+#pragma once_
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -78,5 +77,3 @@ protected: int m_soundChannel;
};
-
-#endif //_AUTOCONVERT_H_
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index bea3c06..b28652f 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -21,25 +21,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autoderrick.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 "sound/sound.h"
+#include "ui/displaytext.h"
+#include "script/cmdtoken.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoderrick.h"
diff --git a/src/object/auto/autoderrick.h b/src/object/auto/autoderrick.h index 6c9293d..841831d 100644 --- a/src/object/auto/autoderrick.h +++ b/src/object/auto/autoderrick.h @@ -16,12 +16,11 @@ // autoderrick.h
-#ifndef _AUTODERRICK_H_
-#define _AUTODERRICK_H_
+#pragma once
-#include "object.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -80,5 +79,3 @@ protected: BOOL m_bSoundFall;
};
-
-#endif //_AUTODERRICK_H_
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index 417fea2..47b18cf 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -21,28 +21,28 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "physics.h"
-#include "pyro.h"
-#include "sound.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "robotmain.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autodestroyer.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"
diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h index a69f832..5fd0437 100644 --- a/src/object/auto/autodestroyer.h +++ b/src/object/auto/autodestroyer.h @@ -16,11 +16,10 @@ // autodestroyer.h
-#ifndef _AUTODESTROYER_H_
-#define _AUTODESTROYER_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -72,5 +71,3 @@ protected: BOOL m_bExplo;
};
-
-#endif //_AUTODESTROYER_H_
diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 81e555d..239e666 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -21,21 +21,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "pyro.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autoegg.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 "graphics/common/pyro.h"
+#include "script/cmdtoken.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoegg.h"
diff --git a/src/object/auto/autoegg.h b/src/object/auto/autoegg.h index 4340a9b..6728f7d 100644 --- a/src/object/auto/autoegg.h +++ b/src/object/auto/autoegg.h @@ -16,13 +16,12 @@ // autoegg.h
-#ifndef _AUTOEGG_H_
-#define _AUTOEGG_H_
+#pragma once
-#include "object.h"
-#include "auto.h"
-#include "misc.h"
+#include "object/object.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -79,5 +78,3 @@ protected: float m_speed;
};
-
-#endif //_AUTOEGG_H_
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index 2b25cdf..3f274bd 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -21,27 +21,28 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "gauge.h"
-#include "window.h"
-#include "displaytext.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autoenergy.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/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"
diff --git a/src/object/auto/autoenergy.h b/src/object/auto/autoenergy.h index dd920fb..009bf85 100644 --- a/src/object/auto/autoenergy.h +++ b/src/object/auto/autoenergy.h @@ -16,12 +16,11 @@ // autoenergy.h
-#ifndef _AUTOENERGY_H_
-#define _AUTOENERGY_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -79,5 +78,3 @@ protected: int m_partiSphere;
};
-
-#endif //_AUTOENERGY_H_
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index bc3788c..e81f3e8 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -21,31 +21,32 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "restext.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "physics.h"
-#include "brain.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "displaytext.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autofactory.h"
+#include "math/const.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/restext.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 "physics/physics.h"
+#include "object/brain.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"
diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h index bcfc43e..00e1d6b 100644 --- a/src/object/auto/autofactory.h +++ b/src/object/auto/autofactory.h @@ -16,11 +16,10 @@ // autofactory.h
-#ifndef _AUTOFACTORY_H_
-#define _AUTOFACTORY_H_
+#pragma once
-#include "auto.h"
+#include "object/auto/auto.h"
class CInstanceManager;
@@ -81,5 +80,3 @@ protected: int m_channelSound;
};
-
-#endif //_AUTOFACTORY_H_
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index 04ae230..4e29a96 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -21,19 +21,19 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "auto.h"
-#include "autoflag.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 "object/auto/auto.h"
+#include "object/auto/autoflag.h"
diff --git a/src/object/auto/autoflag.h b/src/object/auto/autoflag.h index 4ef0fe4..654f7a2 100644 --- a/src/object/auto/autoflag.h +++ b/src/object/auto/autoflag.h @@ -16,12 +16,11 @@ // autoflag.h
-#ifndef _AUTOFLAG_H_
-#define _AUTOFLAG_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -54,5 +53,3 @@ protected: float m_progress;
};
-
-#endif //_AUTOFLAG_H_
diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp index 6fb70e8..f3b7168 100644 --- a/src/object/auto/autohuston.cpp +++ b/src/object/auto/autohuston.cpp @@ -21,22 +21,22 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "auto.h"
-#include "autohuston.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"
diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h index 0611eb2..8e26aa1 100644 --- a/src/object/auto/autohuston.h +++ b/src/object/auto/autohuston.h @@ -16,12 +16,11 @@ // autohuston.h
-#ifndef _AUTOHUSTON_H_
-#define _AUTOHUSTON_H_
+#pragma once
-#include "auto.h"
-#include "particule.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -73,5 +72,3 @@ protected: int m_lensTotal;
};
-
-#endif //_AUTOHUSTON_H_
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp index f8d7bd3..713b148 100644 --- a/src/object/auto/autoinfo.cpp +++ b/src/object/auto/autoinfo.cpp @@ -21,26 +21,26 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "list.h"
-#include "window.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autoinfo.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 "script/cmdtoken.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoinfo.h"
diff --git a/src/object/auto/autoinfo.h b/src/object/auto/autoinfo.h index 28fc9ab..412a0af 100644 --- a/src/object/auto/autoinfo.h +++ b/src/object/auto/autoinfo.h @@ -16,12 +16,11 @@ // autoinfo.h
-#ifndef _AUTOINFO_H_
-#define _AUTOINFO_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -76,5 +75,3 @@ protected: BOOL m_bLastVirus;
};
-
-#endif //_AUTOINFO_H_
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp index 7c191a5..aec152e 100644 --- a/src/object/auto/autojostle.cpp +++ b/src/object/auto/autojostle.cpp @@ -21,25 +21,26 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "list.h"
-#include "window.h"
-#include "sound.h"
-#include "auto.h"
-#include "autojostle.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"
diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h index 18027a0..d154ef1 100644 --- a/src/object/auto/autojostle.h +++ b/src/object/auto/autojostle.h @@ -16,12 +16,11 @@ // autojostle.h
-#ifndef _AUTOJOSTLE_H_
-#define _AUTOJOSTLE_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -56,5 +55,3 @@ protected: Error m_error;
};
-
-#endif //_AUTOJOSTLE_H_
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index c090c6f..79a9e2d 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -21,22 +21,22 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "camera.h"
-#include "object.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autokid.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"
diff --git a/src/object/auto/autokid.h b/src/object/auto/autokid.h index dc5305b..8e1c3af 100644 --- a/src/object/auto/autokid.h +++ b/src/object/auto/autokid.h @@ -16,12 +16,11 @@ // autokid.h
-#ifndef _AUTOKID_H_
-#define _AUTOKID_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -55,5 +54,3 @@ protected: BOOL m_bSilent;
};
-
-#endif //_AUTOKID_H_
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 4c61abc..06440a1 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -21,28 +21,29 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "displaytext.h"
-#include "sound.h"
-#include "robotmain.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autolabo.h"
+#include "math/const.h"
+#include "common/struct.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 "ui/displaytext.h"
+#include "sound/sound.h"
+#include "object/robotmain.h"
+#include "script/cmdtoken.h"
+#include "object/auto/auto.h"
+#include "object/auto/autolabo.h"
diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 997bc55..0b1e91b 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -16,12 +16,11 @@ // autolabo.h
-#ifndef _AUTOLABO_H_
-#define _AUTOLABO_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -83,5 +82,3 @@ protected: int m_soundChannel;
};
-
-#endif //_AUTOLABO_H_
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index c4494a2..0a7ed4f 100644 --- a/src/object/auto/automush.cpp +++ b/src/object/auto/automush.cpp @@ -21,21 +21,22 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "cmdtoken.h"
-#include "sound.h"
-#include "auto.h"
-#include "automush.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"
diff --git a/src/object/auto/automush.h b/src/object/auto/automush.h index 81314ee..5b5ea30 100644 --- a/src/object/auto/automush.h +++ b/src/object/auto/automush.h @@ -16,12 +16,11 @@ // automush.h
-#ifndef _AUTOMUSH_H_
-#define _AUTOMUSH_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -69,5 +68,3 @@ protected: float m_lastParticule;
};
-
-#endif //_AUTOMUSH_H_
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 10e882a..370dfe9 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -21,20 +21,20 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autonest.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"
diff --git a/src/object/auto/autonest.h b/src/object/auto/autonest.h index 0c6febc..1052462 100644 --- a/src/object/auto/autonest.h +++ b/src/object/auto/autonest.h @@ -16,12 +16,11 @@ // autonest.h
-#ifndef _AUTONEST_H_
-#define _AUTONEST_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -69,5 +68,3 @@ protected: D3DVECTOR m_fretPos;
};
-
-#endif //_AUTONEST_H_
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp index ace2b87..160787b 100644 --- a/src/object/auto/autonuclear.cpp +++ b/src/object/auto/autonuclear.cpp @@ -21,27 +21,27 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autonuclear.h"
+#include "common/struct.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"
diff --git a/src/object/auto/autonuclear.h b/src/object/auto/autonuclear.h index e62282a..bdb828b 100644 --- a/src/object/auto/autonuclear.h +++ b/src/object/auto/autonuclear.h @@ -16,12 +16,11 @@ // autonuclear.h
-#ifndef _AUTONUCLEAR_H_
-#define _AUTONUCLEAR_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -76,5 +75,3 @@ protected: int m_channelSound;
};
-
-#endif //_AUTONUCLEAR_H_
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp index 38d6a38..464c9c2 100644 --- a/src/object/auto/autopara.cpp +++ b/src/object/auto/autopara.cpp @@ -21,27 +21,27 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autopara.h"
+#include "common/struct.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"
diff --git a/src/object/auto/autopara.h b/src/object/auto/autopara.h index 9a7c0c4..813d5d5 100644 --- a/src/object/auto/autopara.h +++ b/src/object/auto/autopara.h @@ -16,12 +16,11 @@ // autopara.h
-#ifndef _AUTOPARA_H_
-#define _AUTOPARA_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -73,5 +72,3 @@ protected: int m_channelSound;
};
-
-#endif //_AUTOPARA_H_
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 2b1e801..302b8a6 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -21,25 +21,26 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "displaytext.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "auto.h"
-#include "autoportico.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"
diff --git a/src/object/auto/autoportico.h b/src/object/auto/autoportico.h index 7ed2e70..3a5e99b 100644 --- a/src/object/auto/autoportico.h +++ b/src/object/auto/autoportico.h @@ -16,12 +16,11 @@ // autoportico.h
-#ifndef _AUTOPORTICO_H_
-#define _AUTOPORTICO_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -77,5 +76,3 @@ protected: int m_soundChannel;
};
-
-#endif //_AUTOPORTICO_H_
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index cabd46b..cf33cf6 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -21,24 +21,24 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "gauge.h"
-#include "sound.h"
-#include "auto.h"
-#include "autoradar.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/gauge.h"
+#include "sound/sound.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoradar.h"
diff --git a/src/object/auto/autoradar.h b/src/object/auto/autoradar.h index 298d011..18ba5a8 100644 --- a/src/object/auto/autoradar.h +++ b/src/object/auto/autoradar.h @@ -16,12 +16,11 @@ // autoradar.h
-#ifndef _AUTORADAR_H_
-#define _AUTORADAR_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -72,5 +71,3 @@ protected: int m_totalDetect;
};
-
-#endif //_AUTORADAR_H_
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index e9f7e90..e6a0603 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -21,27 +21,28 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "physics.h"
-#include "sound.h"
-#include "interface.h"
-#include "button.h"
-#include "window.h"
-#include "robotmain.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autorepair.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"
diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h index 1383fc7..9f5cc5e 100644 --- a/src/object/auto/autorepair.h +++ b/src/object/auto/autorepair.h @@ -16,12 +16,11 @@ // autorepair.h
-#ifndef _AUTOREPAIR_H_
-#define _AUTOREPAIR_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -73,4 +72,3 @@ protected: };
-#endif //_AUTOREPAIR_H_
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index 26db8fb..735d6cd 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -21,28 +21,29 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "gauge.h"
-#include "window.h"
-#include "displaytext.h"
-#include "sound.h"
-#include "robotmain.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autoresearch.h"
+#include "math/const.h"
+#include "common/struct.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 "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"
diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h index f773084..a8bfcb9 100644 --- a/src/object/auto/autoresearch.h +++ b/src/object/auto/autoresearch.h @@ -16,12 +16,11 @@ // autoresearch.h
-#ifndef _AUTORESEARCH_H_
-#define _AUTORESEARCH_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -78,5 +77,3 @@ protected: int m_channelSound;
};
-
-#endif //_AUTORESEARCH_H_
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index 21e279d..f502e54 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -21,19 +21,19 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "auto.h"
-#include "autoroot.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 "object/auto/auto.h"
+#include "object/auto/autoroot.h"
diff --git a/src/object/auto/autoroot.h b/src/object/auto/autoroot.h index 85bdb69..8b62d58 100644 --- a/src/object/auto/autoroot.h +++ b/src/object/auto/autoroot.h @@ -16,12 +16,11 @@ // autoroot.h
-#ifndef _AUTOROOT_H_
-#define _AUTOROOT_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -52,5 +51,3 @@ protected: D3DVECTOR m_center;
};
-
-#endif //_AUTOROOT_H_
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp index a5043a3..fc71cd9 100644 --- a/src/object/auto/autosafe.cpp +++ b/src/object/auto/autosafe.cpp @@ -21,28 +21,28 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "robotmain.h"
-#include "window.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autosafe.h"
+#include "common/struct.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"
diff --git a/src/object/auto/autosafe.h b/src/object/auto/autosafe.h index b60472d..9cfaca0 100644 --- a/src/object/auto/autosafe.h +++ b/src/object/auto/autosafe.h @@ -16,12 +16,11 @@ // autosafe.h
-#ifndef _AUTOSAFE_H_
-#define _AUTOSAFE_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -82,5 +81,3 @@ protected: int m_keyParti[4];
};
-
-#endif //_AUTOSAFE_H_
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 81d81fe..3d5f82a 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -21,25 +21,25 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "light.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "interface.h"
-#include "button.h"
-#include "gauge.h"
-#include "window.h"
-#include "sound.h"
-#include "auto.h"
-#include "autostation.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/gauge.h"
+#include "ui/window.h"
+#include "sound/sound.h"
+#include "object/auto/auto.h"
+#include "object/auto/autostation.h"
diff --git a/src/object/auto/autostation.h b/src/object/auto/autostation.h index d783cc9..40ad57b 100644 --- a/src/object/auto/autostation.h +++ b/src/object/auto/autostation.h @@ -16,12 +16,11 @@ // autostation.h
-#ifndef _AUTOSTATION_H_
-#define _AUTOSTATION_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -64,5 +63,3 @@ protected: float m_energyVirus;
};
-
-#endif //_AUTOSTATION_H_
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index d5cebcd..ea3cd54 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -21,28 +21,29 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "camera.h"
-#include "object.h"
-#include "physics.h"
-#include "interface.h"
-#include "button.h"
-#include "gauge.h"
-#include "window.h"
-#include "sound.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "auto.h"
-#include "autotower.h"
+#include "math/const.h"
+#include "common/struct.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"
diff --git a/src/object/auto/autotower.h b/src/object/auto/autotower.h index fa7e6cb..64448d3 100644 --- a/src/object/auto/autotower.h +++ b/src/object/auto/autotower.h @@ -16,12 +16,11 @@ // autotower.h
-#ifndef _AUTOTOWER_H_
-#define _AUTOTOWER_H_
+#pragma once
-#include "auto.h"
-#include "misc.h"
+#include "object/auto/auto.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -82,5 +81,3 @@ protected: int m_partiStop[4];
};
-
-#endif //_AUTOTOWER_H_
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index e942e5d..698f4d8 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -22,50 +22,50 @@ #include <d3d.h>
#include "CBot/CBotDll.h"
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "robotmain.h"
-#include "terrain.h"
-#include "water.h"
-#include "camera.h"
-#include "object.h"
-#include "physics.h"
-#include "motion.h"
-#include "motionspider.h"
-#include "pyro.h"
-#include "taskmanager.h"
-#include "task.h"
-#include "taskmanip.h"
-#include "taskflag.h"
-#include "taskshield.h"
-#include "script.h"
-#include "studio.h"
-#include "interface.h"
-#include "button.h"
-#include "color.h"
-#include "edit.h"
-#include "list.h"
-#include "label.h"
-#include "group.h"
-#include "gauge.h"
-#include "slider.h"
-#include "compass.h"
-#include "target.h"
-#include "window.h"
-#include "displaytext.h"
-#include "text.h"
-#include "sound.h"
-#include "particule.h"
-#include "cmdtoken.h"
-#include "brain.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionspider.h"
+#include "graphics/common/pyro.h"
+#include "object/task/taskmanager.h"
+#include "object/task/task.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskflag.h"
+#include "object/task/taskshield.h"
+#include "script/script.h"
+#include "ui/studio.h"
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/color.h"
+#include "ui/edit.h"
+#include "ui/list.h"
+#include "ui/label.h"
+#include "ui/group.h"
+#include "ui/gauge.h"
+#include "ui/slider.h"
+#include "ui/compass.h"
+#include "ui/target.h"
+#include "ui/window.h"
+#include "ui/displaytext.h"
+#include "graphics/common/text.h"
+#include "sound/sound.h"
+#include "graphics/common/particule.h"
+#include "script/cmdtoken.h"
+#include "object/brain.h"
diff --git a/src/object/brain.h b/src/object/brain.h index 988a3cc..348f059 100644 --- a/src/object/brain.h +++ b/src/object/brain.h @@ -16,16 +16,15 @@ // brain.h
-#ifndef _BRAIN_H_
-#define _BRAIN_H_
+#pragma once
-#include "misc.h"
-#include "event.h"
-#include "object.h"
-#include "taskmanip.h"
-#include "taskflag.h"
-#include "taskshield.h"
+#include "common/misc.h"
+#include "common/event.h"
+#include "object/object.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskflag.h"
+#include "object/task/taskshield.h"
class CInstanceManager;
@@ -216,5 +215,3 @@ protected: TraceRecord* m_traceRecordBuffer;
};
-
-#endif //_BRAIN_H_
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_
diff --git a/src/object/object.cpp b/src/object/object.cpp index 0757e46..8e3818e 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -24,69 +24,69 @@ #include <d3d.h>
#include "CBot/CBotDll.h"
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "mainmovie.h"
-#include "robotmain.h"
-#include "light.h"
-#include "terrain.h"
-#include "water.h"
-#include "blitz.h"
-#include "camera.h"
-#include "particule.h"
-#include "physics.h"
-#include "brain.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "motiontoto.h"
-#include "motionvehicle.h"
-#include "motionmother.h"
-#include "motionant.h"
-#include "motionspider.h"
-#include "motionbee.h"
-#include "motionworm.h"
-#include "modfile.h"
-#include "auto.h"
-#include "autobase.h"
-#include "autoportico.h"
-#include "autoderrick.h"
-#include "autofactory.h"
-#include "autorepair.h"
-#include "autodestroyer.h"
-#include "autostation.h"
-#include "autoenergy.h"
-#include "autoconvert.h"
-#include "autotower.h"
-#include "autoresearch.h"
-#include "autolabo.h"
-#include "autonuclear.h"
-#include "autoradar.h"
-#include "autoegg.h"
-#include "autonest.h"
-#include "autoroot.h"
-#include "autoflag.h"
-#include "autoinfo.h"
-#include "autojostle.h"
-#include "autopara.h"
-#include "autosafe.h"
-#include "autohuston.h"
-#include "automush.h"
-#include "autokid.h"
-#include "task.h"
-#include "pyro.h"
-#include "displaytext.h"
-#include "cmdtoken.h"
-#include "cbottoken.h"
-#include "sound.h"
-#include "object.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "graphics/common/mainmovie.h"
+#include "object/robotmain.h"
+#include "graphics/common/light.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "graphics/common/blitz.h"
+#include "graphics/common/camera.h"
+#include "graphics/common/particule.h"
+#include "physics/physics.h"
+#include "object/brain.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "object/motion/motiontoto.h"
+#include "object/motion/motionvehicle.h"
+#include "object/motion/motionmother.h"
+#include "object/motion/motionant.h"
+#include "object/motion/motionspider.h"
+#include "object/motion/motionbee.h"
+#include "object/motion/motionworm.h"
+#include "common/modfile.h"
+#include "object/auto/auto.h"
+#include "object/auto/autobase.h"
+#include "object/auto/autoportico.h"
+#include "object/auto/autoderrick.h"
+#include "object/auto/autofactory.h"
+#include "object/auto/autorepair.h"
+#include "object/auto/autodestroyer.h"
+#include "object/auto/autostation.h"
+#include "object/auto/autoenergy.h"
+#include "object/auto/autoconvert.h"
+#include "object/auto/autotower.h"
+#include "object/auto/autoresearch.h"
+#include "object/auto/autolabo.h"
+#include "object/auto/autonuclear.h"
+#include "object/auto/autoradar.h"
+#include "object/auto/autoegg.h"
+#include "object/auto/autonest.h"
+#include "object/auto/autoroot.h"
+#include "object/auto/autoflag.h"
+#include "object/auto/autoinfo.h"
+#include "object/auto/autojostle.h"
+#include "object/auto/autopara.h"
+#include "object/auto/autosafe.h"
+#include "object/auto/autohuston.h"
+#include "object/auto/automush.h"
+#include "object/auto/autokid.h"
+#include "object/task/task.h"
+#include "graphics/common/pyro.h"
+#include "ui/displaytext.h"
+#include "script/cmdtoken.h"
+#include "script/cbottoken.h"
+#include "sound/sound.h"
+#include "object/object.h"
diff --git a/src/object/object.h b/src/object/object.h index af7a3e4..08f413b 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -16,13 +16,12 @@ // object.h
-#ifndef _OBJECT_H_
-#define _OBJECT_H_
+#pragma once
-#include "d3dengine.h"
-#include "camera.h"
-#include "sound.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/common/camera.h"
+#include "sound/sound.h"
class CInstanceManager;
@@ -777,5 +776,3 @@ protected: float m_cmdLine[OBJECTMAXCMDLINE];
};
-
-#endif //_OBJECT_H_
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index a6d92e5..0a55285 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -24,59 +24,59 @@ #include <d3d.h>
#include "CBot/CBotDll.h"
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "profile.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "cloud.h"
-#include "blitz.h"
-#include "planet.h"
-#include "object.h"
-#include "motion.h"
-#include "motiontoto.h"
-#include "motionhuman.h"
-#include "physics.h"
-#include "brain.h"
-#include "pyro.h"
-#include "modfile.h"
-#include "model.h"
-#include "camera.h"
-#include "task.h"
-#include "taskmanip.h"
-#include "taskbuild.h"
-#include "auto.h"
-#include "autobase.h"
-#include "displayinfo.h"
-#include "interface.h"
-#include "shortcut.h"
-#include "map.h"
-#include "label.h"
-#include "button.h"
-#include "slider.h"
-#include "window.h"
-#include "edit.h"
-#include "displaytext.h"
-#include "text.h"
-#include "sound.h"
-#include "cbottoken.h"
-#include "cmdtoken.h"
-#include "mainmovie.h"
-#include "maindialog.h"
-#include "mainshort.h"
-#include "mainmap.h"
-#include "script.h"
-#include "robotmain.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/profile.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "graphics/common/light.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "graphics/common/cloud.h"
+#include "graphics/common/blitz.h"
+#include "graphics/common/planet.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motiontoto.h"
+#include "object/motion/motionhuman.h"
+#include "physics/physics.h"
+#include "object/brain.h"
+#include "graphics/common/pyro.h"
+#include "common/modfile.h"
+#include "graphics/common/model.h"
+#include "graphics/common/camera.h"
+#include "object/task/task.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskbuild.h"
+#include "object/auto/auto.h"
+#include "object/auto/autobase.h"
+#include "ui/displayinfo.h"
+#include "ui/interface.h"
+#include "ui/shortcut.h"
+#include "ui/map.h"
+#include "ui/label.h"
+#include "ui/button.h"
+#include "ui/slider.h"
+#include "ui/window.h"
+#include "ui/edit.h"
+#include "ui/displaytext.h"
+#include "graphics/common/text.h"
+#include "sound/sound.h"
+#include "script/cbottoken.h"
+#include "script/cmdtoken.h"
+#include "graphics/common/mainmovie.h"
+#include "ui/maindialog.h"
+#include "ui/mainshort.h"
+#include "ui/mainmap.h"
+#include "script/script.h"
+#include "object/robotmain.h"
@@ -95,7 +95,7 @@ float g_unit; // conversion factor -#include "ClassFILE.cpp"
+#include "script/ClassFILE.cpp"
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index bafa62a..6175a7d 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -16,16 +16,15 @@ // robotmain.h
-#ifndef _ROBOTMAIN_H_
-#define _ROBOTMAIN_H_
+#pragma once
-#include "d3dengine.h"
-#include "struct.h"
-#include "object.h"
-#include "mainmovie.h"
-#include "camera.h"
-#include "particule.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/struct.h"
+#include "object/object.h"
+#include "graphics/common/mainmovie.h"
+#include "graphics/common/camera.h"
+#include "graphics/common/particule.h"
enum Phase
@@ -459,5 +458,3 @@ protected: float m_colorShiftWater;
};
-
-#endif //_ROBOTMAIN_H_
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_
|