Pulled changes from test mingw branch

* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp

Successfully compiles under MinGW :)

1 files changed, 5 insertions, 6 deletions

diff --git a/src/object.h b/src/object.h
index 4a354f4..af7a3e4 100644
--- a/src/object.h
+++ b/src/object.h
@@ -20,12 +20,15 @@
 #define	_OBJECT_H_

 

 

+#include "d3dengine.h"

+#include "camera.h"

+#include "sound.h"

+

+

 class CInstanceManager;

-class CD3DEngine;

 class CLight;

 class CTerrain;

 class CWater;

-class CCamera;

 class CParticule;

 class CPhysics;

 class CBrain;

@@ -36,10 +39,6 @@ class CRobotMain;
 class CBotVar;

 class CScript;

 

-enum CameraType;

-enum Sound;

-enum D3DShadowType;

-

 

 

 // The father of all parts must always be the part number zero!