diff options
Diffstat (limited to 'src/object/auto')
52 files changed, 592 insertions, 660 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_
|