immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring of #includes and forward declarations in object/

dev-ui
Piotr Dziwinski 2012-06-20 17:00:16 +02:00
parent 918f677ae8
commit c0461add5f
116 changed files with 252 additions and 1483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/object/auto/auto.cpp
View File

@ -15,38 +15,16 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/auto/auto.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/d3dmath.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "math/old/math3d.h" #include "script/cmdtoken.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 "ui/interface.h" #include "ui/interface.h"
#include "ui/button.h"
#include "ui/list.h"
#include "ui/label.h"
#include "ui/gauge.h" #include "ui/gauge.h"
#include "ui/window.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"

1
src/object/auto/auto.h
View File

@ -33,7 +33,6 @@ class CCloud;
class CPlanet; class CPlanet;
class CBlitz; class CBlitz;
class CCamera; class CCamera;
class CObject;
class CInterface; class CInterface;
class CRobotMain; class CRobotMain;
class CDisplayText; class CDisplayText;

22
src/object/auto/autobase.cpp
View File

@ -15,35 +15,21 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/auto/autobase.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 "common/iman.h" #include "common/iman.h"
#include "math/old/math3d.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/cloud.h" #include "graphics/common/cloud.h"
#include "graphics/common/planet.h" #include "graphics/common/planet.h"
#include "graphics/common/blitz.h" #include "graphics/common/blitz.h"
#include "graphics/common/camera.h" #include "math/geometry.h"
#include "object/object.h" #include "object/robotmain.h"
#include "physics/physics.h" #include "physics/physics.h"
#include "ui/interface.h" #include "ui/interface.h"
#include "ui/button.h"
#include "ui/window.h" #include "ui/window.h"
#include "ui/displaytext.h" #include "ui/displaytext.h"
#include "object/robotmain.h"
#include "sound/sound.h"
#include "object/auto/auto.h"
#include "object/auto/autobase.h"

8
src/object/auto/autobase.h
View File

