Fixed include paths and CMakeLists.txt

Additionally, changed #ifndef to #pragma once everywhere

src/CMakeLists.txt

@@ -2,131 +2,133 @@
 add_subdirectory(CBot)
 
 set(SOURCES
-autobase.cpp
+app/d3dapp.cpp
-autoconvert.cpp
+app/joystick.cpp
-auto.cpp
+common/event.cpp
-autoderrick.cpp
+common/iman.cpp
-autodestroyer.cpp
+common/metafile.cpp
-autoegg.cpp
+common/misc.cpp
-autoenergy.cpp
+common/modfile.cpp
-autofactory.cpp
+common/profile.cpp
-autoflag.cpp
+common/restext.cpp
-autohuston.cpp
+graphics/common/blitz.cpp
-autoinfo.cpp
+graphics/common/camera.cpp
-autojostle.cpp
+graphics/common/cloud.cpp
-autokid.cpp
+graphics/common/light.cpp
-autolabo.cpp
+graphics/common/mainmovie.cpp
-automush.cpp
+graphics/common/model.cpp
-autonest.cpp
+graphics/common/particule.cpp
-autonuclear.cpp
+graphics/common/planet.cpp
-autopara.cpp
+graphics/common/pyro.cpp
-autoportico.cpp
+graphics/common/terrain.cpp
-autoradar.cpp
+graphics/common/text.cpp
-autorepair.cpp
+graphics/common/water.cpp
-autoresearch.cpp
+graphics/d3d/d3dengine.cpp
-autoroot.cpp
+graphics/d3d/d3denum.cpp
-autosafe.cpp
+graphics/d3d/d3dframe.cpp
-autostation.cpp
+graphics/d3d/d3dtextr.cpp
-autotower.cpp
+graphics/d3d/d3dutil.cpp
-blitz.cpp
+math/old/d3dmath.cpp
-brain.cpp
+math/old/math3d.cpp
-button.cpp
+object/auto/auto.cpp
-camera.cpp
+object/auto/autobase.cpp
-cbottoken.cpp
+object/auto/autoconvert.cpp
-check.cpp
+object/auto/autoderrick.cpp
-cloud.cpp
+object/auto/autodestroyer.cpp
-cmdtoken.cpp
+object/auto/autoegg.cpp
-color.cpp
+object/auto/autoenergy.cpp
-compass.cpp
+object/auto/autofactory.cpp
-control.cpp
+object/auto/autoflag.cpp
-d3dapp.cpp
+object/auto/autohuston.cpp
-d3dengine.cpp
+object/auto/autoinfo.cpp
-d3denum.cpp
+object/auto/autojostle.cpp
-d3dframe.cpp
+object/auto/autokid.cpp
-d3dmath.cpp
+object/auto/autolabo.cpp
-d3dtextr.cpp
+object/auto/automush.cpp
-d3dutil.cpp
+object/auto/autonest.cpp
-displayinfo.cpp
+object/auto/autonuclear.cpp
-displaytext.cpp
+object/auto/autopara.cpp
-edit.cpp
+object/auto/autoportico.cpp
-editvalue.cpp
+object/auto/autoradar.cpp
-event.cpp
+object/auto/autorepair.cpp
-gauge.cpp
+object/auto/autoresearch.cpp
-group.cpp
+object/auto/autoroot.cpp
-image.cpp
+object/auto/autosafe.cpp
-iman.cpp
+object/auto/autostation.cpp
-interface.cpp
+object/auto/autotower.cpp
-joystick.cpp
+object/brain.cpp
-key.cpp
+object/motion/motion.cpp
-label.cpp
+object/motion/motionant.cpp
-light.cpp
+object/motion/motionbee.cpp
-list.cpp
+object/motion/motionhuman.cpp
-maindialog.cpp
+object/motion/motionmother.cpp
-mainmap.cpp
+object/motion/motionspider.cpp
-mainmovie.cpp
+object/motion/motiontoto.cpp
-mainshort.cpp
+object/motion/motionvehicle.cpp
-map.cpp
+object/motion/motionworm.cpp
-math3d.cpp
+object/object.cpp
-metafile.cpp
+object/robotmain.cpp
-misc.cpp
+object/task/task.cpp
-model.cpp
+object/task/taskadvance.cpp
-modfile.cpp
+object/task/taskbuild.cpp
-motionant.cpp
+object/task/taskfire.cpp
-motionbee.cpp
+object/task/taskfireant.cpp
-motion.cpp
+object/task/taskflag.cpp
-motionhuman.cpp
+object/task/taskgoto.cpp
-motionmother.cpp
+object/task/taskgungoal.cpp
-motionspider.cpp
+object/task/taskinfo.cpp
-motiontoto.cpp
+object/task/taskmanager.cpp
-motionvehicle.cpp
+object/task/taskmanip.cpp
-motionworm.cpp
+object/task/taskpen.cpp
-object.cpp
+object/task/taskrecover.cpp
-particule.cpp
+object/task/taskreset.cpp
-physics.cpp
+object/task/tasksearch.cpp
-planet.cpp
+object/task/taskshield.cpp
-profile.cpp
+object/task/taskspiderexplo.cpp
-pyro.cpp
+object/task/tasktake.cpp
-restext.cpp
+object/task/taskterraform.cpp
-robotmain.cpp
+object/task/taskturn.cpp
-script.cpp
+object/task/taskwait.cpp
-scroll.cpp
+physics/physics.cpp
-shortcut.cpp
+script/cbottoken.cpp
-slider.cpp
+script/cmdtoken.cpp
-sound.cpp
+script/script.cpp
-studio.cpp
+sound/sound.cpp
-target.cpp
+ui/button.cpp
-taskadvance.cpp
+ui/check.cpp
-taskbuild.cpp
+ui/color.cpp
-task.cpp
+ui/compass.cpp
-taskfireant.cpp
+ui/control.cpp
-taskfire.cpp
+ui/displayinfo.cpp
-taskflag.cpp
+ui/displaytext.cpp
-taskgoto.cpp
+ui/edit.cpp
-taskgungoal.cpp
+ui/editvalue.cpp
-taskinfo.cpp
+ui/gauge.cpp
-taskmanager.cpp
+ui/group.cpp
-taskmanip.cpp
+ui/image.cpp
-taskpen.cpp
+ui/interface.cpp
-taskrecover.cpp
+ui/key.cpp
-taskreset.cpp
+ui/label.cpp
-tasksearch.cpp
+ui/list.cpp
-taskshield.cpp
+ui/maindialog.cpp
-taskspiderexplo.cpp
+ui/mainmap.cpp
-tasktake.cpp
+ui/mainshort.cpp
-taskterraform.cpp
+ui/map.cpp
-taskturn.cpp
+ui/scroll.cpp
-taskwait.cpp
+ui/shortcut.cpp
-terrain.cpp
+ui/slider.cpp
-text.cpp
+ui/studio.cpp
-water.cpp
+ui/target.cpp
-window.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

src/app/d3dapp.cpp

@@ -26,19 +26,19 @@
 #include <zmouse.h>
 #include <dinput.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dtextr.h"
+#include "graphics/d3d/d3dtextr.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "profile.h"
+#include "common/profile.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "restext.h"
+#include "common/restext.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "joystick.h"
+#include "app/joystick.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "d3dapp.h"
+#include "app/d3dapp.h"
 
 // fix for "MSH_MOUSEWHEEL undefined" error
 #ifdef UNICODE

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 "graphics/d3d/d3dengine.h"
-#include "d3dframe.h"
+#include "graphics/d3d/d3dframe.h"
-#include "d3denum.h"
+#include "graphics/d3d/d3denum.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "d3dres.h"
+#include "old/d3dres.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -165,4 +164,3 @@ public:
 };
 
 
