Fixed include paths and CMakeLists.txt

Additionally, changed #ifndef to #pragma once everywhere

52 files changed, 406 insertions, 457 deletions

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_