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/window.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/window.cpp')
| -rw-r--r-- | src/window.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/window.cpp b/src/window.cpp index fe54be8..c42493a 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -24,7 +24,7 @@ #include <d3d.h>
#include "struct.h"
-#include "D3DEngine.h"
+#include "d3dengine.h"
#include "language.h"
#include "math3d.h"
#include "event.h"
@@ -60,8 +60,6 @@ CWindow::CWindow(CInstanceManager* iMan) : CControl(iMan) {
int i;
- CControl::CControl(iMan);
-
for ( i=0 ; i<MAXWINDOW ; i++ )
{
m_table[i] = 0;
@@ -92,7 +90,6 @@ CWindow::CWindow(CInstanceManager* iMan) : CControl(iMan) CWindow::~CWindow()
{
Flush();
- CControl::~CControl();
}
@@ -993,7 +990,7 @@ BOOL CWindow::EventProcess(const Event &event) else if ( ((flags & (1<<0)) && (flags & (1<<3))) ||
((flags & (1<<1)) && (flags & (1<<2))) )
{
- m_pressMouse = D3DMOUSEMOVEI; // \
+ m_pressMouse = D3DMOUSEMOVEI; // \ //
}
else if ( ((flags & (1<<0)) && (flags & (1<<1))) ||
((flags & (1<<2)) && (flags & (1<<3))) )
|