diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-04-15 00:50:13 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-04-15 00:50:13 +0200 |
| commit | 011d86ed668cbbff5c7bfc5f7e88086acb849921 (patch) | |
| tree | a47f2a0d1f61f33455c5b53f9ef63741ca9b35d8 /src/shortcut.cpp | |
| parent | a0303105b616331778b61db06f9012f5c8970609 (diff) | |
| download | colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.tar.gz colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.tar.bz2 colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.zip | |
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 :)
Diffstat (limited to 'src/shortcut.cpp')
| -rw-r--r-- | src/shortcut.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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 <d3d.h>
#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();
}
|