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

some tweaks for upscaling checks

Browse Source
This commit is contained in:
FunkyFr3sh 2021-10-31 21:19:16 +01:00
parent 49b5f808e6
commit 11c0353b82
1 changed files with 46 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/dd.c
View File

@ -491,29 +491,7 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
if (!g_ddraw->windowed) if (!g_ddraw->windowed)
{ {
/* Making sure the chosen resolution is valid */ /* Making sure the chosen resolution is valid */
int old_width = g_ddraw->render.width;
int old_height = g_ddraw->render.height;
if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
{
/* fail... compare resolutions */
if (g_ddraw->render.width > g_ddraw->mode.dmPelsWidth ||
g_ddraw->render.height > g_ddraw->mode.dmPelsHeight)
{
/* Try without upscaling */
g_ddraw->render.width = g_ddraw->width;
g_ddraw->render.height = g_ddraw->height;
g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width;
g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height;
if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
{
/* chosen game resolution higher than current resolution, use windowed mode for this case */
g_ddraw->windowed = TRUE;
}
}
else
{ {
/* Try without upscaling */ /* Try without upscaling */
g_ddraw->render.width = g_ddraw->width; g_ddraw->render.width = g_ddraw->width;
@ -539,10 +517,10 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
/* try to get a resolution with the same aspect ratio as the requested resolution */ /* try to get a resolution with the same aspect ratio as the requested resolution */
BOOL found_res = util_get_lowest_resolution( BOOL found_res = util_get_lowest_resolution(
(float)old_width / old_height, (float)g_ddraw->width / g_ddraw->height,
&res, &res,
old_width + 1, /* don't return the original resolution since we tested that one already */ g_ddraw->width + 1, /* don't return the original resolution since we tested that one already */
old_height + 1, g_ddraw->height + 1,
g_ddraw->mode.dmPelsWidth, g_ddraw->mode.dmPelsWidth,
g_ddraw->mode.dmPelsHeight); g_ddraw->mode.dmPelsHeight);
@ -552,8 +530,8 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
found_res = util_get_lowest_resolution( found_res = util_get_lowest_resolution(
(float)g_ddraw->mode.dmPelsWidth / g_ddraw->mode.dmPelsHeight, (float)g_ddraw->mode.dmPelsWidth / g_ddraw->mode.dmPelsHeight,
&res, &res,
old_width, g_ddraw->width,
old_height, g_ddraw->height,
g_ddraw->mode.dmPelsWidth, g_ddraw->mode.dmPelsWidth,
g_ddraw->mode.dmPelsHeight); g_ddraw->mode.dmPelsHeight);
} }
@ -577,8 +555,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 mode instead */ /* everything failed, use windowed mode instead */
g_ddraw->render.width = old_width; g_ddraw->render.width = g_ddraw->width;
g_ddraw->render.height = old_height; g_ddraw->render.height = g_ddraw->height;
g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width;
g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height;
@ -590,7 +568,6 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
} }
} }
} }
}
g_ddraw->render.viewport.width = g_ddraw->render.width; g_ddraw->render.viewport.width = g_ddraw->render.width;
g_ddraw->render.viewport.height = g_ddraw->render.height; g_ddraw->render.viewport.height = g_ddraw->render.height;