backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-15 06:04:49 +01:00
Code Issues Projects Releases Activity

some tweak for last commit

Browse Source
This commit is contained in:
FunkyFr3sh 2023-08-24 19:05:20 +02:00
parent aca18912b3
commit 1a5fe96b28
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dd.c
View File

@ -720,6 +720,8 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
{
/* everything failed, use windowed/borderless mode instead */
ChangeDisplaySettings(NULL, 0);
g_ddraw->render.width = g_ddraw->width;
g_ddraw->render.height = g_ddraw->height;
@ -728,11 +730,22 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
g_ddraw->windowed = TRUE;
if (g_ddraw->render.width <= real_GetSystemMetrics(SM_CXSCREEN) &&
g_ddraw->render.height <= real_GetSystemMetrics(SM_CYSCREEN))
if (g_ddraw->render.width <= g_ddraw->mode.dmPelsWidth &&
g_ddraw->render.height <= g_ddraw->mode.dmPelsHeight)
{
/* Switch to borderless mode if window fits into screen */
g_ddraw->fullscreen = TRUE;
border = FALSE;
g_ddraw->render.width = g_ddraw->mode.dmPelsWidth;
g_ddraw->render.height = g_ddraw->mode.dmPelsHeight;
g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width;
g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height;
/* prevent OpenGL from going automatically into fullscreen exclusive mode */
if (g_ddraw->renderer == ogl_render_main)
nonexclusive = TRUE;
}
else
{