diff options
Diffstat (limited to 'src/object')
36 files changed, 90 insertions, 90 deletions
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index 277ed71..a13232f 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -20,10 +20,10 @@ #include "object/auto/autobase.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/cloud.h"
-#include "graphics/common/planet.h"
-#include "graphics/common/blitz.h"
+#include "old/terrain.h"
+#include "old/cloud.h"
+#include "old/planet.h"
+#include "old/blitz.h"
#include "math/geometry.h"
#include "object/robotmain.h"
#include "physics/physics.h"
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 8360639..fa7cff9 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -20,7 +20,7 @@ #include "object/auto/autoderrick.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
+#include "old/terrain.h"
#include "math/geometry.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index 90f19ba..74db234 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -20,7 +20,7 @@ #include "object/auto/autoenergy.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
+#include "old/terrain.h"
#include "math/geometry.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index c062d84..2c9ebdc 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -20,7 +20,7 @@ #include "object/auto/autoflag.h"
#include "math/geometry.h"
-#include "graphics/common/terrain.h"
+#include "old/terrain.h"
diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h index 68c9cdf..a12c4f2 100644 --- a/src/object/auto/autohuston.h +++ b/src/object/auto/autohuston.h @@ -20,7 +20,7 @@ #include "object/auto/auto.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index c96cc44..9177aa8 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -19,8 +19,8 @@ #include "object/auto/autokid.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/water.h"
+#include "old/particule.h"
+#include "old/water.h"
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 4405377..a1fdf67 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -20,7 +20,7 @@ #include "object/auto/autonest.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
+#include "old/terrain.h"
#include "script/cmdtoken.h"
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index ad87175..cd3435e 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -19,8 +19,8 @@ #include "object/auto/autoroot.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "math/geometry.h"
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 9858ba9..ddd5888 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -20,8 +20,8 @@ #include "object/auto/autostation.h"
#include "common/iman.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "math/geometry.h"
#include "ui/interface.h"
#include "ui/gauge.h"
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index e3bbfa8..1ffe1b5 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -23,24 +23,24 @@ #include "common/struct.h"
#include "math/geometry.h"
#include "math/const.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/language.h"
#include "common/global.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "object/robotmain.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "graphics/common/camera.h"
+#include "old/terrain.h"
+#include "old/water.h"
+#include "old/camera.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/motion/motion.h"
#include "object/motion/motionspider.h"
-#include "graphics/common/pyro.h"
+#include "old/pyro.h"
#include "object/task/taskmanager.h"
#include "object/task/task.h"
#include "object/task/taskmanip.h"
@@ -61,9 +61,9 @@ #include "ui/target.h"
#include "ui/window.h"
#include "ui/displaytext.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "sound/sound.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "script/cmdtoken.h"
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index 47d2cca..7c01c8a 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -22,7 +22,7 @@ #include "object/motion/motionant.h"
#include "common/modfile.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "physics/physics.h"
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index d60b1d4..3b04378 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -22,8 +22,8 @@ #include "object/motion/motionhuman.h"
#include "common/modfile.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
+#include "old/terrain.h"
+#include "old/water.h"
#include "math/geometry.h"
#include "object/robotmain.h"
#include "physics/physics.h"
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index 2e0aa0f..93ba7e6 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -22,7 +22,7 @@ #include "object/motion/motionspider.h"
#include "common/modfile.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "physics/physics.h"
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 3fa3aba..d6a8f6b 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -22,8 +22,8 @@ #include "object/motion/motiontoto.h"
#include "math/geometry.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
+#include "old/terrain.h"
+#include "old/water.h"
#include "common/modfile.h"
#include "object/robotmain.h"
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 181426c..d4e3007 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -22,8 +22,8 @@ #include "object/motion/motionvehicle.h"
#include "common/modfile.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "math/geometry.h"
#include "object/brain.h"
#include "physics/physics.h"
diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index bf1871f..8409fc6 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -22,8 +22,8 @@ #include "object/motion/motionworm.h"
#include "common/modfile.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "math/geometry.h"
#include "physics/physics.h"
diff --git a/src/object/object.cpp b/src/object/object.cpp index 360224e..e6c2663 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -25,23 +25,23 @@ #include "common/struct.h"
#include "math/const.h"
#include "math/geometry.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
-#include "graphics/d3d/d3dutil.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
+#include "old/d3dutil.h"
#include "common/global.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "math/old/math3d.h"
+#include "old/math3d.h"
#include "object/mainmovie.h"
#include "object/robotmain.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "graphics/common/blitz.h"
-#include "graphics/common/camera.h"
-#include "graphics/common/particule.h"
+#include "old/light.h"
+#include "old/terrain.h"
+#include "old/water.h"
+#include "old/blitz.h"
+#include "old/camera.h"
+#include "old/particule.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "object/motion/motion.h"
@@ -81,7 +81,7 @@ #include "object/auto/automush.h"
#include "object/auto/autokid.h"
#include "object/task/task.h"
-#include "graphics/common/pyro.h"
+#include "old/pyro.h"
#include "ui/displaytext.h"
#include "script/cmdtoken.h"
#include "script/cbottoken.h"
diff --git a/src/object/object.h b/src/object/object.h index 5b3cbf6..9d77ae1 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -19,8 +19,8 @@ #pragma once
-#include "graphics/d3d/d3dengine.h"
-#include "graphics/common/camera.h"
+#include "old/d3dengine.h"
+#include "old/camera.h"
#include "sound/sound.h"
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 6b40570..66a613e 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -26,8 +26,8 @@ #include "math/const.h"
#include "math/geometry.h"
#include "math/conv.h"
-#include "graphics/d3d/d3dengine.h"
-#include "math/old/d3dmath.h"
+#include "old/d3dengine.h"
+#include "old/d3dmath.h"
#include "common/language.h"
#include "common/global.h"
#include "common/event.h"
@@ -35,24 +35,24 @@ #include "common/profile.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "math/old/math3d.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
-#include "graphics/common/cloud.h"
-#include "graphics/common/blitz.h"
-#include "graphics/common/planet.h"
+#include "old/math3d.h"
+#include "old/light.h"
+#include "old/particule.h"
+#include "old/terrain.h"
+#include "old/water.h"
+#include "old/cloud.h"
+#include "old/blitz.h"
+#include "old/planet.h"
#include "object/object.h"
#include "object/motion/motion.h"
#include "object/motion/motiontoto.h"
#include "object/motion/motionhuman.h"
#include "physics/physics.h"
#include "object/brain.h"
-#include "graphics/common/pyro.h"
+#include "old/pyro.h"
#include "common/modfile.h"
-#include "graphics/common/model.h"
-#include "graphics/common/camera.h"
+#include "old/model.h"
+#include "old/camera.h"
#include "object/task/task.h"
#include "object/task/taskmanip.h"
#include "object/task/taskbuild.h"
@@ -68,7 +68,7 @@ #include "ui/window.h"
#include "ui/edit.h"
#include "ui/displaytext.h"
-#include "graphics/common/text.h"
+#include "old/text.h"
#include "sound/sound.h"
#include "script/cbottoken.h"
#include "script/cmdtoken.h"
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 5dde5c8..a4b0489 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -22,11 +22,11 @@ #include <stdio.h>
#include "common/misc.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
#include "object/object.h"
#include "object/mainmovie.h"
-#include "graphics/common/camera.h"
-#include "graphics/common/particule.h"
+#include "old/camera.h"
+#include "old/particule.h"
enum Phase
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 6be7852..f9d6c57 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -22,9 +22,9 @@ #include "object/task/taskbuild.h"
#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
+#include "old/light.h"
+#include "old/terrain.h"
+#include "old/water.h"
#include "math/geometry.h"
#include "object/auto/auto.h"
#include "object/motion/motionhuman.h"
diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index c319dd1..4bab31e 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -21,7 +21,7 @@ #include "object/task/taskfire.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "math/geometry.h"
#include "physics/physics.h"
diff --git a/src/object/task/taskfireant.cpp b/src/object/task/taskfireant.cpp index 1e50851..d4a8a61 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -21,7 +21,7 @@ #include "object/task/taskfireant.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "math/geometry.h"
#include "object/motion/motionant.h"
#include "physics/physics.h"
diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index fc28a6f..f76fef6 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -23,8 +23,8 @@ #include "math/geometry.h"
#include "common/iman.h"
-#include "graphics/common/water.h"
-#include "graphics/common/pyro.h"
+#include "old/water.h"
+#include "old/pyro.h"
#include "physics/physics.h"
#include "object/motion/motionhuman.h"
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 6648f97..5ab248c 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -23,8 +23,8 @@ #include "common/event.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
+#include "old/terrain.h"
+#include "old/water.h"
#include "math/geometry.h"
#include "physics/physics.h"
diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 9e9cd24..cfcbe93 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -22,7 +22,7 @@ #include "object/task/taskinfo.h"
#include "common/iman.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "object/auto/autoinfo.h"
diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 827fb0f..636031b 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -22,8 +22,8 @@ #include "object/task/taskmanip.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/pyro.h"
+#include "old/terrain.h"
+#include "old/pyro.h"
#include "math/geometry.h"
#include "object/robotmain.h"
#include "physics/physics.h"
diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 0e817d1..ff2f4e0 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -21,7 +21,7 @@ #include "object/task/taskpen.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "math/geometry.h"
#include "object/object.h"
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 54f3f46..d91c45d 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -23,7 +23,7 @@ #include "math/geometry.h"
#include "common/iman.h"
-#include "graphics/common/particule.h"
+#include "old/particule.h"
#include "physics/physics.h"
#include "ui/displaytext.h"
diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 09b54a0..cf038aa 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -23,8 +23,8 @@ #include "math/geometry.h"
#include "common/iman.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "physics/physics.h"
#include "ui/displaytext.h"
diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 0358a31..7ceb03b 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -22,8 +22,8 @@ #include "object/task/taskshield.h"
#include "common/iman.h"
-#include "graphics/common/light.h"
-#include "graphics/common/particule.h"
+#include "old/light.h"
+#include "old/particule.h"
#include "math/geometry.h"
#include "object/brain.h"
#include "physics/physics.h"
diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index 24abe08..2d6c846 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -21,7 +21,7 @@ #include "object/task/taskspiderexplo.h"
-#include "graphics/common/pyro.h"
+#include "old/pyro.h"
#include "object/motion/motionspider.h"
#include "physics/physics.h"
diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 6f1640a..b6d9e0e 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -22,8 +22,8 @@ #include "object/task/tasktake.h"
#include "common/iman.h"
-#include "graphics/common/terrain.h"
-#include "graphics/common/water.h"
+#include "old/terrain.h"
+#include "old/water.h"
#include "math/geometry.h"
#include "object/motion/motionhuman.h"
#include "object/robotmain.h"
diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 4a7dacc..58cf347 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -23,10 +23,10 @@ #include "math/geometry.h"
#include "common/iman.h"
-#include "graphics/common/particule.h"
-#include "graphics/common/terrain.h"
+#include "old/particule.h"
+#include "old/terrain.h"
#include "physics/physics.h"
-#include "graphics/common/pyro.h"
+#include "old/pyro.h"
#include "object/brain.h"
#include "object/motion/motionant.h"
#include "object/motion/motionspider.h"
diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index a169700..d29cdaa 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -21,7 +21,7 @@ #include "object/task/taskturn.h"
-#include "graphics/common/terrain.h"
+#include "old/terrain.h"
#include "physics/physics.h"
diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index 6270b00..f501405 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -21,7 +21,7 @@ #include "object/task/taskwait.h"
-#include "graphics/d3d/d3dengine.h"
+#include "old/d3dengine.h"
|