From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sun, 15 Apr 2012 00:50:13 +0200
Subject: 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 :)
---
 src/object.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/object.h')

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!
-- 
cgit v1.2.3-1-g7c22