-#endif // _D3DAPP_H

src/app/joystick.cpp

@@ -23,7 +23,7 @@
 #include <dinput.h>
 #include <stdio.h>
 
-#include "joystick.h"
+#include "app/joystick.h"
 
 
 

src/app/joystick.h

@@ -16,9 +16,7 @@
 
 // joystick.h
 
-#ifndef _JOYSTICK_H_
+#pragma once
-#define	_JOYSTICK_H_
-
 
 
 extern BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd);
@@ -27,5 +25,3 @@ extern BOOL UpdateInputState(DIJOYSTATE &js);
 extern BOOL FreeDirectInput();
 
 
-
-#endif //_JOYSTICK_H_

src/common/event.cpp

@@ -22,9 +22,9 @@
 #include <windows.h>
 #include <stdio.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "event.h"
+#include "common/event.h"
 
 
 

src/common/event.h

@@ -16,11 +16,10 @@
 
 // event.h
 
-#ifndef _EVENT_H_
+#pragma once
-#define	_EVENT_H_
 
 
-#include "struct.h"
+#include "common/struct.h"
 
 
 #if !defined (WM_XBUTTONDOWN)
@@ -633,4 +632,3 @@ protected:
 };
 
 
-#endif //_EVENT_H_

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_

src/common/iman.cpp

@@ -22,8 +22,8 @@
 #include <windows.h>
 #include <stdio.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "iman.h"
+#include "common/iman.h"
 
 
 

src/common/iman.h

@@ -16,11 +16,10 @@
 
 // iman.h
 
-#ifndef _IMAN_H_
+#pragma once
-#define	_IMAN_H_
 
 
-#include "misc.h"
+#include "common/misc.h"
 
 
 
@@ -55,4 +54,3 @@ protected:
 };
 
 
-#endif //_IMAN_H_

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

src/common/metafile.cpp

@@ -22,8 +22,8 @@
 #include <windows.h>
 #include <stdio.h>
 
-#include "language.h"
+#include "common/language.h"
-#include "metafile.h"
+#include "common/metafile.h"
 
 
 

