From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski 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/shortcut.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/shortcut.cpp') diff --git a/src/shortcut.cpp b/src/shortcut.cpp index a0dbf21..21a6191 100644 --- a/src/shortcut.cpp +++ b/src/shortcut.cpp @@ -24,7 +24,7 @@ #include #include "struct.h" -#include "D3DEngine.h" +#include "d3dengine.h" #include "math3d.h" #include "event.h" #include "misc.h" @@ -38,7 +38,6 @@ CShortcut::CShortcut(CInstanceManager* iMan) : CControl(iMan) { - CControl::CControl(iMan); m_time = 0.0f; } @@ -46,7 +45,6 @@ CShortcut::CShortcut(CInstanceManager* iMan) : CControl(iMan) CShortcut::~CShortcut() { - CControl::~CControl(); } -- cgit v1.2.3-1-g7c22