mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-24 17:49:52 +01:00
some tweak for last commit
This commit is contained in:
parent
aca18912b3
commit
1a5fe96b28
17
src/dd.c
17
src/dd.c
@ -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)
|
if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
|
||||||
{
|
{
|
||||||
/* everything failed, use windowed/borderless mode instead */
|
/* everything failed, use windowed/borderless mode instead */
|
||||||
|
ChangeDisplaySettings(NULL, 0);
|
||||||
|
|
||||||
g_ddraw->render.width = g_ddraw->width;
|
g_ddraw->render.width = g_ddraw->width;
|
||||||
g_ddraw->render.height = g_ddraw->height;
|
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;
|
g_ddraw->windowed = TRUE;
|
||||||
|
|
||||||
if (g_ddraw->render.width <= real_GetSystemMetrics(SM_CXSCREEN) &&
|
if (g_ddraw->render.width <= g_ddraw->mode.dmPelsWidth &&
|
||||||
g_ddraw->render.height <= real_GetSystemMetrics(SM_CYSCREEN))
|
g_ddraw->render.height <= g_ddraw->mode.dmPelsHeight)
|
||||||
{
|
{
|
||||||
/* Switch to borderless mode if window fits into screen */
|
/* Switch to borderless mode if window fits into screen */
|
||||||
g_ddraw->fullscreen = TRUE;
|
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
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user