diff options
242 files changed, 2282 insertions, 2571 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3d78ac..22c5122 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,131 +2,133 @@ add_subdirectory(CBot) set(SOURCES -autobase.cpp -autoconvert.cpp -auto.cpp -autoderrick.cpp -autodestroyer.cpp -autoegg.cpp -autoenergy.cpp -autofactory.cpp -autoflag.cpp -autohuston.cpp -autoinfo.cpp -autojostle.cpp -autokid.cpp -autolabo.cpp -automush.cpp -autonest.cpp -autonuclear.cpp -autopara.cpp -autoportico.cpp -autoradar.cpp -autorepair.cpp -autoresearch.cpp -autoroot.cpp -autosafe.cpp -autostation.cpp -autotower.cpp -blitz.cpp -brain.cpp -button.cpp -camera.cpp -cbottoken.cpp -check.cpp -cloud.cpp -cmdtoken.cpp -color.cpp -compass.cpp -control.cpp -d3dapp.cpp -d3dengine.cpp -d3denum.cpp -d3dframe.cpp -d3dmath.cpp -d3dtextr.cpp -d3dutil.cpp -displayinfo.cpp -displaytext.cpp -edit.cpp -editvalue.cpp -event.cpp -gauge.cpp -group.cpp -image.cpp -iman.cpp -interface.cpp -joystick.cpp -key.cpp -label.cpp -light.cpp -list.cpp -maindialog.cpp -mainmap.cpp -mainmovie.cpp -mainshort.cpp -map.cpp -math3d.cpp -metafile.cpp -misc.cpp -model.cpp -modfile.cpp -motionant.cpp -motionbee.cpp -motion.cpp -motionhuman.cpp -motionmother.cpp -motionspider.cpp -motiontoto.cpp -motionvehicle.cpp -motionworm.cpp -object.cpp -particule.cpp -physics.cpp -planet.cpp -profile.cpp -pyro.cpp -restext.cpp -robotmain.cpp -script.cpp -scroll.cpp -shortcut.cpp -slider.cpp -sound.cpp -studio.cpp -target.cpp -taskadvance.cpp -taskbuild.cpp -task.cpp -taskfireant.cpp -taskfire.cpp -taskflag.cpp -taskgoto.cpp -taskgungoal.cpp -taskinfo.cpp -taskmanager.cpp -taskmanip.cpp -taskpen.cpp -taskrecover.cpp -taskreset.cpp -tasksearch.cpp -taskshield.cpp -taskspiderexplo.cpp -tasktake.cpp -taskterraform.cpp -taskturn.cpp -taskwait.cpp -terrain.cpp -text.cpp -water.cpp -window.cpp +app/d3dapp.cpp +app/joystick.cpp +common/event.cpp +common/iman.cpp +common/metafile.cpp +common/misc.cpp +common/modfile.cpp +common/profile.cpp +common/restext.cpp +graphics/common/blitz.cpp +graphics/common/camera.cpp +graphics/common/cloud.cpp +graphics/common/light.cpp +graphics/common/mainmovie.cpp +graphics/common/model.cpp +graphics/common/particule.cpp +graphics/common/planet.cpp +graphics/common/pyro.cpp +graphics/common/terrain.cpp +graphics/common/text.cpp +graphics/common/water.cpp +graphics/d3d/d3dengine.cpp +graphics/d3d/d3denum.cpp +graphics/d3d/d3dframe.cpp +graphics/d3d/d3dtextr.cpp +graphics/d3d/d3dutil.cpp +math/old/d3dmath.cpp +math/old/math3d.cpp +object/auto/auto.cpp +object/auto/autobase.cpp +object/auto/autoconvert.cpp +object/auto/autoderrick.cpp +object/auto/autodestroyer.cpp +object/auto/autoegg.cpp +object/auto/autoenergy.cpp +object/auto/autofactory.cpp +object/auto/autoflag.cpp +object/auto/autohuston.cpp +object/auto/autoinfo.cpp +object/auto/autojostle.cpp +object/auto/autokid.cpp +object/auto/autolabo.cpp +object/auto/automush.cpp +object/auto/autonest.cpp +object/auto/autonuclear.cpp +object/auto/autopara.cpp +object/auto/autoportico.cpp +object/auto/autoradar.cpp +object/auto/autorepair.cpp +object/auto/autoresearch.cpp +object/auto/autoroot.cpp +object/auto/autosafe.cpp +object/auto/autostation.cpp +object/auto/autotower.cpp +object/brain.cpp +object/motion/motion.cpp +object/motion/motionant.cpp +object/motion/motionbee.cpp +object/motion/motionhuman.cpp +object/motion/motionmother.cpp +object/motion/motionspider.cpp +object/motion/motiontoto.cpp +object/motion/motionvehicle.cpp +object/motion/motionworm.cpp +object/object.cpp +object/robotmain.cpp +object/task/task.cpp +object/task/taskadvance.cpp +object/task/taskbuild.cpp +object/task/taskfire.cpp +object/task/taskfireant.cpp +object/task/taskflag.cpp +object/task/taskgoto.cpp +object/task/taskgungoal.cpp +object/task/taskinfo.cpp +object/task/taskmanager.cpp +object/task/taskmanip.cpp +object/task/taskpen.cpp +object/task/taskrecover.cpp +object/task/taskreset.cpp +object/task/tasksearch.cpp +object/task/taskshield.cpp +object/task/taskspiderexplo.cpp +object/task/tasktake.cpp +object/task/taskterraform.cpp +object/task/taskturn.cpp +object/task/taskwait.cpp +physics/physics.cpp +script/cbottoken.cpp +script/cmdtoken.cpp +script/script.cpp +sound/sound.cpp +ui/button.cpp +ui/check.cpp +ui/color.cpp +ui/compass.cpp +ui/control.cpp +ui/displayinfo.cpp +ui/displaytext.cpp +ui/edit.cpp +ui/editvalue.cpp +ui/gauge.cpp +ui/group.cpp +ui/image.cpp +ui/interface.cpp +ui/key.cpp +ui/label.cpp +ui/list.cpp +ui/maindialog.cpp +ui/mainmap.cpp +ui/mainshort.cpp +ui/map.cpp +ui/scroll.cpp +ui/shortcut.cpp +ui/slider.cpp +ui/studio.cpp +ui/target.cpp +ui/window.cpp ) # Change to DirectX SDK directory set(DXSDK_DIR "c:/dxsdk") -include_directories(${DXSDK_DIR}/include) +include_directories(${DXSDK_DIR}/include .) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot ${DXSDK_DIR}/lib) + set( LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwinmm diff --git a/src/app/d3dapp.cpp b/src/app/d3dapp.cpp index a1d5c6a..fd7f148 100644 --- a/src/app/d3dapp.cpp +++ b/src/app/d3dapp.cpp @@ -26,19 +26,19 @@ #include <zmouse.h>
#include <dinput.h>
-#include "struct.h"
-#include "d3dtextr.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "event.h"
-#include "profile.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "joystick.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "d3dapp.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/profile.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "app/joystick.h"
+#include "object/robotmain.h"
+#include "sound/sound.h"
+#include "app/d3dapp.h"
// fix for "MSH_MOUSEWHEEL undefined" error
#ifdef UNICODE
diff --git a/src/app/d3dapp.h b/src/app/d3dapp.h index 6f28cda..fe4a3eb 100644 --- a/src/app/d3dapp.h +++ b/src/app/d3dapp.h @@ -16,21 +16,20 @@ // d3dapp.h
+#pragma once
-#ifndef _D3DAPP_H
-#define _D3DAPP_H
#define D3D_OVERLOADS
#include <d3d.h>
-#include "d3dengine.h"
-#include "d3dframe.h"
-#include "d3denum.h"
-#include "d3dutil.h"
-#include "d3dres.h"
-#include "misc.h"
-#include "struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/d3d/d3dframe.h"
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dutil.h"
+#include "old/d3dres.h"
+#include "common/misc.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -165,4 +164,3 @@ public: };
-#endif // _D3DAPP_H
diff --git a/src/app/joystick.cpp b/src/app/joystick.cpp index 609a1fb..91dc27f 100644 --- a/src/app/joystick.cpp +++ b/src/app/joystick.cpp @@ -23,7 +23,7 @@ #include <dinput.h>
#include <stdio.h>
-#include "joystick.h"
+#include "app/joystick.h"
diff --git a/src/app/joystick.h b/src/app/joystick.h index 4b465e0..d6904a3 100644 --- a/src/app/joystick.h +++ b/src/app/joystick.h @@ -16,9 +16,7 @@ // joystick.h
-#ifndef _JOYSTICK_H_
-#define _JOYSTICK_H_
-
+#pragma once
extern BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd);
@@ -27,5 +25,3 @@ extern BOOL UpdateInputState(DIJOYSTATE &js); extern BOOL FreeDirectInput();
-
-#endif //_JOYSTICK_H_
diff --git a/src/common/event.cpp b/src/common/event.cpp index 2eeddb4..1c92a2a 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -22,9 +22,9 @@ #include <windows.h>
#include <stdio.h>
-#include "struct.h"
-#include "iman.h"
-#include "event.h"
+#include "common/struct.h"
+#include "common/iman.h"
+#include "common/event.h"
diff --git a/src/common/event.h b/src/common/event.h index 8da2600..b9690e4 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -16,11 +16,10 @@ // event.h
-#ifndef _EVENT_H_
-#define _EVENT_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
#if !defined (WM_XBUTTONDOWN)
@@ -633,4 +632,3 @@ protected: };
-#endif //_EVENT_H_
diff --git a/src/common/global.h b/src/common/global.h index 32aefdc..628660b 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -16,8 +16,6 @@ // global.h
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
#define BUILD_FACTORY (1<<0) // factory
@@ -60,5 +58,3 @@ extern long g_researchEnable; // research available extern float g_unit; // conversion factor
-
-#endif //_GLOBAL_H_
diff --git a/src/common/iman.cpp b/src/common/iman.cpp index eacb3f4..b98c393 100644 --- a/src/common/iman.cpp +++ b/src/common/iman.cpp @@ -22,8 +22,8 @@ #include <windows.h>
#include <stdio.h>
-#include "struct.h"
-#include "iman.h"
+#include "common/struct.h"
+#include "common/iman.h"
diff --git a/src/common/iman.h b/src/common/iman.h index 65ec8dd..b484e30 100644 --- a/src/common/iman.h +++ b/src/common/iman.h @@ -16,11 +16,10 @@ // iman.h
-#ifndef _IMAN_H_
-#define _IMAN_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
@@ -55,4 +54,3 @@ protected: };
-#endif //_IMAN_H_
diff --git a/src/common/language.h b/src/common/language.h index 4ae97f9..9d5bdb9 100644 --- a/src/common/language.h +++ b/src/common/language.h @@ -16,6 +16,9 @@ // language.h
+#pragma once
+
+
#define _FULL TRUE // CoLoBoT
#define _SCHOOL FALSE // CeeBot-A or Teen
#define _TEEN FALSE // FALSE for CeeBot-A, TRUE for CeeBot-Teen
diff --git a/src/common/metafile.cpp b/src/common/metafile.cpp index d7e260e..63c8e0b 100644 --- a/src/common/metafile.cpp +++ b/src/common/metafile.cpp @@ -22,8 +22,8 @@ #include <windows.h>
#include <stdio.h>
-#include "language.h"
-#include "metafile.h"
+#include "common/language.h"
+#include "common/metafile.h"
diff --git a/src/common/metafile.h b/src/common/metafile.h index b334b3e..7d7ec3e 100644 --- a/src/common/metafile.h +++ b/src/common/metafile.h @@ -16,8 +16,7 @@ // metafile.h
-#ifndef _METAFILE_H_
-#define _METAFILE_H_
+#pragma once
#include <stdio.h>
@@ -75,4 +74,3 @@ protected: };
-#endif //_METAFILE_H_
diff --git a/src/common/misc.cpp b/src/common/misc.cpp index ce42de0..e73238f 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -27,13 +27,13 @@ #include <time.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
diff --git a/src/common/misc.h b/src/common/misc.h index 9eaba53..fb1938e 100644 --- a/src/common/misc.h +++ b/src/common/misc.h @@ -16,14 +16,14 @@ // misc.h
-#ifndef _MISC_H_
-#define _MISC_H_
+#pragma once
+
#include <time.h>
-#include "metafile.h"
-#include "event.h"
+#include "common/metafile.h"
+#include "common/event.h"
extern CMetaFile g_metafile;
@@ -236,5 +236,3 @@ extern void UserDir(char* buffer, char* dir, char* def); extern char RetLanguageLetter();
-
-#endif //_MISC_H_
diff --git a/src/common/modfile.cpp b/src/common/modfile.cpp index 08fb89d..3e1c997 100644 --- a/src/common/modfile.cpp +++ b/src/common/modfile.cpp @@ -23,15 +23,15 @@ #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 "modfile.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 "common/modfile.h"
diff --git a/src/common/modfile.h b/src/common/modfile.h index f97ae91..8c11101 100644 --- a/src/common/modfile.h +++ b/src/common/modfile.h @@ -16,11 +16,10 @@ // modfile.h
-#ifndef _MODFILE_H_
-#define _MODFILE_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -116,4 +115,3 @@ protected: };
-#endif //_MODFILE_H_
diff --git a/src/common/profile.cpp b/src/common/profile.cpp index 2baffb0..864cc22 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -23,9 +23,9 @@ #include <d3d.h>
#include <stdlib.h>
-#include "language.h"
-#include "struct.h"
-#include "profile.h"
+#include "common/language.h"
+#include "common/struct.h"
+#include "common/profile.h"
diff --git a/src/common/profile.h b/src/common/profile.h index 969b764..aaf25a7 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -16,8 +16,7 @@ // profile.h
-#ifndef _PROFILE_H_
-#define _PROFILE_H_
+#pragma once
#define STRICT
@@ -33,4 +32,3 @@ extern BOOL SetProfileFloat(char* section, char* key, float value); extern BOOL GetProfileFloat(char* section, char* key, float &value);
-#endif //_PROFILE_H_
diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 7422990..42fd438 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -18,14 +18,14 @@ #define D3D_OVERLOADS
#include <stdio.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "misc.h"
-#include "event.h"
-#include "object.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/misc.h"
+#include "common/event.h"
+#include "object/object.h"
#include "CBot/resource.h"
-#include "restext.h"
+#include "common/restext.h"
diff --git a/src/common/restext.h b/src/common/restext.h index 2fe53fe..3e57d20 100644 --- a/src/common/restext.h +++ b/src/common/restext.h @@ -16,16 +16,15 @@ // restext.h
-#ifndef _RESTEXT_H_
-#define _RESTEXT_H_
+#pragma once
#define STRICT
#define D3D_OVERLOADS
-#include "d3dengine.h"
-#include "event.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/event.h"
@@ -156,4 +155,3 @@ extern BOOL GetResource(ResType type, int num, char* text); extern BOOL GetResourceBase(ResType type, int num, char* text);
-#endif //_RESTEXT_H_
diff --git a/src/common/struct.h b/src/common/struct.h index 8b90288..376c837 100644 --- a/src/common/struct.h +++ b/src/common/struct.h @@ -16,8 +16,8 @@ // struct.h
-#ifndef _STRUCT_H_
-#define _STRUCT_H_
+#pragma once
+
#include <d3d.h>
@@ -70,4 +70,3 @@ struct ColorHSV };
-#endif //_STRUCT_H_
diff --git a/src/graphics/common/blitz.cpp b/src/graphics/common/blitz.cpp index cf88fe3..0447f53 100644 --- a/src/graphics/common/blitz.cpp +++ b/src/graphics/common/blitz.cpp @@ -21,21 +21,21 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "terrain.h"
-#include "math3d.h"
-#include "object.h"
-#include "camera.h"
-#include "auto.h"
-#include "autopara.h"
-#include "sound.h"
-#include "blitz.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "graphics/common/terrain.h"
+#include "math/old/math3d.h"
+#include "object/object.h"
+#include "graphics/common/camera.h"
+#include "object/auto/auto.h"
+#include "object/auto/autopara.h"
+#include "sound/sound.h"
+#include "graphics/common/blitz.h"
diff --git a/src/graphics/common/blitz.h b/src/graphics/common/blitz.h index 30a34ed..2f8aee9 100644 --- a/src/graphics/common/blitz.h +++ b/src/graphics/common/blitz.h @@ -16,12 +16,11 @@ // blitz.h
-#ifndef _BLITZ_H_
-#define _BLITZ_H_
+#pragma once
-#include "misc.h"
-#include "struct.h"
+#include "common/misc.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -80,5 +79,3 @@ protected: float m_width[BLITZMAX];
};
-
-#endif //_BLITZ_H_
diff --git a/src/graphics/common/camera.cpp b/src/graphics/common/camera.cpp index e526d6c..e556c20 100644 --- a/src/graphics/common/camera.cpp +++ b/src/graphics/common/camera.cpp @@ -21,19 +21,19 @@ #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 "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "camera.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/terrain.h"
+#include "graphics/common/water.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "graphics/common/camera.h"
diff --git a/src/graphics/common/camera.h b/src/graphics/common/camera.h index f38db1a..7723dfc 100644 --- a/src/graphics/common/camera.h +++ b/src/graphics/common/camera.h @@ -16,12 +16,11 @@ // camera.h
-#ifndef _CAMERA_H_
-#define _CAMERA_H_
+#pragma once
-#include "d3dengine.h"
-#include "struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -267,5 +266,3 @@ protected: BOOL m_bCameraInvertY; // Y inversion in the edges?
};
-
-#endif //_CAMERA_H_
diff --git a/src/graphics/common/cloud.cpp b/src/graphics/common/cloud.cpp index 8d6aeae..0892962 100644 --- a/src/graphics/common/cloud.cpp +++ b/src/graphics/common/cloud.cpp @@ -21,17 +21,17 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "terrain.h"
-#include "object.h"
-#include "cloud.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/terrain.h"
+#include "object/object.h"
+#include "graphics/common/cloud.h"
diff --git a/src/graphics/common/cloud.h b/src/graphics/common/cloud.h index b912670..d0dcb97 100644 --- a/src/graphics/common/cloud.h +++ b/src/graphics/common/cloud.h @@ -16,11 +16,10 @@ // cloud.h
-#ifndef _CLOUD_H_
-#define _CLOUD_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -86,5 +85,3 @@ protected: BOOL m_bEnable;
};
-
-#endif //_CLOUD_H_
diff --git a/src/graphics/common/color.cpp b/src/graphics/common/color.cpp index 35f6596..bc5cf5d 100644 --- a/src/graphics/common/color.cpp +++ b/src/graphics/common/color.cpp @@ -16,7 +16,7 @@ // color.cpp -#include "color.h" +#include "graphics/common/color.h" // TODO diff --git a/src/graphics/common/color.h b/src/graphics/common/color.h index 9d6114a..fff4b00 100644 --- a/src/graphics/common/color.h +++ b/src/graphics/common/color.h @@ -16,16 +16,18 @@ // color.h +#pragma once + + // TODO struct Color { }; -#pragma once - D3DCOLOR RetColor(float intensity); D3DCOLOR RetColor(D3DCOLORVALUE intensity); D3DCOLORVALUE RetColor(D3DCOLOR intensity); void RGB2HSV(D3DCOLORVALUE src, ColorHSV &dest); void HSV2RGB(ColorHSV src, D3DCOLORVALUE &dest); + diff --git a/src/graphics/common/light.cpp b/src/graphics/common/light.cpp index cbb6914..0beeb50 100644 --- a/src/graphics/common/light.cpp +++ b/src/graphics/common/light.cpp @@ -23,13 +23,14 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "light.h"
+#include "math/const.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/light.h"
diff --git a/src/graphics/common/light.h b/src/graphics/common/light.h index ae2bcfb..52c2a2f 100644 --- a/src/graphics/common/light.h +++ b/src/graphics/common/light.h @@ -16,11 +16,10 @@ // light.h
-#ifndef _LIGHT_H_
-#define _LIGHT_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -109,5 +108,3 @@ protected: Light* m_lightTable;
};
-
-#endif //_LIGHT_H_
diff --git a/src/graphics/common/mainmovie.cpp b/src/graphics/common/mainmovie.cpp index 8205d16..5618406 100644 --- a/src/graphics/common/mainmovie.cpp +++ b/src/graphics/common/mainmovie.cpp @@ -23,20 +23,20 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "global.h"
-#include "event.h"
-#include "iman.h"
-#include "math3d.h"
-#include "camera.h"
-#include "object.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "interface.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "mainmovie.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "ui/interface.h"
+#include "object/robotmain.h"
+#include "sound/sound.h"
+#include "graphics/common/mainmovie.h"
diff --git a/src/graphics/common/mainmovie.h b/src/graphics/common/mainmovie.h index f31b3a9..fa65730 100644 --- a/src/graphics/common/mainmovie.h +++ b/src/graphics/common/mainmovie.h @@ -16,8 +16,7 @@ // mainmovie.h
-#ifndef _MAINMOVIE_H_
-#define _MAINMOVIE_H_
+#pragma once
class CInstanceManager;
@@ -76,5 +75,3 @@ protected: D3DVECTOR m_finalLookat[2];
};
-
-#endif //_MAINMOVIE_H_
diff --git a/src/graphics/common/model.cpp b/src/graphics/common/model.cpp index 80ce6b5..9fa2b2e 100644 --- a/src/graphics/common/model.cpp +++ b/src/graphics/common/model.cpp @@ -23,21 +23,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 "water.h"
-#include "robotmain.h"
-#include "interface.h"
-#include "edit.h"
-#include "button.h"
-#include "cmdtoken.h"
-#include "modfile.h"
-#include "model.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/water.h"
+#include "object/robotmain.h"
+#include "ui/interface.h"
+#include "ui/edit.h"
+#include "ui/button.h"
+#include "script/cmdtoken.h"
+#include "common/modfile.h"
+#include "graphics/common/model.h"
diff --git a/src/graphics/common/model.h b/src/graphics/common/model.h index 35b48b6..e7b6b10 100644 --- a/src/graphics/common/model.h +++ b/src/graphics/common/model.h @@ -16,11 +16,10 @@ // model.h
-#ifndef _MODEL_H_
-#define _MODEL_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -133,5 +132,3 @@ protected: float m_max;
};
-
-#endif //_MODEL_H_
diff --git a/src/graphics/common/particule.cpp b/src/graphics/common/particule.cpp index 0a8c27d..e7bdea3 100644 --- a/src/graphics/common/particule.cpp +++ b/src/graphics/common/particule.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dmath.h"
-#include "d3dtextr.h"
-#include "d3dengine.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "iman.h"
-#include "math3d.h"
-#include "event.h"
-#include "object.h"
-#include "physics.h"
-#include "auto.h"
-#include "robotmain.h"
-#include "terrain.h"
-#include "sound.h"
-#include "water.h"
-#include "particule.h"
+#include "common/struct.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "object/auto/auto.h"
+#include "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "sound/sound.h"
+#include "graphics/common/water.h"
+#include "graphics/common/particule.h"
diff --git a/src/graphics/common/particule.h b/src/graphics/common/particule.h index 67abad3..54a6428 100644 --- a/src/graphics/common/particule.h +++ b/src/graphics/common/particule.h @@ -16,12 +16,11 @@ // particule.h
-#ifndef _PARTICULE_H_
-#define _PARTICULE_H_
+#pragma once
-#include "d3dengine.h"
-#include "sound.h"
+#include "graphics/d3d/d3dengine.h"
+#include "sound/sound.h"
class CInstanceManager;
@@ -335,5 +334,3 @@ protected: float m_absTime;
};
-
-#endif //_PARTICULE_H_
diff --git a/src/graphics/common/planet.cpp b/src/graphics/common/planet.cpp index 925b2e9..fae6d4a 100644 --- a/src/graphics/common/planet.cpp +++ b/src/graphics/common/planet.cpp @@ -23,14 +23,14 @@ #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 "planet.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/planet.h"
diff --git a/src/graphics/common/planet.h b/src/graphics/common/planet.h index 9a6ba52..b931c2b 100644 --- a/src/graphics/common/planet.h +++ b/src/graphics/common/planet.h @@ -16,11 +16,10 @@ // planet.h
-#ifndef _PLANET_H_
-#define _PLANET_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CInstanceManager;
@@ -75,5 +74,3 @@ protected: BOOL m_bPlanetExist;
};
-
-#endif //_PLANET_H_
diff --git a/src/graphics/common/pyro.cpp b/src/graphics/common/pyro.cpp index 3588585..7de5405 100644 --- a/src/graphics/common/pyro.cpp +++ b/src/graphics/common/pyro.cpp @@ -23,24 +23,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 "robotmain.h"
-#include "terrain.h"
-#include "camera.h"
-#include "particule.h"
-#include "light.h"
-#include "object.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "displaytext.h"
-#include "sound.h"
-#include "pyro.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 "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/camera.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/light.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "ui/displaytext.h"
+#include "sound/sound.h"
+#include "graphics/common/pyro.h"
diff --git a/src/graphics/common/pyro.h b/src/graphics/common/pyro.h index 5eac0c9..e33b46a 100644 --- a/src/graphics/common/pyro.h +++ b/src/graphics/common/pyro.h @@ -16,13 +16,12 @@ // pyro.h
-#ifndef _PYRO_H_
-#define _PYRO_H_
+#pragma once
-#include "d3dengine.h"
-#include "object.h"
-#include "misc.h"
+#include "graphics/d3d/d3dengine.h"
+#include "object/object.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -171,5 +170,3 @@ protected: float m_crashSphereRadius[50];
};
-
-#endif //_PYRO_H_
diff --git a/src/graphics/common/terrain.cpp b/src/graphics/common/terrain.cpp index 31b1cc9..91c4c3d 100644 --- a/src/graphics/common/terrain.cpp +++ b/src/graphics/common/terrain.cpp @@ -23,18 +23,18 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "modfile.h"
-#include "water.h"
-#include "terrain.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "common/modfile.h"
+#include "graphics/common/water.h"
+#include "graphics/common/terrain.h"
#define BMPHEAD 1078
diff --git a/src/graphics/common/terrain.h b/src/graphics/common/terrain.h index 4fc4ace..fcc10e8 100644 --- a/src/graphics/common/terrain.h +++ b/src/graphics/common/terrain.h @@ -16,11 +16,10 @@ // terrain.h
-#ifndef _TERRAIN_H_
-#define _TERRAIN_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -210,5 +209,3 @@ protected: FlyingLimit m_flyingLimit[MAXFLYINGLIMIT];
};
-
-#endif //_TERRAIN_H_
diff --git a/src/graphics/common/text.cpp b/src/graphics/common/text.cpp index 88cfe0a..948ac7d 100644 --- a/src/graphics/common/text.cpp +++ b/src/graphics/common/text.cpp @@ -23,14 +23,14 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "text.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.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/text.h"
diff --git a/src/graphics/common/text.h b/src/graphics/common/text.h index 4407039..5d41c5c 100644 --- a/src/graphics/common/text.h +++ b/src/graphics/common/text.h @@ -16,11 +16,10 @@ // text.h
-#ifndef _TEXT_H_
-#define _TEXT_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -109,5 +108,3 @@ protected: };
-
-#endif //_TEXT_H_
diff --git a/src/graphics/common/water.cpp b/src/graphics/common/water.cpp index 59963cc..5e7e21f 100644 --- a/src/graphics/common/water.cpp +++ b/src/graphics/common/water.cpp @@ -23,19 +23,19 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "particule.h"
-#include "terrain.h"
-#include "object.h"
-#include "sound.h"
-#include "water.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.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 "object/object.h"
+#include "sound/sound.h"
+#include "graphics/common/water.h"
diff --git a/src/graphics/common/water.h b/src/graphics/common/water.h index dc9384d..959b12f 100644 --- a/src/graphics/common/water.h +++ b/src/graphics/common/water.h @@ -16,12 +16,11 @@ // water.h
-#ifndef _WATER_H_
-#define _WATER_H_
+#pragma once
-#include "d3dengine.h"
-#include "particule.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/common/particule.h"
class CInstanceManager;
@@ -130,5 +129,3 @@ protected: D3DCOLOR m_color;
};
-
-#endif //_WATER_H_
diff --git a/src/graphics/d3d/d3dengine.cpp b/src/graphics/d3d/d3dengine.cpp index bbfb89e..12cf4ea 100644 --- a/src/graphics/d3d/d3dengine.cpp +++ b/src/graphics/d3d/d3dengine.cpp @@ -14,7 +14,7 @@ // * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// D3DEngine.cpp
+// d3dengine.cpp
#define STRICT
#define D3D_OVERLOADS
@@ -22,28 +22,28 @@ #include <stdio.h>
#include <math.h>
-#include "struct.h"
-#include "d3dapp.h"
-#include "d3dtextr.h"
-#include "d3dutil.h"
-#include "d3dmath.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "iman.h"
-#include "event.h"
-#include "profile.h"
-#include "math3d.h"
-#include "object.h"
-#include "interface.h"
-#include "light.h"
-#include "text.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "cloud.h"
-#include "blitz.h"
-#include "planet.h"
-#include "sound.h"
+#include "common/struct.h"
+#include "app/d3dapp.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dutil.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/iman.h"
+#include "common/event.h"
+#include "common/profile.h"
+#include "math/old/math3d.h"
+#include "object/object.h"
+#include "ui/interface.h"
+#include "graphics/common/light.h"
+#include "graphics/common/text.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 "sound/sound.h"
diff --git a/src/graphics/d3d/d3dengine.h b/src/graphics/d3d/d3dengine.h index a99db93..12e0fdb 100644 --- a/src/graphics/d3d/d3dengine.h +++ b/src/graphics/d3d/d3dengine.h @@ -16,11 +16,10 @@ // d3dengine.h
-#ifndef _D3DENGINE_H_
-#define _D3DENGINE_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
class CD3DApplication;
@@ -683,4 +682,3 @@ protected: };
-#endif //_D3DENGINE_H_
diff --git a/src/graphics/d3d/d3denum.cpp b/src/graphics/d3d/d3denum.cpp index 46497d8..c163bb8 100644 --- a/src/graphics/d3d/d3denum.cpp +++ b/src/graphics/d3d/d3denum.cpp @@ -25,9 +25,9 @@ #include <windowsx.h>
#include <stdio.h>
#include <tchar.h>
-#include "d3denum.h"
-#include "d3dutil.h" // For DEBUG_MSG
-#include "d3dres.h" // For dialog controls
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dutil.h" // For DEBUG_MSG
+#include "old/d3dres.h" // For dialog controls
diff --git a/src/graphics/d3d/d3denum.h b/src/graphics/d3d/d3denum.h index e728ffb..0086d57 100644 --- a/src/graphics/d3d/d3denum.h +++ b/src/graphics/d3d/d3denum.h @@ -21,8 +21,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DENUM_H
-#define D3DENUM_H
+
+#pragma once
+
#include <d3d.h>
@@ -130,7 +131,3 @@ HRESULT D3DEnum_UserChangeDevice( D3DEnum_DeviceInfo** ppDevice ); -#endif // D3DENUM_H
-
-
-
diff --git a/src/graphics/d3d/d3dframe.cpp b/src/graphics/d3d/d3dframe.cpp index 3207a4b..73c0569 100644 --- a/src/graphics/d3d/d3dframe.cpp +++ b/src/graphics/d3d/d3dframe.cpp @@ -25,8 +25,8 @@ #include <windows.h>
#include <stdio.h>
#include <tchar.h>
-#include "d3dframe.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dframe.h"
+#include "graphics/d3d/d3dutil.h"
diff --git a/src/graphics/d3d/d3dframe.h b/src/graphics/d3d/d3dframe.h index 8e41b83..2a6f902 100644 --- a/src/graphics/d3d/d3dframe.h +++ b/src/graphics/d3d/d3dframe.h @@ -34,8 +34,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DFRAME_H
-#define D3DFRAME_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -137,6 +138,4 @@ public: #define D3DFWERR_NOTINITIALIZED 0x8200000f
-#endif // D3DFRAME_H
-
diff --git a/src/graphics/d3d/d3dtextr.cpp b/src/graphics/d3d/d3dtextr.cpp index cceab99..6122029 100644 --- a/src/graphics/d3d/d3dtextr.cpp +++ b/src/graphics/d3d/d3dtextr.cpp @@ -29,10 +29,10 @@ #define STRICT
#include <tchar.h>
#include <stdio.h>
-#include "d3dtextr.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "misc.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/misc.h"
diff --git a/src/graphics/d3d/d3dtextr.h b/src/graphics/d3d/d3dtextr.h index 54a79bb..0e43fd2 100644 --- a/src/graphics/d3d/d3dtextr.h +++ b/src/graphics/d3d/d3dtextr.h @@ -26,8 +26,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DTEXTR_H
-#define D3DTEXTR_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -76,5 +77,3 @@ VOID D3DTextr_SetTexturePath( TCHAR* strTexturePath ); void D3DTextr_SetDebugMode(BOOL bDebug);
-
-#endif // D3DTEXTR_H
diff --git a/src/graphics/d3d/d3dutil.cpp b/src/graphics/d3d/d3dutil.cpp index b4a0eb7..65c3541 100644 --- a/src/graphics/d3d/d3dutil.cpp +++ b/src/graphics/d3d/d3dutil.cpp @@ -27,7 +27,7 @@ #include <math.h>
#include <stdio.h>
#include <tchar.h>
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
diff --git a/src/graphics/d3d/d3dutil.h b/src/graphics/d3d/d3dutil.h index 494722d..8fe88c9 100644 --- a/src/graphics/d3d/d3dutil.h +++ b/src/graphics/d3d/d3dutil.h @@ -21,8 +21,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DUTIL_H
-#define D3DUTIL_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -110,5 +111,3 @@ HRESULT _DbgOut( TCHAR*, DWORD, HRESULT, TCHAR* ); -
-#endif // D3DUTIL_H
diff --git a/src/math/old/d3dmath.h b/src/math/old/d3dmath.h index d28707d..4f563e7 100644 --- a/src/math/old/d3dmath.h +++ b/src/math/old/d3dmath.h @@ -21,8 +21,9 @@ //
// Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
//-----------------------------------------------------------------------------
-#ifndef D3DMATH_H
-#define D3DMATH_H
+
+#pragma once
+
#include <ddraw.h>
#include <d3d.h>
@@ -94,4 +95,3 @@ VOID D3DMath_QuaternionSlerp( FLOAT& Qx, FLOAT& Qy, FLOAT& Qz, FLOAT& Qw, FLOAT fAlpha );
-#endif // D3DMATH_H
diff --git a/src/math/old/math3d.cpp b/src/math/old/math3d.cpp index 9aa5f89..368cd5e 100644 --- a/src/math/old/math3d.cpp +++ b/src/math/old/math3d.cpp @@ -23,11 +23,11 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "math3d.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "math/old/math3d.h"
diff --git a/src/math/old/math3d.h b/src/math/old/math3d.h index ce7eee3..5c10047 100644 --- a/src/math/old/math3d.h +++ b/src/math/old/math3d.h @@ -16,8 +16,7 @@ // math3d.h
-#ifndef _MATH3D_H_
-#define _MATH3D_H_
+#pragma once
#define STRICT
@@ -103,4 +102,4 @@ D3DCOLORVALUE RetColor(D3DCOLOR intensity); void RGB2HSV(D3DCOLORVALUE src, ColorHSV &dest);
void HSV2RGB(ColorHSV src, D3DCOLORVALUE &dest);
-#endif //_MATH3D_H_
+
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_
diff --git a/src/old/d3dres.h b/src/old/d3dres.h index d3f8ba8..79ba76e 100644 --- a/src/old/d3dres.h +++ b/src/old/d3dres.h @@ -23,9 +23,8 @@ //
// Copyright (c) 1999 Microsoft Corporation. All rights reserved.
//-----------------------------------------------------------------------------
-#ifndef D3DRES_H
-#define D3DRES_H
+#pragma once
#define IDI_MAIN_ICON 101 // Application icon
#define IDR_MAIN_ACCEL 113 // Keyboard accelerator
@@ -54,6 +53,3 @@ #define IDM_EXIT 40006 // Command to exit the application
-
-
-#endif // D3DRES_H
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index beae37e..bc73c74 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -23,29 +23,29 @@ #include <stdio.h>
#include <d3d.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 "math3d.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "camera.h"
-#include "object.h"
-#include "pyro.h"
-#include "brain.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "sound.h"
-#include "task.h"
-#include "cmdtoken.h"
-#include "physics.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 "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/camera.h"
+#include "object/object.h"
+#include "graphics/common/pyro.h"
+#include "object/brain.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "sound/sound.h"
+#include "object/task/task.h"
+#include "script/cmdtoken.h"
+#include "physics/physics.h"
diff --git a/src/physics/physics.h b/src/physics/physics.h index 72f0c20..aa14a71 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -16,12 +16,11 @@ // physics.h
-#ifndef _PHYSICS_H_
-#define _PHYSICS_H_
+#pragma once
-#include "d3dengine.h"
-#include "misc.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -245,4 +244,3 @@ protected: };
-#endif //_PHYSICS_H_
diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index d97239d..ce1a161 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -21,14 +21,14 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "object.h"
-#include "cbottoken.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 "object/object.h"
+#include "script/cbottoken.h"
diff --git a/src/script/cbottoken.h b/src/script/cbottoken.h index 0767b04..2093d39 100644 --- a/src/script/cbottoken.h +++ b/src/script/cbottoken.h @@ -16,11 +16,10 @@ // cbottoken.h
-#ifndef _CBOTTOKEN_H_
-#define _CBOTTOKEN_H_
+#pragma once
-#include "object.h"
+#include "object/object.h"
@@ -35,5 +34,3 @@ extern BOOL IsFunction(const char *token); extern char* RetHelpText(const char *token);
-
-#endif //_CBOTTOKEN_H_
diff --git a/src/script/cmdtoken.cpp b/src/script/cmdtoken.cpp index d5295c5..5eac291 100644 --- a/src/script/cmdtoken.cpp +++ b/src/script/cmdtoken.cpp @@ -21,17 +21,17 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "water.h"
-#include "pyro.h"
-#include "camera.h"
-#include "object.h"
-#include "cmdtoken.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 "graphics/common/water.h"
+#include "graphics/common/pyro.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "script/cmdtoken.h"
diff --git a/src/script/cmdtoken.h b/src/script/cmdtoken.h index 40fb36a..5b228f8 100644 --- a/src/script/cmdtoken.h +++ b/src/script/cmdtoken.h @@ -16,16 +16,15 @@ // cmdtoken.h
-#ifndef _CMDTOKEN_H_
-#define _CMDTOKEN_H_
+#pragma once
-#include "d3denum.h"
-#include "d3dengine.h"
-#include "object.h"
-#include "water.h"
-#include "pyro.h"
-#include "camera.h"
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dengine.h"
+#include "object/object.h"
+#include "graphics/common/water.h"
+#include "graphics/common/pyro.h"
+#include "graphics/common/camera.h"
@@ -63,5 +62,3 @@ extern D3DCOLOR OpColor(char *line, char *op, D3DCOLOR def); extern D3DCOLORVALUE OpColorValue(char *line, char *op, D3DCOLORVALUE def);
-
-#endif //_CMDTOKEN_H_
diff --git a/src/script/script.cpp b/src/script/script.cpp index 62b2d25..1bb4463 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -24,32 +24,32 @@ #include <d3d.h>
#include "CBot/CBotDll.h"
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.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 "object.h"
-#include "physics.h"
-#include "interface.h"
-#include "edit.h"
-#include "list.h"
-#include "text.h"
-#include "displaytext.h"
-#include "taskmanager.h"
-#include "task.h"
-#include "taskmanip.h"
-#include "taskgoto.h"
-#include "taskshield.h"
-#include "cbottoken.h"
-#include "script.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 "common/restext.h"
+#include "math/old/math3d.h"
+#include "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "ui/interface.h"
+#include "ui/edit.h"
+#include "ui/list.h"
+#include "graphics/common/text.h"
+#include "ui/displaytext.h"
+#include "object/task/taskmanager.h"
+#include "object/task/task.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskgoto.h"
+#include "object/task/taskshield.h"
+#include "script/cbottoken.h"
+#include "script/script.h"
diff --git a/src/script/script.h b/src/script/script.h index eeb8ac8..ac81916 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -16,11 +16,10 @@ // script.h
-#ifndef _SCRIPT_H_
-#define _SCRIPT_H_
+#pragma once
-#include "event.h"
+#include "common/event.h"
class CInstanceManager;
@@ -115,4 +114,3 @@ public: };
-#endif //_SCRIPT_H_
diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index 333eba0..fadfeaa 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -24,11 +24,12 @@ #include <d3dtypes.h>
#include <dsound.h>
#include <stdio.h>
-#include "language.h"
-#include "struct.h"
-#include "iman.h"
-#include "math3d.h"
-#include "sound.h"
+
+#include "common/language.h"
+#include "common/struct.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "sound/sound.h"
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/sound/sound.h b/src/sound/sound.h index 16e1be5..f026b76 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -16,8 +16,7 @@ // sound.h
-#ifndef SOUND_H
-#define SOUND_H
+#pragma once
#include <dsound.h>
@@ -242,4 +241,4 @@ protected: char m_CDpath[100];
};
-#endif // SOUND_H
+
diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 27fea9b..e03331a 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -21,15 +21,15 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "restext.h"
-#include "button.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "ui/button.h"
diff --git a/src/ui/button.h b/src/ui/button.h index 2d30eea..9056ae2 100644 --- a/src/ui/button.h +++ b/src/ui/button.h @@ -16,11 +16,10 @@ // button.h
-#ifndef _BUTTON_H_
-#define _BUTTON_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -55,4 +54,3 @@ protected: };
-#endif //_BUTTON_H_
diff --git a/src/ui/check.cpp b/src/ui/check.cpp index f485921..f005790 100644 --- a/src/ui/check.cpp +++ b/src/ui/check.cpp @@ -21,15 +21,15 @@ #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 "restext.h"
-#include "text.h"
-#include "check.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 "common/restext.h"
+#include "graphics/common/text.h"
+#include "ui/check.h"
diff --git a/src/ui/check.h b/src/ui/check.h index 118b6cb..c0f11cf 100644 --- a/src/ui/check.h +++ b/src/ui/check.h @@ -16,11 +16,10 @@ // check.h
-#ifndef _CHECK_H_
-#define _CHECK_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -45,4 +44,3 @@ protected: };
-#endif //_CHECK_H_
diff --git a/src/ui/color.cpp b/src/ui/color.cpp index cf69b0d..c4e5694 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -21,15 +21,15 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "restext.h"
-#include "color.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "ui/color.h"
diff --git a/src/ui/color.h b/src/ui/color.h index fec01c4..6c4d7ad 100644 --- a/src/ui/color.h +++ b/src/ui/color.h @@ -16,12 +16,11 @@ // color.h
-#ifndef _COLOR_H_
-#define _COLOR_H_
+#pragma once
-#include "control.h"
-#include "d3dengine.h"
+#include "ui/control.h"
+#include "graphics/d3d/d3dengine.h"
class CD3DEngine;
@@ -55,4 +54,3 @@ protected: };
-#endif //_COLOR_H_
diff --git a/src/ui/compass.cpp b/src/ui/compass.cpp index 92804c2..c2733eb 100644 --- a/src/ui/compass.cpp +++ b/src/ui/compass.cpp @@ -21,13 +21,13 @@ #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 "compass.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 "ui/compass.h"
diff --git a/src/ui/compass.h b/src/ui/compass.h index 1eed3d6..cc17c36 100644 --- a/src/ui/compass.h +++ b/src/ui/compass.h @@ -16,11 +16,10 @@ // compass.h
-#ifndef _COMPASS_H_
-#define _COMPASS_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -49,4 +48,3 @@ protected: };
-#endif //_COMPASS_H_
diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 6ba5cef..3fa7f79 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -21,20 +21,20 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "restext.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "robotmain.h"
-#include "particule.h"
-#include "misc.h"
-#include "iman.h"
-#include "text.h"
-#include "sound.h"
-#include "control.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "object/robotmain.h"
+#include "graphics/common/particule.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "graphics/common/text.h"
+#include "sound/sound.h"
+#include "ui/control.h"
diff --git a/src/ui/control.h b/src/ui/control.h index 619cef2..9e0fceb 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -16,13 +16,12 @@ // control.h
-#ifndef _CONTROL_H_
-#define _CONTROL_H_
+#pragma once
-#include "text.h"
-#include "struct.h"
-#include "event.h"
+#include "graphics/common/text.h"
+#include "common/struct.h"
+#include "common/event.h"
class CInstanceManager;
@@ -134,4 +133,3 @@ protected: };
-#endif //_CONTROL_H_
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 473a805..534a2ac 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -23,31 +23,31 @@ #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 "restext.h"
-#include "math3d.h"
-#include "robotmain.h"
-#include "camera.h"
-#include "object.h"
-#include "motion.h"
-#include "motiontoto.h"
-#include "interface.h"
-#include "button.h"
-#include "slider.h"
-#include "edit.h"
-#include "group.h"
-#include "window.h"
-#include "particule.h"
-#include "light.h"
-#include "text.h"
-#include "cbottoken.h"
-#include "displayinfo.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 "common/restext.h"
+#include "math/old/math3d.h"
+#include "object/robotmain.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motiontoto.h"
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/slider.h"
+#include "ui/edit.h"
+#include "ui/group.h"
+#include "ui/window.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/light.h"
+#include "graphics/common/text.h"
+#include "script/cbottoken.h"
+#include "ui/displayinfo.h"
diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h index 61b87ee..bbe6a72 100644 --- a/src/ui/displayinfo.h +++ b/src/ui/displayinfo.h @@ -16,12 +16,11 @@ // displayinfo.h
-#ifndef _DISPLAYINFO_H_
-#define _DISPLAYINFO_H_
+#pragma once
-#include "struct.h"
-#include "camera.h"
+#include "common/struct.h"
+#include "graphics/common/camera.h"
class CInstanceManager;
@@ -89,4 +88,3 @@ protected: };
-#endif //_DISPLAYINFO_H_
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index a56bf9f..f4c16f4 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -23,23 +23,23 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "event.h"
-#include "misc.h"
-#include "restext.h"
-#include "iman.h"
-#include "object.h"
-#include "motion.h"
-#include "motiontoto.h"
-#include "interface.h"
-#include "button.h"
-#include "label.h"
-#include "window.h"
-#include "group.h"
-#include "text.h"
-#include "sound.h"
-#include "displaytext.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/restext.h"
+#include "common/iman.h"
+#include "object/object.h"
+#include "object/motion/motion.h"
+#include "object/motion/motiontoto.h"
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/label.h"
+#include "ui/window.h"
+#include "ui/group.h"
+#include "graphics/common/text.h"
+#include "sound/sound.h"
+#include "ui/displaytext.h"
diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h index 6a54e1f..67d9c77 100644 --- a/src/ui/displaytext.h +++ b/src/ui/displaytext.h @@ -16,11 +16,10 @@ // displaytext.h
-#ifndef _DISPLAYTEXT_H_
-#define _DISPLAYTEXT_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -93,4 +92,3 @@ protected: };
-#endif //_DISPLAYTEXT_H_
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index f15b0c2..42aaf0b 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -25,17 +25,17 @@ #include <windows.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "restext.h"
-#include "scroll.h"
-#include "text.h"
-#include "edit.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "ui/scroll.h"
+#include "graphics/common/text.h"
+#include "ui/edit.h"
#define MARGX (5.0f/640.0f)
diff --git a/src/ui/edit.h b/src/ui/edit.h index 4ad884f..eccc67e 100644 --- a/src/ui/edit.h +++ b/src/ui/edit.h @@ -16,12 +16,11 @@ // edit.h
-#ifndef _EDIT_H_
-#define _EDIT_H_
+#pragma once
-#include "struct.h"
-#include "control.h"
+#include "common/struct.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -252,4 +251,3 @@ protected: };
-#endif //_EDIT_H_
diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp index ce8515c..39e5b29 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/editvalue.cpp @@ -23,15 +23,15 @@ #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 "edit.h"
-#include "button.h"
-#include "editvalue.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 "ui/edit.h"
+#include "ui/button.h"
+#include "ui/editvalue.h"
diff --git a/src/ui/editvalue.h b/src/ui/editvalue.h index 3203b8b..e6c16f9 100644 --- a/src/ui/editvalue.h +++ b/src/ui/editvalue.h @@ -16,11 +16,10 @@ // editvalue.h
-#ifndef _EDITVALUE_H_
-#define _EDITVALUE_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
enum EditValueType
@@ -82,4 +81,3 @@ protected: };
-#endif //_EDITVALUE_H_
diff --git a/src/ui/gauge.cpp b/src/ui/gauge.cpp index 420cebf..b01230c 100644 --- a/src/ui/gauge.cpp +++ b/src/ui/gauge.cpp @@ -23,13 +23,13 @@ #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 "gauge.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 "ui/gauge.h"
diff --git a/src/ui/gauge.h b/src/ui/gauge.h index 9895d75..e4ec692 100644 --- a/src/ui/gauge.h +++ b/src/ui/gauge.h @@ -16,11 +16,10 @@ // gauge.h
-#ifndef _GAUGE_H_
-#define _GAUGE_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -49,4 +48,3 @@ protected: };
-#endif //_GAUGE_H_
diff --git a/src/ui/group.cpp b/src/ui/group.cpp index f49fd69..73f8b36 100644 --- a/src/ui/group.cpp +++ b/src/ui/group.cpp @@ -23,14 +23,14 @@ #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 "restext.h"
-#include "group.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 "common/restext.h"
+#include "ui/group.h"
diff --git a/src/ui/group.h b/src/ui/group.h index 6dab275..9cefeed 100644 --- a/src/ui/group.h +++ b/src/ui/group.h @@ -16,11 +16,10 @@ // group.h
-#ifndef _GROUP_H_
-#define _GROUP_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -45,4 +44,3 @@ protected: };
-#endif //_GROUP_H_
diff --git a/src/ui/image.cpp b/src/ui/image.cpp index 974216a..39ff867 100644 --- a/src/ui/image.cpp +++ b/src/ui/image.cpp @@ -23,14 +23,14 @@ #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 "restext.h"
-#include "image.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 "common/restext.h"
+#include "ui/image.h"
diff --git a/src/ui/image.h b/src/ui/image.h index 7545ac0..b1f9bdc 100644 --- a/src/ui/image.h +++ b/src/ui/image.h @@ -16,11 +16,10 @@ // image.h
-#ifndef _IMAGE_H_
-#define _IMAGE_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -49,4 +48,3 @@ protected: };
-#endif //_IMAGE_H_
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index fe1f112..75afd27 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -23,32 +23,32 @@ #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 "control.h"
-#include "button.h"
-#include "color.h"
-#include "check.h"
-#include "key.h"
-#include "group.h"
-#include "image.h"
-#include "label.h"
-#include "edit.h"
-#include "editvalue.h"
-#include "scroll.h"
-#include "slider.h"
-#include "list.h"
-#include "shortcut.h"
-#include "compass.h"
-#include "target.h"
-#include "map.h"
-#include "window.h"
-#include "camera.h"
-#include "interface.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 "ui/control.h"
+#include "ui/button.h"
+#include "ui/color.h"
+#include "ui/check.h"
+#include "ui/key.h"
+#include "ui/group.h"
+#include "ui/image.h"
+#include "ui/label.h"
+#include "ui/edit.h"
+#include "ui/editvalue.h"
+#include "ui/scroll.h"
+#include "ui/slider.h"
+#include "ui/list.h"
+#include "ui/shortcut.h"
+#include "ui/compass.h"
+#include "ui/target.h"
+#include "ui/map.h"
+#include "ui/window.h"
+#include "graphics/common/camera.h"
+#include "ui/interface.h"
diff --git a/src/ui/interface.h b/src/ui/interface.h index 4a8f202..6ef4c56 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -16,8 +16,7 @@ // interface.h
-#ifndef _INTERFACE_H_
-#define _INTERFACE_H_
+#pragma once
class CInstanceManager;
@@ -90,4 +89,3 @@ protected: };
-#endif //_INTERFACE_H_
diff --git a/src/ui/key.cpp b/src/ui/key.cpp index c59dac3..8a68439 100644 --- a/src/ui/key.cpp +++ b/src/ui/key.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 "restext.h"
-#include "sound.h"
-#include "text.h"
-#include "key.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 "common/restext.h"
+#include "sound/sound.h"
+#include "graphics/common/text.h"
+#include "ui/key.h"
diff --git a/src/ui/key.h b/src/ui/key.h index f292425..bda1a3d 100644 --- a/src/ui/key.h +++ b/src/ui/key.h @@ -16,11 +16,10 @@ // key.h
-#ifndef _KEY_H_
-#define _KEY_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -51,4 +50,3 @@ protected: };
-#endif //_KEY_H_
diff --git a/src/ui/label.cpp b/src/ui/label.cpp index 46d0099..977c7f3 100644 --- a/src/ui/label.cpp +++ b/src/ui/label.cpp @@ -23,14 +23,14 @@ #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 "text.h"
-#include "label.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/text.h"
+#include "ui/label.h"
diff --git a/src/ui/label.h b/src/ui/label.h index c36a758..5ad4eb1 100644 --- a/src/ui/label.h +++ b/src/ui/label.h @@ -16,11 +16,10 @@ // label.h
-#ifndef _LABEL_H_
-#define _LABEL_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -45,4 +44,3 @@ protected: };
-#endif //_LABEL_H_
diff --git a/src/ui/list.cpp b/src/ui/list.cpp index 08b09c0..4950cf1 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.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 "button.h"
-#include "scroll.h"
-#include "text.h"
-#include "list.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 "ui/button.h"
+#include "ui/scroll.h"
+#include "graphics/common/text.h"
+#include "ui/list.h"
diff --git a/src/ui/list.h b/src/ui/list.h index 43d155f..0a648a3 100644 --- a/src/ui/list.h +++ b/src/ui/list.h @@ -16,12 +16,11 @@ // list.h
-#ifndef _LIST_H_
-#define _LIST_H_
+#pragma once
-#include "control.h"
-#include "event.h"
+#include "ui/control.h"
+#include "common/event.h"
class CD3DEngine;
@@ -114,4 +113,3 @@ protected: };
-#endif //_LIST_H_
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index a216cd9..eb5640e 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -26,38 +26,38 @@ #include <io.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "profile.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "particule.h"
-#include "interface.h"
-#include "button.h"
-#include "color.h"
-#include "check.h"
-#include "key.h"
-#include "group.h"
-#include "image.h"
-#include "scroll.h"
-#include "slider.h"
-#include "list.h"
-#include "label.h"
-#include "window.h"
-#include "edit.h"
-#include "editvalue.h"
-#include "text.h"
-#include "camera.h"
-#include "sound.h"
-#include "cmdtoken.h"
-#include "robotmain.h"
-#include "maindialog.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/global.h"
+#include "common/language.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/particule.h"
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/color.h"
+#include "ui/check.h"
+#include "ui/key.h"
+#include "ui/group.h"
+#include "ui/image.h"
+#include "ui/scroll.h"
+#include "ui/slider.h"
+#include "ui/list.h"
+#include "ui/label.h"
+#include "ui/window.h"
+#include "ui/edit.h"
+#include "ui/editvalue.h"
+#include "graphics/common/text.h"
+#include "graphics/common/camera.h"
+#include "sound/sound.h"
+#include "script/cmdtoken.h"
+#include "object/robotmain.h"
+#include "ui/maindialog.h"
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index 21dca18..fbc3f1e 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -16,12 +16,12 @@ // maindialog.h
-#ifndef _MAINDIALOG_H_
-#define _MAINDIALOG_H_
+#pragma once
-#include "struct.h"
-#include "camera.h"
-#include "robotmain.h"
+
+#include "common/struct.h"
+#include "graphics/common/camera.h"
+#include "object/robotmain.h"
class CInstanceManager;
@@ -253,4 +253,3 @@ protected: };
-#endif //_MAINDIALOG_H_
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index dc3fc6b..2366f8b 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -23,20 +23,20 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "iman.h"
-#include "interface.h"
-#include "map.h"
-#include "image.h"
-#include "group.h"
-#include "slider.h"
-#include "scroll.h"
-#include "window.h"
-#include "mainmap.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/iman.h"
+#include "ui/interface.h"
+#include "ui/map.h"
+#include "ui/image.h"
+#include "ui/group.h"
+#include "ui/slider.h"
+#include "ui/scroll.h"
+#include "ui/window.h"
+#include "ui/mainmap.h"
diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h index f9fe0be..cd74f39 100644 --- a/src/ui/mainmap.h +++ b/src/ui/mainmap.h @@ -16,8 +16,7 @@ // mainmap.h
-#ifndef _MAINMAP_H_
-#define _MAINMAP_H_
+#pragma once
class CInstanceManager;
@@ -65,4 +64,3 @@ protected: };
-#endif //_MAINMAP_H_
diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index 4e934e5..7ac35af 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -23,17 +23,17 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "global.h"
-#include "event.h"
-#include "iman.h"
-#include "object.h"
-#include "interface.h"
-#include "map.h"
-#include "button.h"
-#include "robotmain.h"
-#include "mainshort.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/iman.h"
+#include "object/object.h"
+#include "ui/interface.h"
+#include "ui/map.h"
+#include "ui/button.h"
+#include "object/robotmain.h"
+#include "ui/mainshort.h"
diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h index 648dbbc..a4ff831 100644 --- a/src/ui/mainshort.h +++ b/src/ui/mainshort.h @@ -16,8 +16,7 @@ // mainshort.h
-#ifndef _MAINSHORT_H_
-#define _MAINSHORT_H_
+#pragma once
class CInstanceManager;
@@ -58,4 +57,3 @@ protected: };
-#endif //_MAINSHORT_H_
diff --git a/src/ui/map.cpp b/src/ui/map.cpp index c44a218..ceb663f 100644 --- a/src/ui/map.cpp +++ b/src/ui/map.cpp @@ -23,18 +23,18 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "event.h"
-#include "math3d.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "event.h"
-#include "misc.h"
-#include "robotmain.h"
-#include "iman.h"
-#include "map.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/event.h"
+#include "math/old/math3d.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "object/object.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "object/robotmain.h"
+#include "common/iman.h"
+#include "ui/map.h"
diff --git a/src/ui/map.h b/src/ui/map.h index 4b1f793..30e1b2b 100644 --- a/src/ui/map.h +++ b/src/ui/map.h @@ -16,13 +16,12 @@ // map.h
-#ifndef _MAP_H_
-#define _MAP_H_
+#pragma once
-#include "control.h"
-#include "struct.h"
-#include "object.h"
+#include "ui/control.h"
+#include "common/struct.h"
+#include "object/object.h"
class CD3DEngine;
@@ -138,4 +137,3 @@ protected: };
-#endif //_MAP_H_
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp index 1122ac5..eb61bd0 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/scroll.cpp @@ -23,14 +23,14 @@ #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 "button.h"
-#include "scroll.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 "ui/button.h"
+#include "ui/scroll.h"
diff --git a/src/ui/scroll.h b/src/ui/scroll.h index 6c08a19..7975317 100644 --- a/src/ui/scroll.h +++ b/src/ui/scroll.h @@ -16,12 +16,11 @@ // scroll.h
-#ifndef _SCROLL_H_
-#define _SCROLL_H_
+#pragma once
-#include "control.h"
-#include "struct.h"
+#include "ui/control.h"
+#include "common/struct.h"
class CD3DEngine;
@@ -81,4 +80,3 @@ protected: };
-#endif //_SCROLL_H_
diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp index 21a6191..adf22eb 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -23,13 +23,13 @@ #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 "shortcut.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 "ui/shortcut.h"
diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h index e76402b..4535e4b 100644 --- a/src/ui/shortcut.h +++ b/src/ui/shortcut.h @@ -16,11 +16,10 @@ // shortcut.h
-#ifndef _SHORTCUT_H_
-#define _SHORTCUT_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -47,4 +46,3 @@ protected: };
-#endif //_SHORTCUT_H_
diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp index 95bd3a4..34bc0e3 100644 --- a/src/ui/slider.cpp +++ b/src/ui/slider.cpp @@ -23,15 +23,15 @@ #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 "text.h"
-#include "button.h"
-#include "slider.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/text.h"
+#include "ui/button.h"
+#include "ui/slider.h"
diff --git a/src/ui/slider.h b/src/ui/slider.h index c254254..91199ed 100644 --- a/src/ui/slider.h +++ b/src/ui/slider.h @@ -16,12 +16,11 @@ // slider.h
-#ifndef _SLIDER_H_
-#define _SLIDER_H_
+#pragma once
-#include "control.h"
-#include "struct.h"
+#include "ui/control.h"
+#include "common/struct.h"
class CD3DEngine;
@@ -81,4 +80,3 @@ protected: };
-#endif //_SLIDER_H_
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index 8839f31..d169696 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -28,32 +28,32 @@ #include <time.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 "restext.h"
-#include "math3d.h"
-#include "robotmain.h"
-#include "object.h"
-#include "camera.h"
-#include "sound.h"
-#include "script.h"
-#include "interface.h"
-#include "button.h"
-#include "check.h"
-#include "slider.h"
-#include "edit.h"
-#include "list.h"
-#include "label.h"
-#include "group.h"
-#include "window.h"
-#include "text.h"
-#include "cbottoken.h"
-#include "studio.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 "common/restext.h"
+#include "math/old/math3d.h"
+#include "object/robotmain.h"
+#include "object/object.h"
+#include "graphics/common/camera.h"
+#include "sound/sound.h"
+#include "script/script.h"
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/check.h"
+#include "ui/slider.h"
+#include "ui/edit.h"
+#include "ui/list.h"
+#include "ui/label.h"
+#include "ui/group.h"
+#include "ui/window.h"
+#include "graphics/common/text.h"
+#include "script/cbottoken.h"
+#include "ui/studio.h"
diff --git a/src/ui/studio.h b/src/ui/studio.h index a19bedd..4f88314 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -16,12 +16,11 @@ // studio.h
-#ifndef _STUDIO_H_
-#define _STUDIO_H_
+#pragma once
-#include "object.h"
-#include "script.h"
+#include "object/object.h"
+#include "script/script.h"
class CInstanceManager;
@@ -114,4 +113,3 @@ protected: };
-#endif //_STUDIO_H_
diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 4a6ae43..1c138e0 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.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 "robotmain.h"
-#include "object.h"
-#include "restext.h"
-#include "target.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/robotmain.h"
+#include "object/object.h"
+#include "common/restext.h"
+#include "ui/target.h"
diff --git a/src/ui/target.h b/src/ui/target.h index 632e411..d34a9b4 100644 --- a/src/ui/target.h +++ b/src/ui/target.h @@ -16,11 +16,10 @@ // target.h
-#ifndef _TARGET_H_
-#define _TARGET_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -47,4 +46,3 @@ protected: };
-#endif //_TARGET_H_
diff --git a/src/ui/window.cpp b/src/ui/window.cpp index c42493a..21fa17b 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -23,33 +23,33 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "math3d.h"
-#include "event.h"
-#include "misc.h"
-#include "restext.h"
-#include "iman.h"
-#include "button.h"
-#include "color.h"
-#include "check.h"
-#include "key.h"
-#include "group.h"
-#include "image.h"
-#include "label.h"
-#include "edit.h"
-#include "editvalue.h"
-#include "scroll.h"
-#include "slider.h"
-#include "list.h"
-#include "shortcut.h"
-#include "map.h"
-#include "gauge.h"
-#include "compass.h"
-#include "target.h"
-#include "text.h"
-#include "window.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "math/old/math3d.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/restext.h"
+#include "common/iman.h"
+#include "ui/button.h"
+#include "ui/color.h"
+#include "ui/check.h"
+#include "ui/key.h"
+#include "ui/group.h"
+#include "ui/image.h"
+#include "ui/label.h"
+#include "ui/edit.h"
+#include "ui/editvalue.h"
+#include "ui/scroll.h"
+#include "ui/slider.h"
+#include "ui/list.h"
+#include "ui/shortcut.h"
+#include "ui/map.h"
+#include "ui/gauge.h"
+#include "ui/compass.h"
+#include "ui/target.h"
+#include "graphics/common/text.h"
+#include "ui/window.h"
diff --git a/src/ui/window.h b/src/ui/window.h index 61506d1..d88ba33 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -16,11 +16,10 @@ // window.h
-#ifndef _WINDOW_H_
-#define _WINDOW_H_
+#pragma once
-#include "control.h"
+#include "ui/control.h"
class CD3DEngine;
@@ -145,4 +144,3 @@ protected: };
-#endif //_WINDOW_H_
|