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

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #include "struct.h"
-#include "D3DEngine.h"
-#include "D3DMath.h"
+#include "d3dengine.h"
+#include "d3dmath.h"
 #include "event.h"
 #include "misc.h"
 #include "iman.h"

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;

src/autobase.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoconvert.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoderrick.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;
 
 
 

src/autodestroyer.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoegg.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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

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

src/autoenergy.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autofactory.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoflag.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autohuston.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autoinfo.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autojostle.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autokid.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autolabo.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/automush.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autonest.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autonuclear.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autopara.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoportico.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoradar.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autorepair.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autoresearch.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autoroot.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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

src/autosafe.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autostation.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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;

src/autotower.cpp

@@ -22,8 +22,8 @@
 #include <d3d.h>
 
 #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();
 }
 
 

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