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, 7 insertions, 9 deletions

diff --git a/src/robotmain.h b/src/robotmain.h
index d7bafbd..bafa62a 100644
--- a/src/robotmain.h
+++ b/src/robotmain.h
@@ -20,6 +20,13 @@
 #define	_ROBOTMAIN_H_

 

 

+#include "d3dengine.h"

+#include "struct.h"

+#include "object.h"

+#include "mainmovie.h"

+#include "camera.h"

+#include "particule.h"

+

 

 enum Phase

 {

@@ -61,22 +68,18 @@ enum Phase
 

 

 class CInstanceManager;

-class CMainMovie;

 class CMainDialog;

 class CMainShort;

 class CMainMap;

 class CEvent;

 class CD3DEngine;

 class CLight;

-class CParticule;

 class CWater;

 class CCloud;

 class CBlitz;

 class CPlanet;

 class CTerrain;

-class CObject;

 class CModel;

-class CCamera;

 class CInterface;

 class CWindow;

 class CControl;

@@ -84,11 +87,6 @@ class CDisplayText;
 class CDisplayInfo;

 class CSound;

 

-enum ObjectType;

-enum CameraType;

-enum MainMovieType;

-enum ParticuleType;

-

 

 typedef struct

 {