Fixed includes and GCC syntax errors

src/blitz.cpp

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

src/blitz.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/.
 
+// blitz.h
+
 #ifndef _BLITZ_H_
 #define	_BLITZ_H_
 
 
+#include "misc.h"
+#include "struct.h"
+
+
 class CInstanceManager;
 class CD3DEngine;
 class CTerrain;

src/brain.cpp

@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "cbot/cbotdll.h"
+#include "CBot/CBotDll.h"
 #include "struct.h"
-#include "D3DEngine.h"
-#include "D3DMath.h"
+#include "d3dengine.h"
+#include "d3dmath.h"
 #include "language.h"
 #include "global.h"
 #include "event.h"

src/brain.h

@@ -14,10 +14,20 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
+// brain.h
+
 #ifndef _BRAIN_H_
 #define	_BRAIN_H_
 
 
+#include "misc.h"
+#include "event.h"
+#include "object.h"
+#include "taskmanip.h"
+#include "taskflag.h"
+#include "taskshield.h"
+
+
 class CInstanceManager;
 class CD3DEngine;
 class CTerrain;
@@ -36,12 +46,6 @@ class CStudio;
 class CSound;
 class CParticule;
 
-enum ObjectType;
-enum TaskManipOrder;
-enum TaskManipArm;
-enum TaskFlagOrder;
-enum TaskShieldMode;
-
 
 #define BRAINMAXSCRIPT		10
 

src/button.cpp

@@ -22,7 +22,7 @@
 #include <d3d.h>
 
 #include "struct.h"
-#include "D3DEngine.h"
+#include "d3dengine.h"
 #include "language.h"
 #include "math3d.h"
 #include "event.h"
@@ -54,7 +54,6 @@ CButton::CButton(CInstanceManager* iMan) : CControl(iMan)
 
 CButton::~CButton()
 {
-	CControl::~CControl();
 }
 
 

src/button.h

@@ -12,7 +12,9 @@
 // * 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/.// button.h
+// * along with this program. If not, see  http://www.gnu.org/licenses/.
+
+// button.h
 
 #ifndef _BUTTON_H_
 #define	_BUTTON_H_

src/camera.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"

src/camera.h

@@ -14,16 +14,21 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
+// camera.h
+
 #ifndef _CAMERA_H_
 #define	_CAMERA_H_
 
 
+#include "d3dengine.h"
+#include "struct.h"
+
+
 class CInstanceManager;
 class CD3DEngine;
 class CTerrain;
 class CWater;
 class CObject;
-enum D3DMouse;
 
 
 enum CameraType

src/cbottoken.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 "global.h"
 #include "event.h"

src/cbottoken.h

@@ -14,12 +14,13 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
+// cbottoken.h
+
 #ifndef _CBOTTOKEN_H_
 #define	_CBOTTOKEN_H_
 
 
-
-enum ObjectType;
+#include "object.h"
 
 
 

src/check.cpp

@@ -22,7 +22,7 @@
 #include <d3d.h>
 
 #include "struct.h"
-#include "D3DEngine.h"
+#include "d3dengine.h"
 #include "math3d.h"
 #include "event.h"
 #include "misc.h"
@@ -45,7 +45,6 @@ CCheck::CCheck(CInstanceManager* iMan) : CControl(iMan)
 
 CCheck::~CCheck()
 {
-	CControl::~CControl();
 }
 
 

src/check.h

@@ -12,7 +12,9 @@
 // * 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/.// check.h
+// * along with this program. If not, see  http://www.gnu.org/licenses/.
+
+// check.h
 
 #ifndef _CHECK_H_
 #define	_CHECK_H_

src/cloud.cpp

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

src/cloud.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/.
 
+// cloud.h
+
 #ifndef _CLOUD_H_
 #define	_CLOUD_H_
 
 
+#include "struct.h"
+
+
 class CInstanceManager;
 class CD3DEngine;
 class CTerrain;

src/cmdtoken.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 "global.h"
 #include "event.h"

src/cmdtoken.h

@@ -14,15 +14,18 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
+// cmdtoken.h
+
 #ifndef _CMDTOKEN_H_
 #define	_CMDTOKEN_H_
 
 
-
-enum ObjectType;
-enum WaterType;
-enum PyroType;
-enum CameraType;
+#include "d3denum.h"
+#include "d3dengine.h"
+#include "object.h"
+#include "water.h"
+#include "pyro.h"
+#include "camera.h"
 
 
 

