From c0461add5f966b29de987cb04455c88377b5c5bb Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 20 Jun 2012 17:00:16 +0200 Subject: Refactoring of #includes and forward declarations in object/ --- src/object/auto/auto.cpp | 30 ++++-------------------------- src/object/auto/auto.h | 1 - src/object/auto/autobase.cpp | 22 ++++------------------ src/object/auto/autobase.h | 8 -------- src/object/auto/autoconvert.cpp | 23 ++++------------------- src/object/auto/autoconvert.h | 9 --------- src/object/auto/autoderrick.cpp | 22 +++++----------------- src/object/auto/autoderrick.h | 10 ---------- src/object/auto/autodestroyer.cpp | 24 +++--------------------- src/object/auto/autodestroyer.h | 9 --------- src/object/auto/autoegg.cpp | 18 +++--------------- src/object/auto/autoegg.h | 11 ----------- src/object/auto/autoenergy.cpp | 23 ++++------------------- src/object/auto/autoenergy.h | 9 --------- src/object/auto/autofactory.cpp | 29 ++++++----------------------- src/object/auto/autofactory.h | 8 -------- src/object/auto/autoflag.cpp | 16 ++-------------- src/object/auto/autoflag.h | 9 --------- src/object/auto/autohuston.cpp | 20 +++----------------- src/object/auto/autohuston.h | 9 --------- src/object/auto/autoinfo.cpp | 25 +++++-------------------- src/object/auto/autoinfo.h | 9 --------- src/object/auto/autojostle.cpp | 23 +---------------------- src/object/auto/autojostle.h | 9 --------- src/object/auto/autokid.cpp | 21 +++------------------ src/object/auto/autokid.h | 9 --------- src/object/auto/autolabo.cpp | 26 +++++--------------------- src/object/auto/autolabo.h | 9 --------- src/object/auto/automush.cpp | 20 +++----------------- src/object/auto/automush.h | 9 --------- src/object/auto/autonest.cpp | 15 ++------------- src/object/auto/autonest.h | 9 --------- src/object/auto/autonuclear.cpp | 24 ++++-------------------- src/object/auto/autonuclear.h | 9 --------- src/object/auto/autopara.cpp | 26 +++++--------------------- src/object/auto/autopara.h | 9 --------- src/object/auto/autoportico.cpp | 27 +++++---------------------- src/object/auto/autoportico.h | 9 --------- src/object/auto/autoradar.cpp | 22 +++------------------- src/object/auto/autoradar.h | 9 --------- src/object/auto/autorepair.cpp | 27 ++++----------------------- src/object/auto/autorepair.h | 9 --------- src/object/auto/autoresearch.cpp | 28 ++++++---------------------- src/object/auto/autoresearch.h | 9 --------- src/object/auto/autoroot.cpp | 17 +++-------------- src/object/auto/autoroot.h | 9 --------- src/object/auto/autosafe.cpp | 30 +++++------------------------- src/object/auto/autosafe.h | 9 --------- src/object/auto/autostation.cpp | 19 +++---------------- src/object/auto/autostation.h | 9 --------- src/object/auto/autotower.cpp | 29 ++++++----------------------- src/object/auto/autotower.h | 9 --------- 52 files changed, 101 insertions(+), 732 deletions(-) (limited to 'src/object/auto') diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 7440584..9635265 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -15,38 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/auto.h" + + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/water.h" -#include "graphics/common/cloud.h" -#include "graphics/common/planet.h" -#include "graphics/common/blitz.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "common/modfile.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" -#include "ui/list.h" -#include "ui/label.h" #include "ui/gauge.h" #include "ui/window.h" -#include "object/robotmain.h" -#include "ui/displaytext.h" -#include "sound/sound.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index 68fcacb..3928d28 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -33,7 +33,6 @@ class CCloud; class CPlanet; class CBlitz; class CCamera; -class CObject; class CInterface; class CRobotMain; class CDisplayText; diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index abd231f..277ed71 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -15,35 +15,21 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/language.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autobase.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" #include "graphics/common/terrain.h" #include "graphics/common/cloud.h" #include "graphics/common/planet.h" #include "graphics/common/blitz.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "object/robotmain.h" #include "physics/physics.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" #include "ui/displaytext.h" -#include "object/robotmain.h" -#include "sound/sound.h" -#include "object/auto/auto.h" -#include "object/auto/autobase.h" diff --git a/src/object/auto/autobase.h b/src/object/auto/autobase.h index aed5a47..0f71ef6 100644 --- a/src/object/auto/autobase.h +++ b/src/object/auto/autobase.h @@ -20,16 +20,8 @@ #include "object/auto/auto.h" -#include "common/misc.h" -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; - enum AutoBaseParam { diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index ef5fbb1..ffe7d59 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -15,31 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autoconvert.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "sound/sound.h" #include "ui/displaytext.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autoconvert.h" diff --git a/src/object/auto/autoconvert.h b/src/object/auto/autoconvert.h index 10d829c..b907c3a 100644 --- a/src/object/auto/autoconvert.h +++ b/src/object/auto/autoconvert.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 3e33466..8360639 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -15,30 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autoderrick.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" #include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "sound/sound.h" #include "ui/displaytext.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autoderrick.h" + diff --git a/src/object/auto/autoderrick.h b/src/object/auto/autoderrick.h index fb39bc3..e211c0f 100644 --- a/src/object/auto/autoderrick.h +++ b/src/object/auto/autoderrick.h @@ -20,16 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; - diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index 76648f1..f1f018c 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -15,32 +15,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autodestroyer.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "physics/physics.h" -#include "graphics/common/pyro.h" -#include "sound/sound.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "object/robotmain.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autodestroyer.h" diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h index 521273f..a233b88 100644 --- a/src/object/auto/autodestroyer.h +++ b/src/object/auto/autodestroyer.h @@ -19,18 +19,9 @@ #pragma once -#include "common/misc.h" #include "object/auto/auto.h" -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; - - enum AutoDestroyerPhase { diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 56a2899..773718c 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -15,26 +15,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" +#include "object/auto/autoegg.h" + #include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "graphics/common/pyro.h" #include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autoegg.h" + diff --git a/src/object/auto/autoegg.h b/src/object/auto/autoegg.h index d9a749f..fcdf760 100644 --- a/src/object/auto/autoegg.h +++ b/src/object/auto/autoegg.h @@ -19,18 +19,7 @@ #pragma once -#include "object/object.h" #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; - enum AutoEggPhase diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index 351db83..90f19ba 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -15,33 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "math/const.h" -#include "math/geometry.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autoenergy.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" #include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/gauge.h" #include "ui/window.h" #include "ui/displaytext.h" -#include "sound/sound.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autoenergy.h" diff --git a/src/object/auto/autoenergy.h b/src/object/auto/autoenergy.h index f9f096e..300ee45 100644 --- a/src/object/auto/autoenergy.h +++ b/src/object/auto/autoenergy.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index f552440..be5a189 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -15,37 +15,20 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "math/const.h" -#include "math/geometry.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/restext.h" +#include "object/auto/autofactory.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/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "object/robotmain.h" #include "physics/physics.h" -#include "object/brain.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" #include "ui/displaytext.h" -#include "object/robotmain.h" -#include "sound/sound.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autofactory.h" + diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h index 30692c8..d41dd62 100644 --- a/src/object/auto/autofactory.h +++ b/src/object/auto/autofactory.h @@ -22,14 +22,6 @@ #include "object/auto/auto.h" -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; - - enum AutoFactoryPhase { diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index b6497eb..c062d84 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -15,24 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" +#include "object/auto/autoflag.h" + #include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" #include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "object/auto/auto.h" -#include "object/auto/autoflag.h" diff --git a/src/object/auto/autoflag.h b/src/object/auto/autoflag.h index c52a25a..b503363 100644 --- a/src/object/auto/autoflag.h +++ b/src/object/auto/autoflag.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp index 256d394..3495437 100644 --- a/src/object/auto/autohuston.cpp +++ b/src/object/auto/autohuston.cpp @@ -15,26 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" + +#include "object/auto/autohuston.h" + #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "object/auto/auto.h" -#include "object/auto/autohuston.h" diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h index 4e79a9c..68c9cdf 100644 --- a/src/object/auto/autohuston.h +++ b/src/object/auto/autohuston.h @@ -20,18 +20,9 @@ #include "object/auto/auto.h" -#include "common/misc.h" #include "graphics/common/particule.h" -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; - - struct HustonLens { diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp index 783dd56..6e00d44 100644 --- a/src/object/auto/autoinfo.cpp +++ b/src/object/auto/autoinfo.cpp @@ -15,30 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" + +#include "object/auto/autoinfo.h" + +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/list.h" #include "ui/window.h" -#include "sound/sound.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autoinfo.h" + diff --git a/src/object/auto/autoinfo.h b/src/object/auto/autoinfo.h index 7596c41..cf3d1d4 100644 --- a/src/object/auto/autoinfo.h +++ b/src/object/auto/autoinfo.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp index c2e3eea..6917ae7 100644 --- a/src/object/auto/autojostle.cpp +++ b/src/object/auto/autojostle.cpp @@ -15,29 +15,8 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "math/const.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "ui/interface.h" -#include "ui/button.h" -#include "ui/list.h" -#include "ui/window.h" -#include "sound/sound.h" -#include "object/auto/auto.h" + #include "object/auto/autojostle.h" diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h index c3a1bd8..c76f953 100644 --- a/src/object/auto/autojostle.h +++ b/src/object/auto/autojostle.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index f2f90b3..c96cc44 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -15,27 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.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 "sound/sound.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" + #include "object/auto/autokid.h" +#include "graphics/common/particule.h" +#include "graphics/common/water.h" diff --git a/src/object/auto/autokid.h b/src/object/auto/autokid.h index 677d1f0..900eb92 100644 --- a/src/object/auto/autokid.h +++ b/src/object/auto/autokid.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 828e1c2..b675581 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -15,34 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/const.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" +#include "object/auto/autolabo.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/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "object/robotmain.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" #include "ui/displaytext.h" -#include "sound/sound.h" -#include "object/robotmain.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autolabo.h" diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 53faa0a..d94eb9e 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index 90dc13a..366dbb5 100644 --- a/src/object/auto/automush.cpp +++ b/src/object/auto/automush.cpp @@ -15,26 +15,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "math/const.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" + +#include "object/auto/automush.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" #include "script/cmdtoken.h" -#include "sound/sound.h" -#include "object/auto/auto.h" -#include "object/auto/automush.h" diff --git a/src/object/auto/automush.h b/src/object/auto/automush.h index 62bd322..5c8d62d 100644 --- a/src/object/auto/automush.h +++ b/src/object/auto/automush.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 3644318..4405377 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -15,24 +15,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autonest.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" #include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" #include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autonest.h" diff --git a/src/object/auto/autonest.h b/src/object/auto/autonest.h index faf9235..e697a3b 100644 --- a/src/object/auto/autonest.h +++ b/src/object/auto/autonest.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp index 8b9ff36..435bfc6 100644 --- a/src/object/auto/autonuclear.cpp +++ b/src/object/auto/autonuclear.cpp @@ -15,32 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/global.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autonuclear.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "sound/sound.h" #include "ui/displaytext.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autonuclear.h" diff --git a/src/object/auto/autonuclear.h b/src/object/auto/autonuclear.h index df34601..3054887 100644 --- a/src/object/auto/autonuclear.h +++ b/src/object/auto/autonuclear.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp index 568156b..31e214d 100644 --- a/src/object/auto/autopara.cpp +++ b/src/object/auto/autopara.cpp @@ -15,32 +15,16 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/global.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autopara.h" + + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "sound/sound.h" -#include "ui/displaytext.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autopara.h" diff --git a/src/object/auto/autopara.h b/src/object/auto/autopara.h index 6878c42..e28aa47 100644 --- a/src/object/auto/autopara.h +++ b/src/object/auto/autopara.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 388bfcc..ee3376f 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -15,32 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "math/const.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "ui/interface.h" -#include "ui/button.h" -#include "ui/window.h" -#include "ui/displaytext.h" -#include "object/robotmain.h" -#include "sound/sound.h" -#include "object/auto/auto.h" + #include "object/auto/autoportico.h" +#include "object/robotmain.h" + + + const int PARAM_DEPOSE = 2; // run=2 -> deposits the spaceship diff --git a/src/object/auto/autoportico.h b/src/object/auto/autoportico.h index c6ce6d7..566c358 100644 --- a/src/object/auto/autoportico.h +++ b/src/object/auto/autoportico.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 0f91d08..b8bee44 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -15,31 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autoradar.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" #include "ui/gauge.h" -#include "sound/sound.h" -#include "object/auto/auto.h" -#include "object/auto/autoradar.h" - - // Object's constructor. diff --git a/src/object/auto/autoradar.h b/src/object/auto/autoradar.h index 9681789..5a5020b 100644 --- a/src/object/auto/autoradar.h +++ b/src/object/auto/autoradar.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index fdfb072..b56f771 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -15,34 +15,15 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include - -#include "math/const.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" + +#include "object/auto/autorepair.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" #include "physics/physics.h" -#include "sound/sound.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/window.h" -#include "object/robotmain.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autorepair.h" - - // Object's constructor. diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h index 6d52c7a..1178529 100644 --- a/src/object/auto/autorepair.h +++ b/src/object/auto/autorepair.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index 07c64c1..abf228c 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -15,38 +15,22 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "math/const.h" -#include "math/geometry.h" -#include "common/struct.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" +#include "object/auto/autoresearch.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/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" +#include "object/robotmain.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/gauge.h" #include "ui/window.h" #include "ui/displaytext.h" -#include "sound/sound.h" -#include "object/robotmain.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autoresearch.h" -#define SEARCH_TIME 30.0f // duration of a research +const float SEARCH_TIME = 30.0f; // duration of a research diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h index 6a43570..c36edd6 100644 --- a/src/object/auto/autoresearch.h +++ b/src/object/auto/autoresearch.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index df7f0cb..ad87175 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -15,24 +15,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "math/old/math3d.h" +#include "object/auto/autoroot.h" + #include "graphics/common/particule.h" #include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "object/auto/auto.h" -#include "object/auto/autoroot.h" +#include "math/geometry.h" diff --git a/src/object/auto/autoroot.h b/src/object/auto/autoroot.h index 8e2a279..8bf397d 100644 --- a/src/object/auto/autoroot.h +++ b/src/object/auto/autoroot.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp index 97434f9..6965851 100644 --- a/src/object/auto/autosafe.cpp +++ b/src/object/auto/autosafe.cpp @@ -15,41 +15,21 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/global.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autosafe.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/light.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" -#include "ui/interface.h" -#include "ui/button.h" +#include "math/geometry.h" #include "object/robotmain.h" -#include "ui/window.h" -#include "sound/sound.h" -#include "ui/displaytext.h" #include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autosafe.h" - +#include "ui/interface.h" +#include "ui/window.h" const float OPEN_DELAY = 8.0f; // duration of opening - - // Object's constructor. CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object) diff --git a/src/object/auto/autosafe.h b/src/object/auto/autosafe.h index 083f06b..4194349 100644 --- a/src/object/auto/autosafe.h +++ b/src/object/auto/autosafe.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 9ec48d5..9858ba9 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -15,30 +15,17 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autostation.h" + #include "common/iman.h" -#include "math/old/math3d.h" #include "graphics/common/particule.h" -#include "graphics/common/light.h" #include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" #include "ui/interface.h" -#include "ui/button.h" #include "ui/gauge.h" #include "ui/window.h" -#include "sound/sound.h" -#include "object/auto/auto.h" -#include "object/auto/autostation.h" diff --git a/src/object/auto/autostation.h b/src/object/auto/autostation.h index f2b50a8..b4584f2 100644 --- a/src/object/auto/autostation.h +++ b/src/object/auto/autostation.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 227a1e9..ec92341 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -15,35 +15,18 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include #include -#include -#include "common/struct.h" -#include "math/const.h" -#include "math/geometry.h" -#include "graphics/d3d/d3dengine.h" -#include "math/old/d3dmath.h" -#include "common/global.h" -#include "common/event.h" -#include "common/misc.h" +#include "object/auto/autotower.h" + #include "common/iman.h" -#include "math/old/math3d.h" -#include "graphics/common/particule.h" -#include "graphics/common/terrain.h" -#include "graphics/common/camera.h" -#include "object/object.h" +#include "math/geometry.h" #include "physics/physics.h" +#include "script/cmdtoken.h" #include "ui/interface.h" -#include "ui/button.h" -#include "ui/gauge.h" -#include "ui/window.h" -#include "sound/sound.h" #include "ui/displaytext.h" -#include "script/cmdtoken.h" -#include "object/auto/auto.h" -#include "object/auto/autotower.h" - +#include "ui/window.h" +#include "ui/gauge.h" const float TOWER_SCOPE = 200.0f; // range of beam diff --git a/src/object/auto/autotower.h b/src/object/auto/autotower.h index 57b941d..b64ad3d 100644 --- a/src/object/auto/autotower.h +++ b/src/object/auto/autotower.h @@ -20,15 +20,6 @@ #include "object/auto/auto.h" -#include "common/misc.h" - - -class CInstanceManager; -class CD3DEngine; -class CParticule; -class CTerrain; -class CCamera; -class CObject; -- cgit v1.2.3-1-g7c22