From 7b70ec2297acabed2773de5079081881fd790aad Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Thu, 8 Aug 2019 07:13:53 +0200
Subject: [PATCH] temp changes

---
 inc/main.h  |  2 +-
 src/main.c  |  2 +-
 src/mouse.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/main.h b/inc/main.h
index 7a81d2d..19b8e5f 100644
--- a/inc/main.h
+++ b/inc/main.h
@@ -126,7 +126,7 @@ typedef struct IDirectDrawImpl
     BOOL hidecursor;
     BOOL accurateTimers;
     BOOL bnetActive;
-    BOOL bnetD3d9Fullscreen;
+    BOOL bnetWasFullscreen;
     SpeedLimiter ticksLimiter;
     SpeedLimiter flipLimiter;
     SpeedLimiter fpsLimiter;
diff --git a/src/main.c b/src/main.c
index 41eef82..9d3bb14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -944,7 +944,7 @@ HRESULT __stdcall ddraw_SetDisplayMode2(IDirectDrawImpl *This, DWORD width, DWOR
 
 void ToggleFullscreen()
 {
-    if (ddraw->bnetActive && ddraw->renderer == render_d3d9_main)
+    if (ddraw->bnetActive)
         return;
 
     if (ddraw->windowed)
diff --git a/src/mouse.c b/src/mouse.c
index 34c9d22..4d00de1 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -193,7 +193,7 @@ void mouse_lock()
 
         if (ddraw->handlemouse)
         {
-            //SetCapture(ddraw->hWnd);
+            SetCapture(ddraw->hWnd);
             real_ClipCursor(&rc);
             while (real_ShowCursor(FALSE) > 0);
         }
@@ -258,7 +258,7 @@ void mouse_unlock()
         }
 
         real_ClipCursor(NULL);
-        //ReleaseCapture();
+        ReleaseCapture();
         
         real_SetCursorPos(
             rc.left + ddraw->render.viewport.x + (ddraw->cursor.x * ddraw->render.scaleW), 
@@ -435,10 +435,10 @@ BOOL WINAPI fake_DestroyWindow(HWND hWnd)
             ddraw->bnetActive = FALSE;
             mouse_lock();
 
-            if (ddraw->windowed && ddraw->bnetD3d9Fullscreen && ddraw->renderer == render_d3d9_main)
+            if (ddraw->windowed && ddraw->bnetWasFullscreen)
             {
                 ToggleFullscreen();
-                ddraw->bnetD3d9Fullscreen = FALSE;
+                ddraw->bnetWasFullscreen = FALSE;
             }
         }
     }
@@ -454,10 +454,10 @@ HWND WINAPI fake_CreateWindowExA(
     {
         if (!ddraw->bnetActive)
         {
-            if (!ddraw->windowed && !ddraw->bnetD3d9Fullscreen && ddraw->renderer == render_d3d9_main)
+            if (!ddraw->windowed && !ddraw->bnetWasFullscreen)
             {
                 ToggleFullscreen();
-                ddraw->bnetD3d9Fullscreen = TRUE;
+                ddraw->bnetWasFullscreen = TRUE;
             }
 
             ddraw->bnetActive = TRUE;