src/common/metafile.h

@@ -16,8 +16,7 @@
 
 // metafile.h
 
-#ifndef _METAFILE_H_
+#pragma once
-#define	_METAFILE_H_
 
 
 #include <stdio.h>
@@ -75,4 +74,3 @@ protected:
 };
 
 
-#endif //_METAFILE_H_

src/common/misc.cpp

@@ -27,13 +27,13 @@
 #include <time.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 

src/common/misc.h

@@ -16,14 +16,14 @@
 
 // misc.h
 
-#ifndef _MISC_H_
+#pragma once
-#define	_MISC_H_
+
 
 #include <time.h>
 
 
-#include "metafile.h"
+#include "common/metafile.h"
-#include "event.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_

src/common/modfile.cpp

@@ -23,15 +23,15 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "modfile.h"
+#include "common/modfile.h"
 
 
 

src/common/modfile.h

@@ -16,11 +16,10 @@
 
 // modfile.h
 
-#ifndef _MODFILE_H_
+#pragma once
-#define	_MODFILE_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
 
 
 class CInstanceManager;
@@ -116,4 +115,3 @@ protected:
 };
 
 
-#endif //_MODFILE_H_

src/common/profile.cpp

@@ -23,9 +23,9 @@
 #include <d3d.h>
 #include <stdlib.h>
 
-#include "language.h"
+#include "common/language.h"
-#include "struct.h"
+#include "common/struct.h"
-#include "profile.h"
+#include "common/profile.h"
 
 
 

src/common/profile.h

@@ -16,8 +16,7 @@
 
 // profile.h
 
-#ifndef _PROFILE_H_
+#pragma once
-#define	_PROFILE_H_
 
 
 #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_

src/common/restext.cpp

@@ -18,14 +18,14 @@
 #define D3D_OVERLOADS
 
 #include <stdio.h>
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "language.h"
+#include "common/language.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "event.h"
+#include "common/event.h"
-#include "object.h"
+#include "object/object.h"
 #include "CBot/resource.h"
-#include "restext.h"
+#include "common/restext.h"
 
 
 

src/common/restext.h

@@ -16,16 +16,15 @@
 
 // restext.h
 
-#ifndef _RESTEXT_H_
+#pragma once
-#define	_RESTEXT_H_
 
 
 #define STRICT
 #define D3D_OVERLOADS
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "event.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_

src/common/struct.h

@@ -16,8 +16,8 @@
 
 // struct.h
 
-#ifndef _STRUCT_H_
+#pragma once
-#define	_STRUCT_H_
+
 
 #include <d3d.h>
 
@@ -70,4 +70,3 @@ struct ColorHSV
 };
 
 
-#endif //_STRUCT_H_

src/graphics/common/blitz.cpp

@@ -21,21 +21,21 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "object.h"
+#include "object/object.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autopara.h"
+#include "object/auto/autopara.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "blitz.h"
+#include "graphics/common/blitz.h"
 
 
 

src/graphics/common/blitz.h

@@ -16,12 +16,11 @@
 
 // blitz.h
 
-#ifndef _BLITZ_H_
+#pragma once
-#define	_BLITZ_H_
 
 
-#include "misc.h"
+#include "common/misc.h"
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -80,5 +79,3 @@ protected:
 	float		m_width[BLITZMAX];
 };
 
-
-#endif //_BLITZ_H_

src/graphics/common/camera.cpp

@@ -21,19 +21,19 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "object.h"
+#include "object/object.h"
-#include "physics.h"
+#include "physics/physics.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
 
 
 

src/graphics/common/camera.h

@@ -16,12 +16,11 @@
 
 // camera.h
 
-#ifndef _CAMERA_H_
+#pragma once
-#define	_CAMERA_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -267,5 +266,3 @@ protected:
 	BOOL		m_bCameraInvertY;	// Y inversion in the edges?
 };
 
-
-#endif //_CAMERA_H_

src/graphics/common/cloud.cpp

@@ -21,17 +21,17 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "object/object.h"
-#include "cloud.h"
+#include "graphics/common/cloud.h"
 
 
 

src/graphics/common/cloud.h

@@ -16,11 +16,10 @@
 
 // cloud.h
 
-#ifndef _CLOUD_H_
+#pragma once
-#define	_CLOUD_H_
 
 
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -86,5 +85,3 @@ protected:
 	BOOL			m_bEnable;
 };
 
-
-#endif //_CLOUD_H_

src/graphics/common/color.cpp

@@ -16,7 +16,7 @@
 
 // color.cpp
 
-#include "color.h"
+#include "graphics/common/color.h"
 
 // TODO
 

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);
+

src/graphics/common/light.cpp

@@ -23,13 +23,14 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "event.h"
+#include "graphics/d3d/d3dengine.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "light.h"
+#include "math/old/math3d.h"
+#include "graphics/common/light.h"
 
 
 

