backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-26 02:19:24 +01:00
Code Issues Projects Releases Activity

remove some devmode fullscreen checks since it works perfectly in windowed mode now

Browse Source
This commit is contained in:
FunkyFr3sh 2018-11-23 15:01:36 +01:00
parent 4cf4e55b87
commit 3b94b2f1d9
1 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.c
View File

@ -517,11 +517,9 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
BOOL maintas = ddraw->maintas; BOOL maintas = ddraw->maintas;
if(!This->windowed) if (!This->windowed)
{ {
// Making sure the chosen resolution is valid // Making sure the chosen resolution is valid
if(!This->devmode)
{
int oldWidth = This->render.width; int oldWidth = This->render.width;
int oldHeight = This->render.height; int oldHeight = This->render.height;
@ -569,7 +567,6 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
} }
} }
} }
}
if (!ddraw->handlemouse) if (!ddraw->handlemouse)
This->boxing = maintas = FALSE; This->boxing = maintas = FALSE;
@ -653,14 +650,11 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
if (This->renderer == render_d3d9_main) if (This->renderer == render_d3d9_main)
InitDirect3D9(); InitDirect3D9();
if(!This->devmode)
{
if (!Direct3D9Active && ChangeDisplaySettings(&This->render.mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) if (!Direct3D9Active && ChangeDisplaySettings(&This->render.mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
{ {
This->render.run = FALSE; This->render.run = FALSE;
return DDERR_INVALIDMODE; return DDERR_INVALIDMODE;
} }
}
if (ddraw->wine) if (ddraw->wine)
SetWindowLong(This->hWnd, GWL_STYLE, GetWindowLong(This->hWnd, GWL_STYLE) | WS_MINIMIZEBOX); SetWindowLong(This->hWnd, GWL_STYLE, GetWindowLong(This->hWnd, GWL_STYLE) | WS_MINIMIZEBOX);