From 2b883cfccb27c6d5016e25af1eb54a4d5a78ed0c Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Wed, 11 Aug 2021 15:45:01 +0200
Subject: [PATCH] fix crash

---
 inc/dd.h     | 1 -
 inc/hook.h   | 1 +
 src/config.c | 2 +-
 src/hook.c   | 5 +++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/inc/dd.h b/inc/dd.h
index 9f6573f..8949cb5 100644
--- a/inc/dd.h
+++ b/inc/dd.h
@@ -127,7 +127,6 @@ typedef struct CNCDDRAW
     BOOL d3d9linear;
     BOOL gdilinear;
     int resolutions;
-    BOOL dinputhook;
     BOOL armadahack;
     BOOL tshack;
     BOOL cnchack;
diff --git a/inc/hook.h b/inc/hook.h
index f53e955..0623c07 100644
--- a/inc/hook.h
+++ b/inc/hook.h
@@ -74,6 +74,7 @@ extern LOADLIBRARYEXWPROC real_LoadLibraryExW;
 extern COCREATEINSTANCEPROC real_CoCreateInstance;
 
 extern int g_hook_method;
+extern BOOL g_hook_dinput;
 extern BOOL g_hook_active;
 
 void hook_init();
diff --git a/src/config.c b/src/config.c
index c50ccb6..68f2fe9 100644
--- a/src/config.c
+++ b/src/config.c
@@ -54,7 +54,7 @@ void cfg_load()
     g_ddraw->d3d9linear = cfg_get_bool("d3d9linear", TRUE);
     g_ddraw->gdilinear = cfg_get_bool("gdilinear", FALSE);
     g_ddraw->resolutions = cfg_get_int("resolutions", RESLIST_NORMAL);
-    g_ddraw->dinputhook = cfg_get_bool("dinputhook", FALSE);
+    g_hook_dinput = cfg_get_bool("dinputhook", FALSE);
 
     g_ddraw->armadahack = cfg_get_bool("armadahack", FALSE);
     g_ddraw->tshack = cfg_get_bool("tshack", FALSE);
diff --git a/src/hook.c b/src/hook.c
index a31afed..377b289 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -14,6 +14,7 @@
 #endif
 
 BOOL g_hook_active;
+BOOL g_hook_dinput;
 int g_hook_method = 1;
 
 GETCURSORPOSPROC real_GetCursorPos = GetCursorPos;
@@ -381,7 +382,7 @@ void hook_init()
         BOOL initial_hook = !g_hook_active;
 
 #ifdef _MSC_VER
-        if (initial_hook && g_ddraw->dinputhook)
+        if (initial_hook && g_hook_dinput)
         {
             real_DirectInputCreateA =
                 (DIRECTINPUTCREATEAPROC)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA");
@@ -460,7 +461,7 @@ void hook_exit()
         g_hook_active = FALSE;
 
 #ifdef _MSC_VER
-        if (g_ddraw->dinputhook)
+        if (g_hook_dinput)
         {
             if (real_DirectInputCreateA)
             {