src/graphics/common/light.h

@@ -16,11 +16,10 @@
 
 // light.h
 
-#ifndef _LIGHT_H_
+#pragma once
-#define	_LIGHT_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
 
 
 class CInstanceManager;
@@ -109,5 +108,3 @@ protected:
 	Light*			m_lightTable;
 };
 
-
-#endif //_LIGHT_H_

src/graphics/common/mainmovie.cpp

@@ -23,20 +23,20 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "global.h"
+#include "common/global.h"
-#include "event.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "motion.h"
+#include "object/motion/motion.h"
-#include "motionhuman.h"
+#include "object/motion/motionhuman.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "mainmovie.h"
+#include "graphics/common/mainmovie.h"
 
 
 

src/graphics/common/mainmovie.h

@@ -16,8 +16,7 @@
 
 // mainmovie.h
 
-#ifndef _MAINMOVIE_H_
+#pragma once
-#define	_MAINMOVIE_H_
 
 
 class CInstanceManager;
@@ -76,5 +75,3 @@ protected:
 	D3DVECTOR		m_finalLookat[2];
 };
 
-
-#endif //_MAINMOVIE_H_

src/graphics/common/model.cpp

@@ -23,21 +23,21 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "edit.h"
+#include "ui/edit.h"
-#include "button.h"
+#include "ui/button.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "modfile.h"
+#include "common/modfile.h"
-#include "model.h"
+#include "graphics/common/model.h"
 
 
 

src/graphics/common/model.h

@@ -16,11 +16,10 @@
 
 // model.h
 
-#ifndef _MODEL_H_
+#pragma once
-#define	_MODEL_H_
 
 
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -133,5 +132,3 @@ protected:
 	float			m_max;
 };
 
-
-#endif //_MODEL_H_

src/graphics/common/particule.cpp

@@ -23,23 +23,23 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dtextr.h"
+#include "graphics/d3d/d3dtextr.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "language.h"
+#include "common/language.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "event.h"
+#include "common/event.h"
-#include "object.h"
+#include "object/object.h"
-#include "physics.h"
+#include "physics/physics.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
 
 
 

src/graphics/common/particule.h

@@ -16,12 +16,11 @@
 
 // particule.h
 
-#ifndef _PARTICULE_H_
+#pragma once
-#define	_PARTICULE_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "sound.h"
+#include "sound/sound.h"
 
 
 class CInstanceManager;
@@ -335,5 +334,3 @@ protected:
 	float		m_absTime;
 };
 
-
-#endif //_PARTICULE_H_

src/graphics/common/planet.cpp

@@ -23,14 +23,14 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "planet.h"
+#include "graphics/common/planet.h"
 
 
 

src/graphics/common/planet.h

@@ -16,11 +16,10 @@
 
 // planet.h
 
-#ifndef _PLANET_H_
+#pragma once
-#define	_PLANET_H_
 
 
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -75,5 +74,3 @@ protected:
 	BOOL			m_bPlanetExist;
 };
 
-
-#endif //_PLANET_H_

src/graphics/common/pyro.cpp

@@ -23,24 +23,25 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "D3DEngine.h"
+#include "common/struct.h"
-#include "D3DMath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "event.h"
+#include "math/old/d3dmath.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "robotmain.h"
+#include "math/old/math3d.h"
-#include "terrain.h"
+#include "object/robotmain.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "particule.h"
+#include "graphics/common/camera.h"
-#include "light.h"
+#include "graphics/common/particule.h"
-#include "object.h"
+#include "graphics/common/light.h"
-#include "motion.h"
+#include "object/object.h"
-#include "motionhuman.h"
+#include "object/motion/motion.h"
-#include "displaytext.h"
+#include "object/motion/motionhuman.h"
-#include "sound.h"
+#include "ui/displaytext.h"
-#include "pyro.h"
+#include "sound/sound.h"
+#include "graphics/common/pyro.h"
 
 
 

src/graphics/common/pyro.h

@@ -16,13 +16,12 @@
 
 // pyro.h
 
-#ifndef _PYRO_H_
+#pragma once
-#define	_PYRO_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "object.h"
+#include "object/object.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -171,5 +170,3 @@ protected:
 	float			m_crashSphereRadius[50];
 };
 
-
-#endif //_PYRO_H_

src/graphics/common/terrain.cpp

@@ -23,18 +23,18 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "modfile.h"
+#include "common/modfile.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
 
 
 #define BMPHEAD	1078

src/graphics/common/terrain.h

@@ -16,11 +16,10 @@
 
 // terrain.h
 
-#ifndef _TERRAIN_H_
+#pragma once
-#define	_TERRAIN_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
 
 
 class CInstanceManager;
@@ -210,5 +209,3 @@ protected:
 	FlyingLimit		m_flyingLimit[MAXFLYINGLIMIT];
 };
 
-
-#endif //_TERRAIN_H_

src/graphics/common/text.cpp