@ -20,16 +20,8 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;
enum AutoBaseParam enum AutoBaseParam
{ {

29
src/object/auto/autoconvert.cpp
View File

@ -15,32 +15,17 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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/window.h"
#include "sound/sound.h"
#include "ui/displaytext.h"
#include "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autoconvert.h" #include "object/auto/autoconvert.h"
#include "common/iman.h"
#include "math/geometry.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"
#include "ui/displaytext.h"

9
src/object/auto/autoconvert.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

30
src/object/auto/autoderrick.cpp
View File

@ -15,31 +15,19 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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 "sound/sound.h"
#include "ui/displaytext.h"
#include "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autoderrick.h" #include "object/auto/autoderrick.h"
#include "common/iman.h"
#include "graphics/common/terrain.h"
#include "math/geometry.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"
#include "ui/displaytext.h"
const float DERRICK_DELAY = 10.0f; // duration of the extraction const float DERRICK_DELAY = 10.0f; // duration of the extraction

10
src/object/auto/autoderrick.h
View File

@ -20,16 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

28
src/object/auto/autodestroyer.cpp
View File

@ -15,33 +15,15 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.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 "physics/physics.h"
#include "graphics/common/pyro.h"
#include "sound/sound.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" #include "object/auto/autodestroyer.h"
#include "common/iman.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"

9
src/object/auto/autodestroyer.h
View File

@ -19,18 +19,9 @@
#pragma once #pragma once
#include "common/misc.h"
#include "object/auto/auto.h" #include "object/auto/auto.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;
enum AutoDestroyerPhase enum AutoDestroyerPhase
{ {

22
src/object/auto/autoegg.cpp
View File

@ -15,27 +15,15 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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" #include "object/auto/autoegg.h"
#include "math/geometry.h"
#include "common/iman.h"
#include "script/cmdtoken.h"
// Object's constructor. // Object's constructor.

11
src/object/auto/autoegg.h
View File

@ -19,18 +19,7 @@
#pragma once #pragma once
#include "object/object.h"
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;
enum AutoEggPhase enum AutoEggPhase

23
src/object/auto/autoenergy.cpp
View File

@ -15,33 +15,18 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "math/const.h" #include "object/auto/autoenergy.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 "common/iman.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/terrain.h"
#include "graphics/common/camera.h" #include "math/geometry.h"
#include "object/object.h" #include "script/cmdtoken.h"
#include "ui/interface.h" #include "ui/interface.h"
#include "ui/button.h"
#include "ui/gauge.h" #include "ui/gauge.h"
#include "ui/window.h" #include "ui/window.h"
#include "ui/displaytext.h" #include "ui/displaytext.h"
#include "sound/sound.h"
#include "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autoenergy.h"

9
src/object/auto/autoenergy.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

29
src/object/auto/autofactory.cpp
View File

@ -15,37 +15,20 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "math/const.h" #include "object/auto/autofactory.h"
#include "math/geometry.h"
#include "common/struct.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/d3dmath.h"
#include "common/restext.h"
#include "common/global.h" #include "common/global.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "math/old/math3d.h" #include "math/geometry.h"
#include "graphics/common/particule.h" #include "object/robotmain.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 "physics/physics.h"
#include "object/brain.h" #include "script/cmdtoken.h"
#include "ui/interface.h" #include "ui/interface.h"
#include "ui/button.h"
#include "ui/window.h" #include "ui/window.h"
#include "ui/displaytext.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"

8
src/object/auto/autofactory.h
View File

@ -22,14 +22,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;
enum AutoFactoryPhase enum AutoFactoryPhase
{ {

18
src/object/auto/autoflag.cpp
View File

@ -15,25 +15,13 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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" #include "object/auto/autoflag.h"
#include "math/geometry.h"
#include "graphics/common/terrain.h"
#define ADJUST_ANGLE false // true -> adjusts the angles of the members #define ADJUST_ANGLE false // true -> adjusts the angles of the members

9
src/object/auto/autoflag.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

20
src/object/auto/autohuston.cpp
View File

@ -15,27 +15,13 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.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 "object/auto/auto.h"
#include "object/auto/autohuston.h" #include "object/auto/autohuston.h"
#include "ui/interface.h"
#include "ui/window.h"

9
src/object/auto/autohuston.h
View File

@ -20,18 +20,9 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;
struct HustonLens struct HustonLens
{ {

23
src/object/auto/autoinfo.cpp
View File

@ -15,30 +15,15 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/auto/autoinfo.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/d3dmath.h" #include "script/cmdtoken.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/interface.h"
#include "ui/button.h"
#include "ui/list.h" #include "ui/list.h"
#include "ui/window.h" #include "ui/window.h"
#include "sound/sound.h"
#include "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autoinfo.h"

9
src/object/auto/autoinfo.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

21
src/object/auto/autojostle.cpp
View File

@ -15,29 +15,8 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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" #include "object/auto/autojostle.h"

9
src/object/auto/autojostle.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

19
src/object/auto/autokid.cpp
View File

@ -15,27 +15,12 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.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/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 "object/auto/autokid.h"
#include "graphics/common/particule.h"
#include "graphics/common/water.h"

9
src/object/auto/autokid.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

28
src/object/auto/autolabo.cpp
View File

@ -15,34 +15,18 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/auto/autolabo.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/global.h"
#include "common/event.h"
#include "common/misc.h" #include "common/misc.h"
#include "common/iman.h" #include "math/geometry.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/window.h"
#include "ui/displaytext.h"
#include "sound/sound.h"
#include "object/robotmain.h" #include "object/robotmain.h"
#include "script/cmdtoken.h" #include "script/cmdtoken.h"
#include "object/auto/auto.h" #include "ui/interface.h"
#include "object/auto/autolabo.h" #include "ui/window.h"
#include "ui/displaytext.h"

9
src/object/auto/autolabo.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

20
src/object/auto/automush.cpp
View File

@ -15,27 +15,13 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "script/cmdtoken.h"
#include "sound/sound.h"
#include "object/auto/auto.h"
#include "object/auto/automush.h" #include "object/auto/automush.h"
#include "common/iman.h"
#include "script/cmdtoken.h"

9
src/object/auto/automush.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

19
src/object/auto/autonest.cpp
View File

@ -15,25 +15,14 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.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 "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autonest.h" #include "object/auto/autonest.h"
#include "common/iman.h"
#include "graphics/common/terrain.h"
#include "script/cmdtoken.h"

9
src/object/auto/autonest.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

30
src/object/auto/autonuclear.cpp
View File

@ -15,33 +15,17 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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/window.h"
#include "sound/sound.h"
#include "ui/displaytext.h"
#include "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autonuclear.h" #include "object/auto/autonuclear.h"
#include "common/iman.h"
#include "math/geometry.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"
#include "ui/displaytext.h"
const float NUCLEAR_DELAY = 30.0f; // duration of the generation const float NUCLEAR_DELAY = 30.0f; // duration of the generation

9
src/object/auto/autonuclear.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

30
src/object/auto/autopara.cpp
View File

@ -15,34 +15,18 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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/window.h"
#include "sound/sound.h"
#include "ui/displaytext.h"
#include "script/cmdtoken.h"
#include "object/auto/auto.h"
#include "object/auto/autopara.h" #include "object/auto/autopara.h"
#include "common/iman.h"
#include "math/geometry.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"
// Object's constructor. // Object's constructor.

9
src/object/auto/autopara.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

25
src/object/auto/autoportico.cpp
View File

@ -15,32 +15,15 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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/auto/autoportico.h"
#include "object/robotmain.h"
const int PARAM_DEPOSE = 2; // run=2 -> deposits the spaceship const int PARAM_DEPOSE = 2; // run=2 -> deposits the spaceship

9
src/object/auto/autoportico.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

26
src/object/auto/autoradar.cpp
View File

@ -15,31 +15,15 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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/gauge.h"
#include "sound/sound.h"
#include "object/auto/auto.h"
#include "object/auto/autoradar.h" #include "object/auto/autoradar.h"
#include "common/iman.h"
#include "math/geometry.h"
#include "ui/interface.h"
#include "ui/window.h"
#include "ui/gauge.h"
// Object's constructor. // Object's constructor.

9
src/object/auto/autoradar.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

29
src/object/auto/autorepair.cpp
View File

@ -15,34 +15,15 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "physics/physics.h"
#include "sound/sound.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" #include "object/auto/autorepair.h"
#include "common/iman.h"
#include "physics/physics.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"
// Object's constructor. // Object's constructor.

9
src/object/auto/autorepair.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

28
src/object/auto/autoresearch.cpp
View File

@ -15,38 +15,22 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "math/const.h" #include "object/auto/autoresearch.h"
#include "math/geometry.h"
#include "common/struct.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/d3dmath.h"
#include "common/global.h" #include "common/global.h"
#include "common/event.h" #include "math/geometry.h"
#include "common/misc.h" #include "object/robotmain.h"
#include "common/iman.h" #include "script/cmdtoken.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/interface.h"
#include "ui/button.h"
#include "ui/gauge.h" #include "ui/gauge.h"
#include "ui/window.h" #include "ui/window.h"
#include "ui/displaytext.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

9
src/object/auto/autoresearch.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

17
src/object/auto/autoroot.cpp
View File

@ -15,24 +15,13 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/auto/autoroot.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/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/camera.h" #include "math/geometry.h"
#include "object/object.h"
#include "object/auto/auto.h"
#include "object/auto/autoroot.h"

9
src/object/auto/autoroot.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

32
src/object/auto/autosafe.cpp
View File

@ -15,41 +15,21 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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 "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 "object/auto/autosafe.h"
#include "common/iman.h"
#include "math/geometry.h"
#include "object/robotmain.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/window.h"
const float OPEN_DELAY = 8.0f; // duration of opening const float OPEN_DELAY = 8.0f; // duration of opening
// Object's constructor. // Object's constructor.
CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object) CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object)

9
src/object/auto/autosafe.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

19
src/object/auto/autostation.cpp
View File

@ -15,30 +15,17 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/auto/autostation.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 "common/iman.h"
#include "math/old/math3d.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
#include "graphics/common/light.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/camera.h" #include "math/geometry.h"
#include "object/object.h"
#include "ui/interface.h" #include "ui/interface.h"
#include "ui/button.h"
#include "ui/gauge.h" #include "ui/gauge.h"
#include "ui/window.h" #include "ui/window.h"
#include "sound/sound.h"
#include "object/auto/auto.h"
#include "object/auto/autostation.h"

9
src/object/auto/autostation.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

33
src/object/auto/autotower.cpp
View File

@ -15,35 +15,18 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#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 "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 "physics/physics.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 "object/auto/autotower.h"
#include "common/iman.h"
#include "math/geometry.h"
#include "physics/physics.h"
#include "script/cmdtoken.h"
#include "ui/interface.h"
#include "ui/displaytext.h"
#include "ui/window.h"
#include "ui/gauge.h"
const float TOWER_SCOPE = 200.0f; // range of beam const float TOWER_SCOPE = 200.0f; // range of beam

9
src/object/auto/autotower.h
View File

@ -20,15 +20,6 @@
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "common/misc.h"
class CInstanceManager;
class CD3DEngine;
class CParticule;
class CTerrain;
class CCamera;
class CObject;

5
src/object/brain.cpp
View File

@ -15,9 +15,9 @@
// * along with this program. If not, see http://www.gnu.org/licenses/. // * along with this program. If not, see http://www.gnu.org/licenses/.
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "object/brain.h"
#include "CBot/CBotDll.h" #include "CBot/CBotDll.h"
#include "common/struct.h" #include "common/struct.h"
@ -65,7 +65,6 @@
#include "sound/sound.h" #include "sound/sound.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
#include "script/cmdtoken.h" #include "script/cmdtoken.h"
#include "object/brain.h"

2
src/object/brain.h
View File

@ -19,6 +19,8 @@
#pragma once #pragma once
#include <stdio.h>
#include "common/misc.h" #include "common/misc.h"
#include "common/event.h" #include "common/event.h"
#include "object/object.h" #include "object/object.h"

22
src/object/mainmovie.cpp
View File

@ -17,26 +17,16 @@
// mainmovie.cpp // mainmovie.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/geometry.h"
#include "graphics/d3d/d3dengine.h"
#include "common/global.h"
#include "common/event.h"
#include "common/iman.h"
#include "math/old/math3d.h"
#include "graphics/common/camera.h"
#include "object/object.h"
#include "object/motion/motion.h"
#include "object/motion/motionhuman.h"
#include "ui/interface.h"
#include "object/robotmain.h"
#include "sound/sound.h"
#include "object/mainmovie.h" #include "object/mainmovie.h"
#include "math/geometry.h"
#include "common/iman.h"
#include "object/motion/motionhuman.h"
#include "object/robotmain.h"

4
src/object/mainmovie.h
View File

@ -20,7 +20,8 @@
#include "common/event.h" #include "common/event.h"
#include "graphics/d3d/d3dengine.h" #include "math/vector.h"
class CInstanceManager; class CInstanceManager;
class CEvent; class CEvent;
@ -29,7 +30,6 @@ class CInterface;
class CRobotMain; class CRobotMain;
class CCamera; class CCamera;
class CSound; class CSound;
class CObject;

24
src/object/motion/motion.cpp
View File

@ -17,31 +17,13 @@
// motion.cpp // motion.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/const.h"
#include "math/geometry.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "object/robotmain.h"
#include "sound/sound.h"
#include "script/cmdtoken.h"
#include "object/motion/motion.h" #include "object/motion/motion.h"
#include "common/iman.h"
#include "script/cmdtoken.h"

3
src/object/motion/motion.h
View File

@ -22,11 +22,10 @@
#include "common/event.h" #include "common/event.h"
#include "common/misc.h" #include "common/misc.h"
#include "object/object.h" #include "object/object.h"
#include "graphics/d3d/d3dengine.h"
class CInstanceManager; class CInstanceManager;
class CEngine; class CD3DEngine;
class CLight; class CLight;
class CParticule; class CParticule;
class CTerrain; class CTerrain;

23
src/object/motion/motionant.cpp
View File

@ -17,29 +17,14 @@
// motionant.cpp // motionant.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/func.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "common/modfile.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionant.h" #include "object/motion/motionant.h"
#include "common/modfile.h"
#include "graphics/common/particule.h"
#include "physics/physics.h"
#define ADJUST_ANGLE false // true -> adjusts the angles of the members #define ADJUST_ANGLE false // true -> adjusts the angles of the members

9
src/object/motion/motionant.h
View File

@ -22,15 +22,6 @@
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
enum MotionAntAction enum MotionAntAction
{ {

22
src/object/motion/motionbee.cpp
View File

@ -17,29 +17,13 @@
// motionbee.cpp // motionbee.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/func.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "common/modfile.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionbee.h" #include "object/motion/motionbee.h"
#include "common/modfile.h"
#include "physics/physics.h"
#define ADJUST_ANGLE false // true -> adjusts the angles of the members #define ADJUST_ANGLE false // true -> adjusts the angles of the members

10
src/object/motion/motionbee.h
View File

@ -22,16 +22,6 @@
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
enum MotionBeeAction enum MotionBeeAction
{ {

25
src/object/motion/motionhuman.cpp
View File

@ -17,31 +17,16 @@
// motionhuman.cpp // motionhuman.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/motion/motionhuman.h"
#include "math/func.h"
#include "math/geometry.h" #include "common/modfile.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/water.h" #include "graphics/common/water.h"
#include "object/object.h" #include "math/geometry.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "common/modfile.h"
#include "object/robotmain.h" #include "object/robotmain.h"
#include "sound/sound.h" #include "physics/physics.h"
#include "object/motion/motion.h"
#include "object/motion/motionhuman.h"

11
src/object/motion/motionhuman.h
View File

@ -19,20 +19,9 @@
#pragma once #pragma once
#include "common/misc.h"
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
enum MotionHumanAction enum MotionHumanAction
{ {

22
src/object/motion/motionmother.cpp
View File

@ -17,29 +17,13 @@
// motionmother.cpp // motionmother.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/func.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "common/modfile.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionmother.h" #include "object/motion/motionmother.h"
#include "common/modfile.h"
#include "physics/physics.h"
#define ADJUST_ANGLE false // true -> adjusts the angles of the members #define ADJUST_ANGLE false // true -> adjusts the angles of the members

10
src/object/motion/motionmother.h
View File

@ -22,16 +22,6 @@
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
class CMotionMother : public CMotion class CMotionMother : public CMotion
{ {

23
src/object/motion/motionspider.cpp
View File

@ -17,29 +17,14 @@
// motionspider.cpp // motionspider.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/func.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "common/modfile.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionspider.h" #include "object/motion/motionspider.h"
#include "common/modfile.h"
#include "graphics/common/particule.h"
#include "physics/physics.h"
#define ADJUST_ANGLE false // true -> adjusts the angles of the members #define ADJUST_ANGLE false // true -> adjusts the angles of the members

10
src/object/motion/motionspider.h
View File

@ -22,16 +22,6 @@
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
enum MotionSpiderAction enum MotionSpiderAction
{ {

18
src/object/motion/motiontoto.cpp
View File

@ -17,29 +17,15 @@
// motiontoto.cpp // motiontoto.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/motion/motiontoto.h"
#include "math/geometry.h" #include "math/geometry.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/water.h" #include "graphics/common/water.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "common/modfile.h" #include "common/modfile.h"
#include "object/robotmain.h" #include "object/robotmain.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motiontoto.h"

11
src/object/motion/motiontoto.h
View File

@ -19,20 +19,9 @@
#pragma once #pragma once
#include "common/struct.h"
#include "object/object.h"
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
enum MotionTotoAction enum MotionTotoAction
{ {

24
src/object/motion/motionvehicle.cpp
View File

@ -17,29 +17,17 @@
// motionvehicle.cpp // motionvehicle.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/motion/motionvehicle.h"
#include "math/func.h"
#include "math/geometry.h" #include "common/modfile.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/light.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "object/object.h" #include "math/geometry.h"
#include "physics/physics.h"
#include "object/brain.h" #include "object/brain.h"
#include "graphics/common/camera.h" #include "physics/physics.h"
#include "common/modfile.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionvehicle.h"

10
src/object/motion/motionvehicle.h
View File

@ -22,16 +22,6 @@
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
class CMotionVehicle : public CMotion class CMotionVehicle : public CMotion
{ {

22
src/object/motion/motionworm.cpp
View File

@ -17,28 +17,16 @@
// motionworm.cpp // motionworm.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/motion/motionworm.h"
#include "math/geometry.h"
#include "graphics/d3d/d3dengine.h" #include "common/modfile.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/light.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "object/object.h" #include "math/geometry.h"
#include "physics/physics.h" #include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "common/modfile.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionworm.h"

10
src/object/motion/motionworm.h
View File

@ -22,16 +22,6 @@
#include "object/motion/motion.h" #include "object/motion/motion.h"
class CInstanceManager;
class CEngine;
class CLight;
class CParticule;
class CTerrain;
class CCamera;
class CBrain;
class CPhysics;
class CObject;
class CMotionWorm : public CMotion class CMotionWorm : public CMotion
{ {

22
src/object/task/task.cpp
View File

@ -17,30 +17,12 @@
// task.cpp // task.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.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/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "object/motion/motion.h"
#include "graphics/common/camera.h"
#include "sound/sound.h"
#include "object/robotmain.h"
#include "ui/displaytext.h"
#include "object/task/task.h" #include "object/task/task.h"
#include "common/iman.h"
#include "object/object.h"

1
src/object/task/task.h
View File

@ -25,7 +25,6 @@
class CInstanceManager; class CInstanceManager;
class CD3DEngine; class CD3DEngine;
class CEngine;
class CLight; class CLight;
class CParticule; class CParticule;
class CTerrain; class CTerrain;

17
src/object/task/taskadvance.cpp
View File

@ -17,24 +17,13 @@
// taskadvance.cpp // taskadvance.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/geometry.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/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "object/task/task.h"
#include "object/task/taskadvance.h" #include "object/task/taskadvance.h"
#include "math/geometry.h"
#include "physics/physics.h"

8
src/object/task/taskadvance.h
View File

@ -20,15 +20,9 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h" #include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;
class CTaskAdvance : public CTask class CTaskAdvance : public CTask
{ {

21
src/object/task/taskbuild.cpp
View File

@ -17,33 +17,20 @@
// taskbuild.cpp // taskbuild.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskbuild.h"
#include "math/geometry.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/iman.h"
#include "graphics/common/light.h" #include "graphics/common/light.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/water.h" #include "graphics/common/water.h"
#include "object/object.h" #include "math/geometry.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "object/auto/auto.h" #include "object/auto/auto.h"
#include "graphics/common/camera.h"
#include "object/motion/motion.h"
#include "object/motion/motionhuman.h" #include "object/motion/motionhuman.h"
#include "object/robotmain.h" #include "object/robotmain.h"
#include "sound/sound.h" #include "physics/physics.h"
#include "ui/displaytext.h" #include "ui/displaytext.h"
#include "object/task/task.h"
#include "object/task/taskbuild.h"

7
src/object/task/taskbuild.h
View File

@ -21,12 +21,7 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "object/object.h" #include "object/object.h"
#include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;

20
src/object/task/taskfire.cpp
View File

@ -17,26 +17,14 @@
// taskfire.cpp // taskfire.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/geometry.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "sound/sound.h"
#include "object/task/task.h"
#include "object/task/taskfire.h" #include "object/task/taskfire.h"
#include "graphics/common/particule.h"
#include "math/geometry.h"
#include "physics/physics.h"
const float ENERGY_FIRE = (0.25f/2.5f); // energy consumed/shot const float ENERGY_FIRE = (0.25f/2.5f); // energy consumed/shot

6
src/object/task/taskfire.h
View File

@ -22,12 +22,6 @@
#include "object/task/task.h" #include "object/task/task.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;
class CTaskFire : public CTask class CTaskFire : public CTask
{ {

22
src/object/task/taskfireant.cpp
View File

@ -17,27 +17,15 @@
// taskfireant.cpp // taskfireant.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/geometry.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "object/motion/motion.h"
#include "object/motion/motionant.h"
#include "object/task/task.h"
#include "object/task/taskfireant.h" #include "object/task/taskfireant.h"
#include "graphics/common/particule.h"
#include "math/geometry.h"
#include "object/motion/motionant.h"
#include "physics/physics.h"

9
src/object/task/taskfireant.h
View File

@ -20,14 +20,7 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h" #include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;

18
src/object/task/taskflag.cpp
View File

@ -17,30 +17,16 @@
// taskflag.cpp // taskflag.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskflag.h"
#include "math/geometry.h" #include "math/geometry.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/d3dmath.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "graphics/common/terrain.h"
#include "graphics/common/water.h" #include "graphics/common/water.h"
#include "object/object.h"
#include "graphics/common/pyro.h" #include "graphics/common/pyro.h"
#include "physics/physics.h" #include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "object/motion/motion.h"
#include "object/motion/motionhuman.h" #include "object/motion/motionhuman.h"
#include "sound/sound.h"
#include "object/task/task.h"
#include "object/task/taskflag.h"

8
src/object/task/taskflag.h
View File

@ -19,14 +19,8 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h"
#include "object/object.h" #include "object/object.h"
#include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;

14
src/object/task/taskgoto.cpp
View File

@ -17,24 +17,16 @@
// taskgoto.cpp // taskgoto.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskgoto.h"
#include "math/geometry.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/math3d.h"
#include "common/event.h" #include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "graphics/common/water.h" #include "graphics/common/water.h"
#include "object/object.h" #include "math/geometry.h"
#include "physics/physics.h" #include "physics/physics.h"
#include "object/brain.h"
#include "object/task/task.h"
#include "object/task/taskgoto.h"

9
src/object/task/taskgoto.h
View File

@ -20,14 +20,7 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h" #include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;

13
src/object/task/taskgungoal.cpp
View File

@ -17,21 +17,12 @@
// taskgungoal.cpp // taskgungoal.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.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/object.h"
#include "sound/sound.h"
#include "object/task/task.h"
#include "object/task/taskgungoal.h" #include "object/task/taskgungoal.h"
#include "object/object.h"

6
src/object/task/taskgungoal.h
View File

@ -22,12 +22,6 @@
#include "object/task/task.h" #include "object/task/task.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;
class CTaskGunGoal : public CTask class CTaskGunGoal : public CTask
{ {

17
src/object/task/taskinfo.cpp
View File

@ -17,25 +17,14 @@
// taskinfo.cpp // taskinfo.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskinfo.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "sound/sound.h"
#include "object/auto/auto.h"
#include "object/auto/autoinfo.h" #include "object/auto/autoinfo.h"
#include "object/task/task.h"
#include "object/task/taskinfo.h"

7
src/object/task/taskinfo.h
View File

@ -22,13 +22,6 @@
#include "object/task/task.h" #include "object/task/task.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;
class CTaskInfo : public CTask class CTaskInfo : public CTask
{ {

15
src/object/task/taskmanager.cpp
View File

@ -17,37 +17,26 @@
// taskmanager.cpp // taskmanager.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskmanager.h"
#include "graphics/d3d/d3dengine.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "common/event.h"
#include "object/object.h"
#include "object/task/task.h"
#include "object/task/taskwait.h" #include "object/task/taskwait.h"
#include "object/task/taskadvance.h" #include "object/task/taskadvance.h"
#include "object/task/taskturn.h" #include "object/task/taskturn.h"
#include "object/task/taskgoto.h"
#include "object/task/tasktake.h" #include "object/task/tasktake.h"
#include "object/task/taskmanip.h"
#include "object/task/taskflag.h"
#include "object/task/taskbuild.h" #include "object/task/taskbuild.h"
#include "object/task/tasksearch.h" #include "object/task/tasksearch.h"
#include "object/task/taskterraform.h" #include "object/task/taskterraform.h"
#include "object/task/taskpen.h" #include "object/task/taskpen.h"
#include "object/task/taskrecover.h" #include "object/task/taskrecover.h"
#include "object/task/taskshield.h"
#include "object/task/taskinfo.h" #include "object/task/taskinfo.h"
#include "object/task/taskfire.h" #include "object/task/taskfire.h"
#include "object/task/taskfireant.h" #include "object/task/taskfireant.h"
#include "object/task/taskgungoal.h" #include "object/task/taskgungoal.h"
#include "object/task/taskspiderexplo.h" #include "object/task/taskspiderexplo.h"
#include "object/task/taskreset.h" #include "object/task/taskreset.h"
#include "object/task/taskmanager.h"

4
src/object/task/taskmanager.h
View File

@ -27,10 +27,6 @@
#include "object/task/taskflag.h" #include "object/task/taskflag.h"
class CInstanceManager;
class CTask;
class CTaskManager class CTaskManager
{ {

20
src/object/task/taskmanip.cpp
View File

@ -17,28 +17,16 @@
// taskmanip.cpp // taskmanip.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskmanip.h"
#include "math/geometry.h"
#include "graphics/d3d/d3dengine.h"
#include "math/old/d3dmath.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "graphics/common/terrain.h" #include "graphics/common/terrain.h"
#include "object/object.h"
#include "graphics/common/pyro.h" #include "graphics/common/pyro.h"
#include "physics/physics.h" #include "math/geometry.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "sound/sound.h"
#include "object/robotmain.h" #include "object/robotmain.h"
#include "object/task/task.h" #include "physics/physics.h"
#include "object/task/taskmanip.h"
//?const float MARGIN_FRONT = 2.0f; //?const float MARGIN_FRONT = 2.0f;

9
src/object/task/taskmanip.h
View File

@ -20,15 +20,8 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h"
#include "object/object.h" #include "object/object.h"
#include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;

23
src/object/task/taskpen.cpp
View File

@ -17,29 +17,14 @@
// taskpen.cpp // taskpen.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h"
#include "math/geometry.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "sound/sound.h"
#include "object/motion/motion.h"
#include "object/motion/motionant.h"
#include "object/motion/motionspider.h"
#include "object/task/task.h"
#include "object/task/taskpen.h" #include "object/task/taskpen.h"
#include "graphics/common/particule.h"
#include "math/geometry.h"
#include "object/object.h"
// Object's constructor. // Object's constructor.

9
src/object/task/taskpen.h
View File

@ -20,14 +20,7 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h" #include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;

16
src/object/task/taskrecover.cpp
View File

@ -17,27 +17,15 @@
// taskrecover.cpp // taskrecover.cpp
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <d3d.h>
#include "common/struct.h" #include "object/task/taskrecover.h"
#include "math/func.h"
#include "math/geometry.h" #include "math/geometry.h"
#include "math/old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h" #include "common/iman.h"
#include "graphics/common/particule.h" #include "graphics/common/particule.h"
#include "graphics/common/terrain.h"
#include "object/object.h"
#include "physics/physics.h" #include "physics/physics.h"
#include "object/brain.h"
#include "graphics/common/camera.h"
#include "sound/sound.h"
#include "ui/displaytext.h" #include "ui/displaytext.h"
#include "object/task/task.h"
#include "object/task/taskrecover.h"
const float ENERGY_RECOVER = 0.25f; // energy consumed by recovery const float ENERGY_RECOVER = 0.25f; // energy consumed by recovery

9
src/object/task/taskrecover.h
View File

@ -20,14 +20,7 @@
#include "object/task/task.h" #include "object/task/task.h"
#include "graphics/d3d/d3dengine.h" #include "math/vector.h"
class CInstanceManager;
class CTerrain;
class CBrain;
class CPhysics;
class CObject;

Some files were not shown because too many files have changed in this diff Show More