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

use registry values for restoring display settings

Browse Source
This commit is contained in:
FunkyFr3sh 2020-09-30 09:50:52 +02:00
parent cbd40d5c32
commit 07d0e234c9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ddraw.rc
View File

@ -4,7 +4,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_BUILD 6 #define VERSION_BUILD 6
#define VERSION_REVISION 1 #define VERSION_REVISION 2
#define VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION #define VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION
#define VERSION_STRING ver_str(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION) #define VERSION_STRING ver_str(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION)

8
src/main.c
View File

@ -583,7 +583,7 @@ HRESULT __stdcall ddraw_RestoreDisplayMode(IDirectDrawImpl *This)
if(!ddraw->windowed) if(!ddraw->windowed)
{ {
if (!Direct3D9Active) if (!Direct3D9Active)
ChangeDisplaySettings(&This->mode, 0); ChangeDisplaySettings(NULL, 0);
} }
return DD_OK; return DD_OK;
@ -996,7 +996,7 @@ void ToggleFullscreen()
if (Direct3D9Active) if (Direct3D9Active)
Direct3D9_Reset(); Direct3D9_Reset();
else else
ChangeDisplaySettings(&ddraw->mode, ddraw->bnetActive ? CDS_FULLSCREEN : 0); ChangeDisplaySettings(NULL, ddraw->bnetActive ? CDS_FULLSCREEN : 0);
ddraw_SetDisplayMode(ddraw, ddraw->width, ddraw->height, ddraw->bpp); ddraw_SetDisplayMode(ddraw, ddraw->width, ddraw->height, ddraw->bpp);
mouse_lock(); mouse_lock();
@ -1463,7 +1463,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (!Direct3D9Active) if (!Direct3D9Active)
{ {
ShowWindow(ddraw->hWnd, SW_MINIMIZE); ShowWindow(ddraw->hWnd, SW_MINIMIZE);
ChangeDisplaySettings(&ddraw->mode, ddraw->bnetActive ? CDS_FULLSCREEN : 0); ChangeDisplaySettings(NULL, ddraw->bnetActive ? CDS_FULLSCREEN : 0);
} }
} }
} }
@ -1796,7 +1796,7 @@ ULONG __stdcall ddraw_Release(IDirectDrawImpl *This)
} }
else if (!ddraw->windowed) else if (!ddraw->windowed)
{ {
ChangeDisplaySettings(&This->mode, 0); ChangeDisplaySettings(NULL, 0);
} }
} }

2
src/settings.c
View File

@ -55,7 +55,7 @@ void Settings_Load()
HookingMethod = GetInt("hook", 4); HookingMethod = GetInt("hook", 4);
#endif #endif
ddraw->render.maxfps = GetInt("maxfps", -1); ddraw->render.maxfps = GetInt("maxfps", 60);
if (ddraw->render.maxfps) if (ddraw->render.maxfps)
ddraw->render.forcefps = GetBool("forcefps", FALSE); ddraw->render.forcefps = GetBool("forcefps", FALSE);