@@ -23,14 +23,14 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "text.h"
+#include "graphics/common/text.h"
 
 
 

src/graphics/common/text.h

@@ -16,11 +16,10 @@
 
 // text.h
 
-#ifndef _TEXT_H_
+#pragma once
-#define	_TEXT_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
 
 
 class CInstanceManager;
@@ -109,5 +108,3 @@ protected:
 
 };
 
-
-#endif //_TEXT_H_

src/graphics/common/water.cpp

@@ -23,19 +23,19 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "object/object.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "water.h"
+#include "graphics/common/water.h"
 
 
 

src/graphics/common/water.h

@@ -16,12 +16,11 @@
 
 // water.h
 
-#ifndef _WATER_H_
+#pragma once
-#define	_WATER_H_
 
 
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
 
 
 class CInstanceManager;
@@ -130,5 +129,3 @@ protected:
 	D3DCOLOR		m_color;
 };
 
-
-#endif //_WATER_H_

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 "common/struct.h"
-#include "d3dapp.h"
+#include "app/d3dapp.h"
-#include "d3dtextr.h"
+#include "graphics/d3d/d3dtextr.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "language.h"
+#include "common/language.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "event.h"
+#include "common/event.h"
-#include "profile.h"
+#include "common/profile.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "text.h"
+#include "graphics/common/text.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "cloud.h"
+#include "graphics/common/cloud.h"
-#include "blitz.h"
+#include "graphics/common/blitz.h"
-#include "planet.h"
+#include "graphics/common/planet.h"
-#include "sound.h"
+#include "sound/sound.h"
 
 
 

src/graphics/d3d/d3dengine.h

@@ -16,11 +16,10 @@
 
 // d3dengine.h
 
-#ifndef _D3DENGINE_H_
+#pragma once
-#define	_D3DENGINE_H_
 
 
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CD3DApplication;
@@ -683,4 +682,3 @@ protected:
 };
 
 
-#endif //_D3DENGINE_H_

src/graphics/d3d/d3denum.cpp

@@ -25,9 +25,9 @@
 #include <windowsx.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "d3denum.h"
+#include "graphics/d3d/d3denum.h"
-#include "d3dutil.h" // For DEBUG_MSG
+#include "graphics/d3d/d3dutil.h" // For DEBUG_MSG
-#include "d3dres.h"  // For dialog controls
+#include "old/d3dres.h"  // For dialog controls
 
 
 

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
-
-
-

src/graphics/d3d/d3dframe.cpp

@@ -25,8 +25,8 @@
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "d3dframe.h"
+#include "graphics/d3d/d3dframe.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
 
 
 

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
-
 

src/graphics/d3d/d3dtextr.cpp

@@ -29,10 +29,10 @@
 #define STRICT
 #include <tchar.h>
 #include <stdio.h>
-#include "d3dtextr.h"
+#include "graphics/d3d/d3dtextr.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "language.h"
+#include "common/language.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 

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

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"
 
 
 

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

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

src/math/old/math3d.cpp

@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
 
 
 

src/math/old/math3d.h

@@ -16,8 +16,7 @@
 
 // math3d.h
 
-#ifndef _MATH3D_H_
+#pragma once
-#define	_MATH3D_H_
 
 
 #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_
+

src/object/auto/auto.cpp

@@ -21,34 +21,34 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "cloud.h"
+#include "graphics/common/cloud.h"
-#include "planet.h"
+#include "graphics/common/planet.h"
-#include "blitz.h"
+#include "graphics/common/blitz.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "modfile.h"
+#include "common/modfile.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "list.h"
+#include "ui/list.h"
-#include "label.h"
+#include "ui/label.h"
-#include "gauge.h"
+#include "ui/gauge.h"
-#include "window.h"
+#include "ui/window.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "displaytext.h"
+#include "ui/displaytext.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
 
 
 

src/object/auto/auto.h

@@ -16,11 +16,10 @@
 
 // auto.h
 
-#ifndef _AUTO_H_
+#pragma once
-#define	_AUTO_H_
 
 
-#include "object.h"
+#include "object/object.h"
 
 
 class CInstanceManager;
@@ -110,5 +109,3 @@ protected:
 	float		m_progressTotal;
 };
 
-
-#endif //_AUTO_H_

src/object/auto/autobase.cpp

@@ -21,30 +21,30 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "language.h"
+#include "common/language.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "cloud.h"
+#include "graphics/common/cloud.h"
-#include "planet.h"
+#include "graphics/common/planet.h"
-#include "blitz.h"
+#include "graphics/common/blitz.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "physics.h"
+#include "physics/physics.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "displaytext.h"
+#include "ui/displaytext.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autobase.h"
+#include "object/auto/autobase.h"
 
 
 

src/object/auto/autobase.h

@@ -16,12 +16,11 @@
 
 // autobase.h
 
