From 97edcc167442dbb794191cbb2f722e0a02f1d159 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Fri, 23 Mar 2012 19:43:42 +0100 Subject: Fixes in auto* modules - fixed missing #includes and case in file names - fixed syntax errors reported by GCC - did not fix issues #8 and #17 --- src/auto.cpp | 4 ++-- src/auto.h | 7 ++++++- src/autobase.cpp | 6 +++--- src/autobase.h | 7 +++++++ src/autoconvert.cpp | 6 +++--- src/autoconvert.h | 6 ++++++ src/autoderrick.cpp | 6 +++--- src/autoderrick.h | 8 +++++++- src/autodestroyer.cpp | 6 +++--- src/autodestroyer.h | 5 +++++ src/autoegg.cpp | 8 ++++---- src/autoegg.h | 11 ++++++++--- src/autoenergy.cpp | 6 +++--- src/autoenergy.h | 8 +++++++- src/autofactory.cpp | 6 +++--- src/autofactory.h | 6 ++++++ src/autoflag.cpp | 6 +++--- src/autoflag.h | 10 +++++++--- src/autohuston.cpp | 6 +++--- src/autohuston.h | 10 +++++++--- src/autoinfo.cpp | 6 +++--- src/autoinfo.h | 9 ++++++++- src/autojostle.cpp | 6 +++--- src/autojostle.h | 8 +++++++- src/autokid.cpp | 6 +++--- src/autokid.h | 10 +++++++--- src/autolabo.cpp | 6 +++--- src/autolabo.h | 8 +++++++- src/automush.cpp | 6 +++--- src/automush.h | 10 +++++++--- src/autonest.cpp | 6 +++--- src/autonest.h | 9 +++++++-- src/autonuclear.cpp | 6 +++--- src/autonuclear.h | 9 ++++++++- src/autopara.cpp | 6 +++--- src/autopara.h | 9 ++++++++- src/autoportico.cpp | 6 +++--- src/autoportico.h | 7 +++++++ src/autoradar.cpp | 6 +++--- src/autoradar.h | 7 +++++++ src/autorepair.cpp | 6 +++--- src/autorepair.h | 7 +++++++ src/autoresearch.cpp | 6 +++--- src/autoresearch.h | 9 +++++++-- src/autoroot.cpp | 6 +++--- src/autoroot.h | 11 ++++++++--- src/autosafe.cpp | 6 +++--- src/autosafe.h | 9 ++++++++- src/autostation.cpp | 6 +++--- src/autostation.h | 9 ++++++++- src/autotower.cpp | 6 +++--- src/autotower.h | 9 +++++++-- 52 files changed, 262 insertions(+), 112 deletions(-) diff --git a/src/auto.cpp b/src/auto.cpp index 5a4a287..9711423 100644 --- a/src/auto.cpp +++ b/src/auto.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" diff --git a/src/auto.h b/src/auto.h index 1f13e5f..4cc9389 100644 --- a/src/auto.h +++ b/src/auto.h @@ -12,12 +12,17 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// auto.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// auto.h #ifndef _AUTO_H_ #define _AUTO_H_ +#include "object.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autobase.cpp b/src/autobase.cpp index d42a808..fada8d5 100644 --- a/src/autobase.cpp +++ b/src/autobase.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "language.h" #include "event.h" #include "misc.h" @@ -78,7 +78,7 @@ CAutoBase::CAutoBase(CInstanceManager* iMan, CObject* object) CAutoBase::~CAutoBase() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autobase.h b/src/autobase.h index 481dbac..b8f3874 100644 --- a/src/autobase.h +++ b/src/autobase.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autobase.h + #ifndef _AUTOBASE_H_ #define _AUTOBASE_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoconvert.cpp b/src/autoconvert.cpp index 45c0ffe..ae213e3 100644 --- a/src/autoconvert.cpp +++ b/src/autoconvert.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -62,7 +62,7 @@ CAutoConvert::CAutoConvert(CInstanceManager* iMan, CObject* object) CAutoConvert::~CAutoConvert() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoconvert.h b/src/autoconvert.h index 4800f10..2e35e24 100644 --- a/src/autoconvert.h +++ b/src/autoconvert.h @@ -14,10 +14,16 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autoconvert.h + #ifndef _AUTOCONVERT_H_ #define _AUTOCONVERT_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoderrick.cpp b/src/autoderrick.cpp index d0453cc..d2541c5 100644 --- a/src/autoderrick.cpp +++ b/src/autoderrick.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -65,7 +65,7 @@ CAutoDerrick::CAutoDerrick(CInstanceManager* iMan, CObject* object) CAutoDerrick::~CAutoDerrick() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoderrick.h b/src/autoderrick.h index f264158..3828493 100644 --- a/src/autoderrick.h +++ b/src/autoderrick.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autoderrick.h + #ifndef _AUTODERRICK_H_ #define _AUTODERRICK_H_ +#include "object.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,7 +32,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; diff --git a/src/autodestroyer.cpp b/src/autodestroyer.cpp index b035625..11dc0ba 100644 --- a/src/autodestroyer.cpp +++ b/src/autodestroyer.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -62,7 +62,7 @@ CAutoDestroyer::CAutoDestroyer(CInstanceManager* iMan, CObject* object) CAutoDestroyer::~CAutoDestroyer() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autodestroyer.h b/src/autodestroyer.h index a1b34be..a69f832 100644 --- a/src/autodestroyer.h +++ b/src/autodestroyer.h @@ -14,10 +14,15 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autodestroyer.h + #ifndef _AUTODESTROYER_H_ #define _AUTODESTROYER_H_ +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoegg.cpp b/src/autoegg.cpp index f3b629a..45dadf5 100644 --- a/src/autoegg.cpp +++ b/src/autoegg.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -59,7 +59,7 @@ CAutoEgg::CAutoEgg(CInstanceManager* iMan, CObject* object) CAutoEgg::~CAutoEgg() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } @@ -76,7 +76,7 @@ void CAutoEgg::DeleteObject(BOOL bAll) alien = SearchAlien(); if ( alien != 0 ) { - if ( alien->RetZoom(0) == 1.0f ) + if ( alien->RetZoom(0) == 1.0f ) // ? RetZoom() returns a vector { alien->SetLock(FALSE); alien->SetActivity(TRUE); // the insect is active diff --git a/src/autoegg.h b/src/autoegg.h index ea41440..4340a9b 100644 --- a/src/autoegg.h +++ b/src/autoegg.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autoegg.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autoegg.h #ifndef _AUTOEGG_H_ #define _AUTOEGG_H_ +#include "object.h" +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +32,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - enum AutoEggPhase diff --git a/src/autoenergy.cpp b/src/autoenergy.cpp index c273a50..023a185 100644 --- a/src/autoenergy.cpp +++ b/src/autoenergy.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -66,7 +66,7 @@ CAutoEnergy::CAutoEnergy(CInstanceManager* iMan, CObject* object) CAutoEnergy::~CAutoEnergy() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoenergy.h b/src/autoenergy.h index 2601ef4..dd920fb 100644 --- a/src/autoenergy.h +++ b/src/autoenergy.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autoenergy.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autoenergy.h #ifndef _AUTOENERGY_H_ #define _AUTOENERGY_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autofactory.cpp b/src/autofactory.cpp index ae41455..7fab2fb 100644 --- a/src/autofactory.cpp +++ b/src/autofactory.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "restext.h" #include "global.h" #include "event.h" @@ -67,7 +67,7 @@ CAutoFactory::CAutoFactory(CInstanceManager* iMan, CObject* object) CAutoFactory::~CAutoFactory() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autofactory.h b/src/autofactory.h index b5522ee..d49c3ac 100644 --- a/src/autofactory.h +++ b/src/autofactory.h @@ -14,10 +14,16 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autofactory.h + #ifndef _AUTOFACTORY_H_ #define _AUTOFACTORY_H_ +#include "auto.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoflag.cpp b/src/autoflag.cpp index bf625a5..5cd4bf2 100644 --- a/src/autoflag.cpp +++ b/src/autoflag.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -61,7 +61,7 @@ CAutoFlag::CAutoFlag(CInstanceManager* iMan, CObject* object) CAutoFlag::~CAutoFlag() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoflag.h b/src/autoflag.h index c73d368..4ef0fe4 100644 --- a/src/autoflag.h +++ b/src/autoflag.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autoflag.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autoflag.h #ifndef _AUTOFLAG_H_ #define _AUTOFLAG_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +31,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - class CAutoFlag : public CAuto diff --git a/src/autohuston.cpp b/src/autohuston.cpp index 811e21c..ad66702 100644 --- a/src/autohuston.cpp +++ b/src/autohuston.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -189,7 +189,7 @@ CAutoHuston::CAutoHuston(CInstanceManager* iMan, CObject* object) CAutoHuston::~CAutoHuston() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autohuston.h b/src/autohuston.h index a78ff91..0611eb2 100644 --- a/src/autohuston.h +++ b/src/autohuston.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autohuston.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autohuston.h #ifndef _AUTOHUSTON_H_ #define _AUTOHUSTON_H_ +#include "auto.h" +#include "particule.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +31,6 @@ class CTerrain; class CCamera; class CObject; -enum ParticuleType; - typedef struct diff --git a/src/autoinfo.cpp b/src/autoinfo.cpp index fdddf5a..e9708e0 100644 --- a/src/autoinfo.cpp +++ b/src/autoinfo.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -59,7 +59,7 @@ CAutoInfo::CAutoInfo(CInstanceManager* iMan, CObject* object) CAutoInfo::~CAutoInfo() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoinfo.h b/src/autoinfo.h index e9f9769..4bbdc5b 100644 --- a/src/autoinfo.h +++ b/src/autoinfo.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autoinfo.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autoinfo.h #ifndef _AUTOINFO_H_ #define _AUTOINFO_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autojostle.cpp b/src/autojostle.cpp index 07176c0..1bcd11e 100644 --- a/src/autojostle.cpp +++ b/src/autojostle.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -58,7 +58,7 @@ CAutoJostle::CAutoJostle(CInstanceManager* iMan, CObject* object) CAutoJostle::~CAutoJostle() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autojostle.h b/src/autojostle.h index a376de3..18027a0 100644 --- a/src/autojostle.h +++ b/src/autojostle.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autojostle.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autojostle.h #ifndef _AUTOJOSTLE_H_ #define _AUTOJOSTLE_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autokid.cpp b/src/autokid.cpp index 7730a61..98c0f45 100644 --- a/src/autokid.cpp +++ b/src/autokid.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -63,7 +63,7 @@ CAutoKid::~CAutoKid() m_soundChannel = -1; } - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autokid.h b/src/autokid.h index 71e4082..dc5305b 100644 --- a/src/autokid.h +++ b/src/autokid.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autokid.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autokid.h #ifndef _AUTOKID_H_ #define _AUTOKID_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +31,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - class CAutoKid : public CAuto diff --git a/src/autolabo.cpp b/src/autolabo.cpp index 688bf17..ce6214c 100644 --- a/src/autolabo.cpp +++ b/src/autolabo.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "global.h" #include "event.h" #include "misc.h" @@ -74,7 +74,7 @@ CAutoLabo::CAutoLabo(CInstanceManager* iMan, CObject* object) CAutoLabo::~CAutoLabo() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autolabo.h b/src/autolabo.h index a76dc88..997bc55 100644 --- a/src/autolabo.h +++ b/src/autolabo.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autolabo.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autolabo.h #ifndef _AUTOLABO_H_ #define _AUTOLABO_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/automush.cpp b/src/automush.cpp index e1c1ca9..d1107ed 100644 --- a/src/automush.cpp +++ b/src/automush.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -54,7 +54,7 @@ CAutoMush::CAutoMush(CInstanceManager* iMan, CObject* object) CAutoMush::~CAutoMush() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/automush.h b/src/automush.h index 051311f..81314ee 100644 --- a/src/automush.h +++ b/src/automush.h @@ -12,12 +12,18 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// automush.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// automush.h #ifndef _AUTOMUSH_H_ #define _AUTOMUSH_H_ +#include "auto.h" +#include "misc.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +31,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - enum AutoMushPhase diff --git a/src/autonest.cpp b/src/autonest.cpp index 29a3d66..a86e7b8 100644 --- a/src/autonest.cpp +++ b/src/autonest.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -53,7 +53,7 @@ CAutoNest::CAutoNest(CInstanceManager* iMan, CObject* object) CAutoNest::~CAutoNest() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autonest.h b/src/autonest.h index fdc9038..a749bb5 100644 --- a/src/autonest.h +++ b/src/autonest.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autonest.h + #ifndef _AUTONEST_H_ #define _AUTONEST_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +32,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - enum AutoNestPhase diff --git a/src/autonuclear.cpp b/src/autonuclear.cpp index 40fcf19..824bfca 100644 --- a/src/autonuclear.cpp +++ b/src/autonuclear.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "global.h" #include "event.h" #include "misc.h" @@ -65,7 +65,7 @@ CAutoNuclear::CAutoNuclear(CInstanceManager* iMan, CObject* object) CAutoNuclear::~CAutoNuclear() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autonuclear.h b/src/autonuclear.h index 56249ba..8b2cfbe 100644 --- a/src/autonuclear.h +++ b/src/autonuclear.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autonuclear.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autonuclear.h #ifndef _AUTONUCLEAR_H_ #define _AUTONUCLEAR_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autopara.cpp b/src/autopara.cpp index aab99d2..cb42e6d 100644 --- a/src/autopara.cpp +++ b/src/autopara.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "global.h" #include "event.h" #include "misc.h" @@ -61,7 +61,7 @@ CAutoPara::CAutoPara(CInstanceManager* iMan, CObject* object) CAutoPara::~CAutoPara() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autopara.h b/src/autopara.h index a04bb30..c14bf53 100644 --- a/src/autopara.h +++ b/src/autopara.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autopara.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autopara.h #ifndef _AUTOPARA_H_ #define _AUTOPARA_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoportico.cpp b/src/autoportico.cpp index a171153..c02348d 100644 --- a/src/autoportico.cpp +++ b/src/autoportico.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -87,7 +87,7 @@ CAutoPortico::CAutoPortico(CInstanceManager* iMan, CObject* object) CAutoPortico::~CAutoPortico() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoportico.h b/src/autoportico.h index 847156e..3628cd5 100644 --- a/src/autoportico.h +++ b/src/autoportico.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autoportico.h + #ifndef _AUTOPORTICO_H_ #define _AUTOPORTICO_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoradar.cpp b/src/autoradar.cpp index dcd2b01..2353149 100644 --- a/src/autoradar.cpp +++ b/src/autoradar.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -59,7 +59,7 @@ CAutoRadar::CAutoRadar(CInstanceManager* iMan, CObject* object) CAutoRadar::~CAutoRadar() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoradar.h b/src/autoradar.h index b923fbd..67ae4ca 100644 --- a/src/autoradar.h +++ b/src/autoradar.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autoradar.h + #ifndef _AUTORADAR_H_ #define _AUTORADAR_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autorepair.cpp b/src/autorepair.cpp index d45b42f..6994842 100644 --- a/src/autorepair.cpp +++ b/src/autorepair.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -61,7 +61,7 @@ CAutoRepair::CAutoRepair(CInstanceManager* iMan, CObject* object) CAutoRepair::~CAutoRepair() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autorepair.h b/src/autorepair.h index 8eb0376..6f29930 100644 --- a/src/autorepair.h +++ b/src/autorepair.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autorepair.h + #ifndef _AUTOREPAIR_H_ #define _AUTOREPAIR_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autoresearch.cpp b/src/autoresearch.cpp index 281af18..b15a9b8 100644 --- a/src/autoresearch.cpp +++ b/src/autoresearch.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "global.h" #include "event.h" #include "misc.h" @@ -72,7 +72,7 @@ CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object) CAutoResearch::~CAutoResearch() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoresearch.h b/src/autoresearch.h index f6e779f..0168d7f 100644 --- a/src/autoresearch.h +++ b/src/autoresearch.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autoresearch.h + #ifndef _AUTORESEARCH_H_ #define _AUTORESEARCH_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +32,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - enum AutoResearchPhase diff --git a/src/autoroot.cpp b/src/autoroot.cpp index 3b6b32d..5f1afad 100644 --- a/src/autoroot.cpp +++ b/src/autoroot.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -52,7 +52,7 @@ CAutoRoot::CAutoRoot(CInstanceManager* iMan, CObject* object) CAutoRoot::~CAutoRoot() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autoroot.h b/src/autoroot.h index f6874e8..eb3b284 100644 --- a/src/autoroot.h +++ b/src/autoroot.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autoroot.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autoroot.h #ifndef _AUTOROOT_H_ #define _AUTOROOT_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +32,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - class CAutoRoot : public CAuto diff --git a/src/autosafe.cpp b/src/autosafe.cpp index c26e079..bdc6d32 100644 --- a/src/autosafe.cpp +++ b/src/autosafe.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "global.h" #include "event.h" #include "misc.h" @@ -76,7 +76,7 @@ CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object) CAutoSafe::~CAutoSafe() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autosafe.h b/src/autosafe.h index cb93daf..d0f333e 100644 --- a/src/autosafe.h +++ b/src/autosafe.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autosafe.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autosafe.h #ifndef _AUTOSAFE_H_ #define _AUTOSAFE_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autostation.cpp b/src/autostation.cpp index 6039679..1e23e1d 100644 --- a/src/autostation.cpp +++ b/src/autostation.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "event.h" #include "misc.h" #include "iman.h" @@ -58,7 +58,7 @@ CAutoStation::CAutoStation(CInstanceManager* iMan, CObject* object) CAutoStation::~CAutoStation() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autostation.h b/src/autostation.h index fe5a795..d667337 100644 --- a/src/autostation.h +++ b/src/autostation.h @@ -12,12 +12,19 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// autostation.h +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// autostation.h #ifndef _AUTOSTATION_H_ #define _AUTOSTATION_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; diff --git a/src/autotower.cpp b/src/autotower.cpp index 55b196b..7dcdb05 100644 --- a/src/autotower.cpp +++ b/src/autotower.cpp @@ -22,8 +22,8 @@ #include #include "struct.h" -#include "D3DEngine.h" -#include "D3DMath.h" +#include "d3dengine.h" +#include "d3dmath.h" #include "global.h" #include "event.h" #include "misc.h" @@ -74,7 +74,7 @@ CAutoTower::CAutoTower(CInstanceManager* iMan, CObject* object) CAutoTower::~CAutoTower() { - CAuto::~CAuto(); + this->CAuto::~CAuto(); } diff --git a/src/autotower.h b/src/autotower.h index 6562d88..75daeef 100644 --- a/src/autotower.h +++ b/src/autotower.h @@ -14,10 +14,17 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +// autotower.h + #ifndef _AUTOTOWER_H_ #define _AUTOTOWER_H_ +#include "auto.h" +#include "misc.h" +#include "d3denum.h" + + class CInstanceManager; class CD3DEngine; class CParticule; @@ -25,8 +32,6 @@ class CTerrain; class CCamera; class CObject; -enum ObjectType; - enum AutoTowerPhase -- cgit v1.2.3-1-g7c22