10 files changed, 47 insertions, 55 deletions
diff --git a/src/graphics/d3d/d3dengine.cpp b/src/graphics/d3d/d3dengine.cpp
index bbfb89e..12cf4ea 100644
--- a/src/graphics/d3d/d3dengine.cpp
+++ b/src/graphics/d3d/d3dengine.cpp
@@ -14,7 +14,7 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// D3DEngine.cpp
+// d3dengine.cpp
 
 #define STRICT
 #define D3D_OVERLOADS
@@ -22,28 +22,28 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "struct.h"
-#include "d3dapp.h"
-#include "d3dtextr.h"
-#include "d3dutil.h"
-#include "d3dmath.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "iman.h"
-#include "event.h"
-#include "profile.h"
-#include "math3d.h"
-#include "object.h"
-#include "interface.h"
-#include "light.h"
-#include "text.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "cloud.h"
-#include "blitz.h"
-#include "planet.h"
-#include "sound.h"
+#include "common/struct.h"
+#include "app/d3dapp.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dutil.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/iman.h"
+#include "common/event.h"
+#include "common/profile.h"
+#include "math/old/math3d.h"
+#include "object/object.h"
+#include "ui/interface.h"
+#include "graphics/common/light.h"
+#include "graphics/common/text.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "graphics/common/cloud.h"
+#include "graphics/common/blitz.h"
+#include "graphics/common/planet.h"
+#include "sound/sound.h"
 
 
 
diff --git a/src/graphics/d3d/d3dengine.h b/src/graphics/d3d/d3dengine.h
index a99db93..12e0fdb 100644
--- a/src/graphics/d3d/d3dengine.h
+++ b/src/graphics/d3d/d3dengine.h
@@ -16,11 +16,10 @@
 
 // d3dengine.h
 
-#ifndef _D3DENGINE_H_
-#define	_D3DENGINE_H_
+#pragma once
 
 
-#include "struct.h"
+#include "common/struct.h"
 
 
 class CD3DApplication;
@@ -683,4 +682,3 @@ protected:
 };
 
 
-#endif //_D3DENGINE_H_
diff --git a/src/graphics/d3d/d3denum.cpp b/src/graphics/d3d/d3denum.cpp
index 46497d8..c163bb8 100644
--- a/src/graphics/d3d/d3denum.cpp
+++ b/src/graphics/d3d/d3denum.cpp
@@ -25,9 +25,9 @@
 #include <windowsx.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "d3denum.h"
-#include "d3dutil.h" // For DEBUG_MSG
-#include "d3dres.h"  // For dialog controls
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dutil.h" // For DEBUG_MSG
+#include "old/d3dres.h"  // For dialog controls
 
 
 
diff --git a/src/graphics/d3d/d3denum.h b/src/graphics/d3d/d3denum.h
index e728ffb..0086d57 100644
--- a/src/graphics/d3d/d3denum.h
+++ b/src/graphics/d3d/d3denum.h
@@ -21,8 +21,9 @@
 //
 // Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
 //-----------------------------------------------------------------------------
-#ifndef D3DENUM_H
-#define D3DENUM_H
+
+#pragma once
+
 #include <d3d.h>
 
 
@@ -130,7 +131,3 @@ HRESULT D3DEnum_UserChangeDevice( D3DEnum_DeviceInfo** ppDevice );
 
 
 
-#endif // D3DENUM_H
-
-
-
diff --git a/src/graphics/d3d/d3dframe.cpp b/src/graphics/d3d/d3dframe.cpp
index 3207a4b..73c0569 100644
--- a/src/graphics/d3d/d3dframe.cpp
+++ b/src/graphics/d3d/d3dframe.cpp
@@ -25,8 +25,8 @@
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "d3dframe.h"
-#include "d3dutil.h"
+#include "graphics/d3d/d3dframe.h"
+#include "graphics/d3d/d3dutil.h"
 
 
 
diff --git a/src/graphics/d3d/d3dframe.h b/src/graphics/d3d/d3dframe.h
index 8e41b83..2a6f902 100644
--- a/src/graphics/d3d/d3dframe.h
+++ b/src/graphics/d3d/d3dframe.h
@@ -34,8 +34,9 @@
 //
 // Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
 //-----------------------------------------------------------------------------
-#ifndef D3DFRAME_H
-#define D3DFRAME_H
+
+#pragma once
+
 #include <ddraw.h>
 #include <d3d.h>
 
@@ -137,6 +138,4 @@ public:
 #define D3DFWERR_NOTINITIALIZED       0x8200000f
 
 
-#endif // D3DFRAME_H
-
 
diff --git a/src/graphics/d3d/d3dtextr.cpp b/src/graphics/d3d/d3dtextr.cpp
index cceab99..6122029 100644
--- a/src/graphics/d3d/d3dtextr.cpp
+++ b/src/graphics/d3d/d3dtextr.cpp
@@ -29,10 +29,10 @@
 #define STRICT
 #include <tchar.h>
 #include <stdio.h>
-#include "d3dtextr.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "misc.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/misc.h"
 
 
 
diff --git a/src/graphics/d3d/d3dtextr.h b/src/graphics/d3d/d3dtextr.h
index 54a79bb..0e43fd2 100644
--- a/src/graphics/d3d/d3dtextr.h
+++ b/src/graphics/d3d/d3dtextr.h
@@ -26,8 +26,9 @@
 //
 // Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
 //-----------------------------------------------------------------------------
-#ifndef D3DTEXTR_H
-#define D3DTEXTR_H
+
+#pragma once
+
 #include <ddraw.h>
 #include <d3d.h>
 
@@ -76,5 +77,3 @@ VOID    D3DTextr_SetTexturePath( TCHAR* strTexturePath );
 void	D3DTextr_SetDebugMode(BOOL bDebug);
 
 
-
-#endif // D3DTEXTR_H
diff --git a/src/graphics/d3d/d3dutil.cpp b/src/graphics/d3d/d3dutil.cpp
index b4a0eb7..65c3541 100644
--- a/src/graphics/d3d/d3dutil.cpp
+++ b/src/graphics/d3d/d3dutil.cpp
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "d3dutil.h"
+#include "graphics/d3d/d3dutil.h"
 
 
 
diff --git a/src/graphics/d3d/d3dutil.h b/src/graphics/d3d/d3dutil.h
index 494722d..8fe88c9 100644
--- a/src/graphics/d3d/d3dutil.h
+++ b/src/graphics/d3d/d3dutil.h
@@ -21,8 +21,9 @@
 //
 // Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved
 //-----------------------------------------------------------------------------
-#ifndef D3DUTIL_H
-#define D3DUTIL_H
+
+#pragma once
+
 #include <ddraw.h>
 #include <d3d.h>
 
@@ -110,5 +111,3 @@ HRESULT _DbgOut( TCHAR*, DWORD, HRESULT, TCHAR* );
 
 
 
-
-#endif // D3DUTIL_H