-#ifndef _AUTOBASE_H_
+#pragma once
-#define	_AUTOBASE_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -118,5 +117,3 @@ protected:
 	D3DCOLOR		m_bgCloudDown;
 };
 
-
-#endif //_AUTOBASE_H_

src/object/auto/autoconvert.cpp

@@ -21,26 +21,26 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "displaytext.h"
+#include "ui/displaytext.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autoconvert.h"
+#include "object/auto/autoconvert.h"
 
 
 

src/object/auto/autoconvert.h

@@ -16,12 +16,11 @@
 
 // autoconvert.h
 
-#ifndef _AUTOCONVERT_H_
+#pragma once_
-#define	_AUTOCONVERT_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -78,5 +77,3 @@ protected:
 	int					m_soundChannel;
 };
 
-
-#endif //_AUTOCONVERT_H_

src/object/auto/autoderrick.cpp

@@ -21,25 +21,25 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "displaytext.h"
+#include "ui/displaytext.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autoderrick.h"
+#include "object/auto/autoderrick.h"
 
 
 

src/object/auto/autoderrick.h

@@ -16,12 +16,11 @@
 
 // autoderrick.h
 
-#ifndef _AUTODERRICK_H_
+#pragma once
-#define	_AUTODERRICK_H_
 
 
-#include "object.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -80,5 +79,3 @@ protected:
 	BOOL				m_bSoundFall;
 };
 
-
-#endif //_AUTODERRICK_H_

src/object/auto/autodestroyer.cpp

@@ -21,28 +21,28 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "physics.h"
+#include "physics/physics.h"
-#include "pyro.h"
+#include "graphics/common/pyro.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "robotmain.h"
+#include "object/robotmain.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autodestroyer.h"
+#include "object/auto/autodestroyer.h"
 
 
 

src/object/auto/autodestroyer.h

@@ -16,11 +16,10 @@
 
 // autodestroyer.h
 
-#ifndef _AUTODESTROYER_H_
+#pragma once
-#define	_AUTODESTROYER_H_
 
 
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -72,5 +71,3 @@ protected:
 	BOOL			m_bExplo;
 };
 
-
-#endif //_AUTODESTROYER_H_

src/object/auto/autoegg.cpp

@@ -21,21 +21,21 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "pyro.h"
+#include "graphics/common/pyro.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autoegg.h"
+#include "object/auto/autoegg.h"
 
 
 

src/object/auto/autoegg.h

@@ -16,13 +16,12 @@
 
 // autoegg.h
 
-#ifndef _AUTOEGG_H_
+#pragma once
-#define	_AUTOEGG_H_
 
 
-#include "object.h"
+#include "object/object.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -79,5 +78,3 @@ protected:
 	float			m_speed;
 };
 
-
-#endif //_AUTOEGG_H_

src/object/auto/autoenergy.cpp

@@ -21,27 +21,28 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "event.h"
+#include "math/old/d3dmath.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "particule.h"
+#include "math/old/math3d.h"
-#include "light.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/light.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "graphics/common/camera.h"
-#include "interface.h"
+#include "object/object.h"
-#include "button.h"
+#include "ui/interface.h"
-#include "gauge.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/gauge.h"
-#include "displaytext.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "ui/displaytext.h"
-#include "cmdtoken.h"
+#include "sound/sound.h"
-#include "auto.h"
+#include "script/cmdtoken.h"
-#include "autoenergy.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoenergy.h"
 
 
 

src/object/auto/autoenergy.h

@@ -16,12 +16,11 @@
 
 // autoenergy.h
 
-#ifndef _AUTOENERGY_H_
+#pragma once
-#define	_AUTOENERGY_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -79,5 +78,3 @@ protected:
 	int					m_partiSphere;
 };
 
-
-#endif //_AUTOENERGY_H_

src/object/auto/autofactory.cpp

@@ -21,31 +21,32 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "restext.h"
+#include "math/old/d3dmath.h"
-#include "global.h"
+#include "common/restext.h"
-#include "event.h"
+#include "common/global.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "particule.h"
+#include "math/old/math3d.h"
-#include "light.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/light.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "graphics/common/camera.h"
-#include "physics.h"
+#include "object/object.h"
-#include "brain.h"
+#include "physics/physics.h"
-#include "interface.h"
+#include "object/brain.h"
-#include "button.h"
+#include "ui/interface.h"
-#include "window.h"
+#include "ui/button.h"
-#include "displaytext.h"
+#include "ui/window.h"
-#include "robotmain.h"
+#include "ui/displaytext.h"
-#include "sound.h"
+#include "object/robotmain.h"
-#include "cmdtoken.h"
+#include "sound/sound.h"
-#include "auto.h"
+#include "script/cmdtoken.h"
-#include "autofactory.h"
+#include "object/auto/auto.h"
+#include "object/auto/autofactory.h"
 
 
 

src/object/auto/autofactory.h

@@ -16,11 +16,10 @@
 
 // autofactory.h
 
