diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-03-23 21:02:53 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-03-23 21:02:53 +0100 |
commit | fe7a90ac34de28e30863a1257319f85a5e662286 (patch) | |
tree | f0aa10e228ff779f77ad1a8aeb5257388ad1c084 /src/d3denum.cpp | |
parent | 519efddc9b7b557e63403f090a244b3b7063e48f (diff) | |
download | colobot-fe7a90ac34de28e30863a1257319f85a5e662286.tar.gz colobot-fe7a90ac34de28e30863a1257319f85a5e662286.tar.bz2 colobot-fe7a90ac34de28e30863a1257319f85a5e662286.zip |
Fixed includes and GCC syntax errors
Diffstat (limited to 'src/d3denum.cpp')
-rw-r--r-- | src/d3denum.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d3denum.cpp b/src/d3denum.cpp index 3125e8a..bd125d6 100644 --- a/src/d3denum.cpp +++ b/src/d3denum.cpp @@ -25,9 +25,9 @@ #include <windowsx.h>
#include <stdio.h>
#include <tchar.h>
-#include "D3DEnum.h"
-#include "D3DUtil.h" // For DEBUG_MSG
-#include "D3DRes.h" // For dialog controls
+#include "d3denum.h"
+#include "d3dutil.h" // For DEBUG_MSG
+#include "d3dres.h" // For dialog controls
@@ -177,7 +177,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName, return D3DENUMRET_OK;
// Find a 640x480x16 mode for the default fullscreen mode
- for( i=0; i<pDeviceInfo->dwNumModes; i++ )
+ for( DWORD i=0; i<pDeviceInfo->dwNumModes; i++ )
{
if( ( pDeviceInfo->pddsdModes[i].dwWidth == 640 ) &&
( pDeviceInfo->pddsdModes[i].dwHeight == 480 ) &&
@@ -435,7 +435,7 @@ static VOID UpdateDialogControls( HWND hDlg, D3DEnum_DeviceInfo* pCurrentDevice, // Name: ChangeDeviceProc()
// Desc: Windows message handling function for the device select dialog
//-----------------------------------------------------------------------------
-static BOOL CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam,
+static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam,
LPARAM lParam )
{
static D3DEnum_DeviceInfo** ppDeviceArg;
|