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, 1 insertions, 5 deletions

diff --git a/src/scroll.cpp b/src/scroll.cpp
index b21db6d..1122ac5 100644
--- a/src/scroll.cpp
+++ b/src/scroll.cpp
@@ -24,7 +24,7 @@
 #include <d3d.h>

 

 #include "struct.h"

-#include "D3DEngine.h"

+#include "d3dengine.h"

 #include "math3d.h"

 #include "event.h"

 #include "misc.h"

@@ -39,8 +39,6 @@
 

 CScroll::CScroll(CInstanceManager* iMan) : CControl(iMan)

 {

-	CControl::CControl(iMan);

-

 	m_buttonUp   = 0;

 	m_buttonDown = 0;

 

@@ -60,8 +58,6 @@ CScroll::~CScroll()
 {

 	delete m_buttonUp;

 	delete m_buttonDown;

-

-	CControl::~CControl();

 }