From 07d0e234c9702d337731d89f4bfe38f095e0a8c4 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Wed, 30 Sep 2020 09:50:52 +0200
Subject: [PATCH] use registry values for restoring display settings

---
 ddraw.rc       | 2 +-
 src/main.c     | 8 ++++----
 src/settings.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ddraw.rc b/ddraw.rc
index e5737c6..db9d90d 100644
--- a/ddraw.rc
+++ b/ddraw.rc
@@ -4,7 +4,7 @@
 #define VERSION_MAJOR    1
 #define VERSION_MINOR    3
 #define VERSION_BUILD    6
-#define VERSION_REVISION 1  
+#define VERSION_REVISION 2  
 
 #define VERSION          VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION
 #define VERSION_STRING   ver_str(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION)
diff --git a/src/main.c b/src/main.c
index 36c7911..d93f9f1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -583,7 +583,7 @@ HRESULT __stdcall ddraw_RestoreDisplayMode(IDirectDrawImpl *This)
     if(!ddraw->windowed)
     {
         if (!Direct3D9Active)
-            ChangeDisplaySettings(&This->mode, 0);
+            ChangeDisplaySettings(NULL, 0);
     }
 
     return DD_OK;
@@ -996,7 +996,7 @@ void ToggleFullscreen()
         if (Direct3D9Active)
             Direct3D9_Reset();
         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);
         mouse_lock();
@@ -1463,7 +1463,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     if (!Direct3D9Active)
                     {
                         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)
             {
-                ChangeDisplaySettings(&This->mode, 0);
+                ChangeDisplaySettings(NULL, 0);
             }
         }
 
diff --git a/src/settings.c b/src/settings.c
index 2b84bdc..4d561b6 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -55,7 +55,7 @@ void Settings_Load()
     HookingMethod = GetInt("hook", 4);
 #endif
     
-    ddraw->render.maxfps = GetInt("maxfps", -1);
+    ddraw->render.maxfps = GetInt("maxfps", 60);
 
     if (ddraw->render.maxfps)
         ddraw->render.forcefps = GetBool("forcefps", FALSE);