src/color.cpp

@@ -22,7 +22,7 @@
 #include <d3d.h>
 
 #include "struct.h"
-#include "D3DEngine.h"
+#include "d3dengine.h"
 #include "language.h"
 #include "math3d.h"
 #include "event.h"
@@ -57,7 +57,6 @@ CColor::CColor(CInstanceManager* iMan) : CControl(iMan)
 
 CColor::~CColor()
 {
-	CControl::~CControl();
 }
 
 

src/color.h

@@ -12,13 +12,16 @@
 // * 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/.// color.h
+// * along with this program. If not, see  http://www.gnu.org/licenses/.
+
+// color.h
 
 #ifndef _COLOR_H_
 #define	_COLOR_H_
 
 
 #include "control.h"
+#include "d3dengine.h"
 
 
 class CD3DEngine;

src/compass.cpp

@@ -22,7 +22,7 @@
 #include <d3d.h>
 
 #include "struct.h"
-#include "D3DEngine.h"
+#include "d3dengine.h"
 #include "math3d.h"
 #include "event.h"
 #include "misc.h"
@@ -45,7 +45,6 @@ CCompass::CCompass(CInstanceManager* iMan) : CControl(iMan)
 
 CCompass::~CCompass()
 {
-	CControl::~CControl();
 }
 
 

src/compass.h

@@ -12,7 +12,9 @@
 // * 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/.// compass.h
+// * along with this program. If not, see  http://www.gnu.org/licenses/.
+
+// compass.h
 
 #ifndef _COMPASS_H_
 #define	_COMPASS_H_

src/control.cpp

@@ -22,7 +22,7 @@
 #include <d3d.h>
 
 #include "struct.h"
-#include "D3DEngine.h"
+#include "d3dengine.h"
 #include "language.h"
 #include "restext.h"
 #include "math3d.h"

src/control.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/.
 
+// control.h
+
 #ifndef _CONTROL_H_
 #define	_CONTROL_H_
 
 
+#include "text.h"
+#include "struct.h"
+#include "event.h"
+
+
 class CInstanceManager;
 class CEvent;
 class CD3DEngine;
@@ -25,8 +32,6 @@ class CRobotMain;
 class CParticule;
 class CSound;
 
-enum FontType;
-
 
 #define STATE_ENABLE		(1<<0)	// active
 #define STATE_CHECK		(1<<1)	// pressed

src/d3dapp.cpp

@@ -18,7 +18,7 @@
 #define D3D_OVERLOADS
 
 #include <windows.h>
-#include <pbt.h>
+#include <winuser.h>
 #include <mmsystem.h>
 #include <stdio.h>
 #include <direct.h>
@@ -27,8 +27,8 @@
 #include <dinput.h>
 
 #include "struct.h"
-#include "D3DTextr.h"
-#include "D3DEngine.h"
+#include "d3dtextr.h"
+#include "d3dengine.h"
 #include "language.h"
 #include "event.h"
 #include "profile.h"
@@ -38,7 +38,7 @@
 #include "joystick.h"
 #include "robotmain.h"
 #include "sound.h"
-#include "D3DApp.h"
+#include "d3dapp.h"
 
 
 

src/d3dapp.h

@@ -14,7 +14,7 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// D3DApp.h
+// d3dapp.h
 
 
 #ifndef  _D3DAPP_H
@@ -23,22 +23,21 @@
 #define  D3D_OVERLOADS
 
 #include <d3d.h>
-#include "D3DFrame.h"
-#include "D3DEnum.h"
-#include "D3DUtil.h"
-#include "D3DRes.h"
 
+#include "d3dengine.h"
+#include "d3dframe.h"
+#include "d3denum.h"
+#include "d3dutil.h"
+#include "d3dres.h"
+#include "misc.h"
+#include "struct.h"
 
 
 class CInstanceManager;
 class CEvent;
-class CD3DEngine;
 class CRobotMain;
 class CSound;
 
-enum D3DMouse;
-enum Error;
-
 
 
 class CD3DApplication

src/d3dengine.cpp

@@ -23,11 +23,11 @@
 #include <math.h>
 
 #include "struct.h"