-#ifndef _AUTOFACTORY_H_
+#pragma once
-#define	_AUTOFACTORY_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
 
 
 class CInstanceManager;
@@ -81,5 +80,3 @@ protected:
 	int					m_channelSound;
 };
 
-
-#endif //_AUTOFACTORY_H_

src/object/auto/autoflag.cpp

@@ -21,19 +21,19 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autoflag.h"
+#include "object/auto/autoflag.h"
 
 
 

src/object/auto/autoflag.h

@@ -16,12 +16,11 @@
 
 // autoflag.h
 
-#ifndef _AUTOFLAG_H_
+#pragma once
-#define	_AUTOFLAG_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -54,5 +53,3 @@ protected:
 	float		m_progress;
 };
 
-
-#endif //_AUTOFLAG_H_

src/object/auto/autohuston.cpp

@@ -21,22 +21,22 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autohuston.h"
+#include "object/auto/autohuston.h"
 
 
 

src/object/auto/autohuston.h

@@ -16,12 +16,11 @@
 
 // autohuston.h
 
-#ifndef _AUTOHUSTON_H_
+#pragma once
-#define	_AUTOHUSTON_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "particule.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -73,5 +72,3 @@ protected:
 	int			m_lensTotal;
 };
 
-
-#endif //_AUTOHUSTON_H_

src/object/auto/autoinfo.cpp

@@ -21,26 +21,26 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "list.h"
+#include "ui/list.h"
-#include "window.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autoinfo.h"
+#include "object/auto/autoinfo.h"
 
 
 

src/object/auto/autoinfo.h

@@ -16,12 +16,11 @@
 
 // autoinfo.h
 
-#ifndef _AUTOINFO_H_
+#pragma once
-#define	_AUTOINFO_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -76,5 +75,3 @@ protected:
 	BOOL			m_bLastVirus;
 };
 
-
-#endif //_AUTOINFO_H_

src/object/auto/autojostle.cpp

@@ -21,25 +21,26 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "event.h"
+#include "math/old/d3dmath.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "particule.h"
+#include "math/old/math3d.h"
-#include "light.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/light.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "graphics/common/camera.h"
-#include "interface.h"
+#include "object/object.h"
-#include "button.h"
+#include "ui/interface.h"
-#include "list.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/list.h"
-#include "sound.h"
+#include "ui/window.h"
-#include "auto.h"
+#include "sound/sound.h"
-#include "autojostle.h"
+#include "object/auto/auto.h"
+#include "object/auto/autojostle.h"
 
 
 

src/object/auto/autojostle.h

@@ -16,12 +16,11 @@
 
 // autojostle.h
 
-#ifndef _AUTOJOSTLE_H_
+#pragma once
-#define	_AUTOJOSTLE_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -56,5 +55,3 @@ protected:
 	Error			m_error;
 };
 
-
-#endif //_AUTOJOSTLE_H_

src/object/auto/autokid.cpp

@@ -21,22 +21,22 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "water.h"
+#include "graphics/common/water.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autokid.h"
+#include "object/auto/autokid.h"
 
 
 

src/object/auto/autokid.h

@@ -16,12 +16,11 @@
 
 // autokid.h
 
-#ifndef _AUTOKID_H_
+#pragma once
-#define	_AUTOKID_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -55,5 +54,3 @@ protected:
 	BOOL		m_bSilent;
 };
 
-
-#endif //_AUTOKID_H_

src/object/auto/autolabo.cpp

@@ -21,28 +21,29 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "global.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/global.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "particule.h"
+#include "math/old/math3d.h"
-#include "light.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/light.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "graphics/common/camera.h"
-#include "interface.h"
+#include "object/object.h"
-#include "button.h"
+#include "ui/interface.h"
-#include "window.h"
+#include "ui/button.h"
-#include "displaytext.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "ui/displaytext.h"
-#include "robotmain.h"
+#include "sound/sound.h"
-#include "cmdtoken.h"
+#include "object/robotmain.h"
-#include "auto.h"
+#include "script/cmdtoken.h"
-#include "autolabo.h"
+#include "object/auto/auto.h"
+#include "object/auto/autolabo.h"
 
 
 

src/object/auto/autolabo.h

@@ -16,12 +16,11 @@
 
 // autolabo.h
 
-#ifndef _AUTOLABO_H_
+#pragma once
-#define	_AUTOLABO_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -83,5 +82,3 @@ protected:
 	int					m_soundChannel;
 };
 
-
-#endif //_AUTOLABO_H_

src/object/auto/automush.cpp

@@ -21,21 +21,22 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "event.h"
+#include "math/old/d3dmath.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "particule.h"
+#include "math/old/math3d.h"
-#include "terrain.h"
+#include "graphics/common/particule.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "graphics/common/camera.h"
-#include "cmdtoken.h"
+#include "object/object.h"
-#include "sound.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "sound/sound.h"
-#include "automush.h"
+#include "object/auto/auto.h"
+#include "object/auto/automush.h"
 
 
 

