diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 00:18:08 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 00:18:08 +0200 |
| commit | 680af178196217bdd255d2bc851f240983144ac1 (patch) | |
| tree | 77d713bace78c1becb1c96a2b36dd09e44d8d330 /src/physics | |
| parent | d6525b5661c364a46514aaa772c090ecb0bfd26c (diff) | |
| download | colobot-680af178196217bdd255d2bc851f240983144ac1.tar.gz colobot-680af178196217bdd255d2bc851f240983144ac1.tar.bz2 colobot-680af178196217bdd255d2bc851f240983144ac1.zip | |
Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
Diffstat (limited to 'src/physics')
| -rw-r--r-- | src/physics/physics.cpp | 46 | ||||
| -rw-r--r-- | src/physics/physics.h | 8 |
2 files changed, 26 insertions, 28 deletions
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index beae37e..bc73c74 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -23,29 +23,29 @@ #include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "light.h"
-#include "particule.h"
-#include "terrain.h"
-#include "water.h"
-#include "camera.h"
-#include "object.h"
-#include "pyro.h"
-#include "brain.h"
-#include "motion.h"
-#include "motionhuman.h"
-#include "sound.h"
-#include "task.h"
-#include "cmdtoken.h"
-#include "physics.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "graphics/common/light.h"
+#include "graphics/common/particule.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "graphics/common/pyro.h"
+#include "object/brain.h"
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "sound/sound.h"
+#include "object/task/task.h"
+#include "script/cmdtoken.h"
+#include "physics/physics.h"
diff --git a/src/physics/physics.h b/src/physics/physics.h index 72f0c20..aa14a71 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -16,12 +16,11 @@ // physics.h
-#ifndef _PHYSICS_H_
-#define _PHYSICS_H_
+#pragma once
-#include "d3dengine.h"
-#include "misc.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/misc.h"
class CInstanceManager;
@@ -245,4 +244,3 @@ protected: };
-#endif //_PHYSICS_H_
|