-#include "D3DApp.h"
-#include "D3DTextr.h"
-#include "D3DUtil.h"
-#include "D3DMath.h"
-#include "D3DEngine.h"
+#include "d3dapp.h"
+#include "d3dtextr.h"
+#include "d3dutil.h"
+#include "d3dmath.h"
+#include "d3dengine.h"
 #include "language.h"
 #include "iman.h"
 #include "event.h"
@@ -2045,7 +2045,7 @@ void CD3DEngine::SetViewParams(const D3DVECTOR &vEyePt,
 	m_eyeDirH = RotateAngle(vEyePt.x-vLookatPt.x, vEyePt.z-vLookatPt.z);
 	m_eyeDirV = RotateAngle(Length2d(vEyePt, vLookatPt), vEyePt.y-vLookatPt.y);
 
-	D3DUtil_SetViewMatrix(m_matView, (D3DVECTOR)vEyePt, (D3DVECTOR)vLookatPt, (D3DVECTOR)vUpVec);
+	D3DUtil_SetViewMatrix(m_matView, (D3DVECTOR&)vEyePt, (D3DVECTOR&)vLookatPt, (D3DVECTOR&)vUpVec);
 
 	if ( m_sound == 0 )
 	{

src/d3dengine.h

@@ -14,15 +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/.
 
-// D3DEngine.h
+// d3dengine.h
 
 #ifndef _D3DENGINE_H_
 #define	_D3DENGINE_H_
 
-#include "D3DApp.h"
-
+
+#include "struct.h"
 
 
+class CD3DApplication;
 class CInstanceManager;
 class CObject;
 class CLight;
@@ -82,7 +83,7 @@ enum D3DMouse
 	D3DMOUSEMOVEH	= 9,		// -
 	D3DMOUSEMOVEV	= 10,		// |
 	D3DMOUSEMOVED	= 11,		// /
-	D3DMOUSEMOVEI	= 12,		// \ 
+	D3DMOUSEMOVEI	= 12,		// \ //
 	D3DMOUSESCROLLL	= 13,		// <<
 	D3DMOUSESCROLLR	= 14,		// >>
 	D3DMOUSESCROLLU	= 15,		// ^

src/d3denum.cpp

@@ -25,9 +25,9 @@
 #include <windowsx.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "D3DEnum.h"
-#include "D3DUtil.h" // For DEBUG_MSG
-#include "D3DRes.h"  // For dialog controls
+#include "d3denum.h"
+#include "d3dutil.h" // For DEBUG_MSG
+#include "d3dres.h"  // For dialog controls
 
 
 
@@ -177,7 +177,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName,
         return D3DENUMRET_OK;
 
     // Find a 640x480x16 mode for the default fullscreen mode
-    for( i=0; i<pDeviceInfo->dwNumModes; i++ )
+    for( DWORD i=0; i<pDeviceInfo->dwNumModes; i++ )
     {
         if( ( pDeviceInfo->pddsdModes[i].dwWidth == 640 ) &&
             ( pDeviceInfo->pddsdModes[i].dwHeight == 480 ) &&
@@ -435,7 +435,7 @@ static VOID UpdateDialogControls( HWND hDlg, D3DEnum_DeviceInfo* pCurrentDevice,
 // Name: ChangeDeviceProc()
 // Desc: Windows message handling function for the device select dialog
 //-----------------------------------------------------------------------------
-static BOOL CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, 
+static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, 
                                        LPARAM lParam )
 {
     static D3DEnum_DeviceInfo** ppDeviceArg;

src/d3dframe.cpp

@@ -25,8 +25,8 @@
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "D3DFrame.h"
-#include "D3DUtil.h"
+#include "d3dframe.h"
+#include "d3dutil.h"
 
 
 

src/d3dmath.cpp

@@ -25,7 +25,7 @@
 #define STRICT
 #include <math.h>
 #include <stdio.h>
-#include "D3DMath.h"
+#include "d3dmath.h"
 
 
 

src/d3dtextr.cpp

@@ -29,8 +29,8 @@
 #define STRICT
 #include <tchar.h>
 #include <stdio.h>
-#include "D3DTextr.h"
-#include "D3DUtil.h"
+#include "d3dtextr.h"
+#include "d3dutil.h"
 #include "language.h"
 #include "misc.h"
 

src/d3dutil.cpp

@@ -27,7 +27,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "D3DUtil.h"
+#include "d3dutil.h"