src/object/auto/automush.h

@@ -16,12 +16,11 @@
 
 // automush.h
 
-#ifndef _AUTOMUSH_H_
+#pragma once
-#define	_AUTOMUSH_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -69,5 +68,3 @@ protected:
 	float			m_lastParticule;
 };
 
-
-#endif //_AUTOMUSH_H_

src/object/auto/autonest.cpp

@@ -21,20 +21,20 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autonest.h"
+#include "object/auto/autonest.h"
 
 
 

src/object/auto/autonest.h

@@ -16,12 +16,11 @@
 
 // autonest.h
 
-#ifndef _AUTONEST_H_
+#pragma once
-#define	_AUTONEST_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -69,5 +68,3 @@ protected:
 	D3DVECTOR		m_fretPos;
 };
 
-
-#endif //_AUTONEST_H_

src/object/auto/autonuclear.cpp

@@ -21,27 +21,27 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "global.h"
+#include "common/global.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "displaytext.h"
+#include "ui/displaytext.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autonuclear.h"
+#include "object/auto/autonuclear.h"
 
 
 

src/object/auto/autonuclear.h

@@ -16,12 +16,11 @@
 
 // autonuclear.h
 
-#ifndef _AUTONUCLEAR_H_
+#pragma once
-#define	_AUTONUCLEAR_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -76,5 +75,3 @@ protected:
 	int					m_channelSound;
 };
 
-
-#endif //_AUTONUCLEAR_H_

src/object/auto/autopara.cpp

@@ -21,27 +21,27 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "global.h"
+#include "common/global.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "light.h"
+#include "graphics/common/light.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "displaytext.h"
+#include "ui/displaytext.h"
-#include "cmdtoken.h"
+#include "script/cmdtoken.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autopara.h"
+#include "object/auto/autopara.h"
 
 
 

src/object/auto/autopara.h

@@ -16,12 +16,11 @@
 
 // autopara.h
 
-#ifndef _AUTOPARA_H_
+#pragma once
-#define	_AUTOPARA_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -73,5 +72,3 @@ protected:
 	int				m_channelSound;
 };
 
-
-#endif //_AUTOPARA_H_

src/object/auto/autoportico.cpp

@@ -21,25 +21,26 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "math/const.h"
-#include "d3dengine.h"
+#include "common/struct.h"
-#include "d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
-#include "event.h"
+#include "math/old/d3dmath.h"
-#include "misc.h"
+#include "common/event.h"
-#include "iman.h"
+#include "common/misc.h"
-#include "math3d.h"
+#include "common/iman.h"
-#include "particule.h"
+#include "math/old/math3d.h"
-#include "terrain.h"
+#include "graphics/common/particule.h"
-#include "camera.h"
+#include "graphics/common/terrain.h"
-#include "object.h"
+#include "graphics/common/camera.h"
-#include "interface.h"
+#include "object/object.h"
-#include "button.h"
+#include "ui/interface.h"
-#include "window.h"
+#include "ui/button.h"
-#include "displaytext.h"
+#include "ui/window.h"
-#include "robotmain.h"
+#include "ui/displaytext.h"
-#include "sound.h"
+#include "object/robotmain.h"
-#include "auto.h"
+#include "sound/sound.h"
-#include "autoportico.h"
+#include "object/auto/auto.h"
+#include "object/auto/autoportico.h"
 
 
 

src/object/auto/autoportico.h

@@ -16,12 +16,11 @@
 
 // autoportico.h
 
-#ifndef _AUTOPORTICO_H_
+#pragma once
-#define	_AUTOPORTICO_H_
 
 
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "misc.h"
+#include "common/misc.h"
 
 
 class CInstanceManager;
@@ -77,5 +76,3 @@ protected:
 	int				m_soundChannel;
 };
 
-
-#endif //_AUTOPORTICO_H_

src/object/auto/autoradar.cpp

@@ -21,24 +21,24 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
+#include "common/struct.h"
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
-#include "d3dmath.h"
+#include "math/old/d3dmath.h"
-#include "event.h"
+#include "common/event.h"
-#include "misc.h"
+#include "common/misc.h"
-#include "iman.h"
+#include "common/iman.h"
-#include "math3d.h"
+#include "math/old/math3d.h"
-#include "particule.h"
+#include "graphics/common/particule.h"
-#include "terrain.h"
+#include "graphics/common/terrain.h"
-#include "camera.h"
+#include "graphics/common/camera.h"
-#include "object.h"
+#include "object/object.h"
-#include "interface.h"
+#include "ui/interface.h"
-#include "button.h"
+#include "ui/button.h"
-#include "window.h"
+#include "ui/window.h"
-#include "gauge.h"
+#include "ui/gauge.h"
-#include "sound.h"
+#include "sound/sound.h"
-#include "auto.h"
+#include "object/auto/auto.h"
-#include "autoradar.h"
+#include "object/auto/autoradar.h"