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

fix crash

Browse Source
This commit is contained in:
FunkyFr3sh 2021-08-11 15:45:01 +02:00
parent f82667b656
commit 2b883cfccb
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/dd.h
View File

@ -127,7 +127,6 @@ typedef struct CNCDDRAW
BOOL d3d9linear; BOOL d3d9linear;
BOOL gdilinear; BOOL gdilinear;
int resolutions; int resolutions;
BOOL dinputhook;
BOOL armadahack; BOOL armadahack;
BOOL tshack; BOOL tshack;
BOOL cnchack; BOOL cnchack;

1
inc/hook.h
View File

@ -74,6 +74,7 @@ extern LOADLIBRARYEXWPROC real_LoadLibraryExW;
extern COCREATEINSTANCEPROC real_CoCreateInstance; extern COCREATEINSTANCEPROC real_CoCreateInstance;
extern int g_hook_method; extern int g_hook_method;
extern BOOL g_hook_dinput;
extern BOOL g_hook_active; extern BOOL g_hook_active;
void hook_init(); void hook_init();

2
src/config.c
View File

@ -54,7 +54,7 @@ void cfg_load()
g_ddraw->d3d9linear = cfg_get_bool("d3d9linear", TRUE); g_ddraw->d3d9linear = cfg_get_bool("d3d9linear", TRUE);
g_ddraw->gdilinear = cfg_get_bool("gdilinear", FALSE); g_ddraw->gdilinear = cfg_get_bool("gdilinear", FALSE);
g_ddraw->resolutions = cfg_get_int("resolutions", RESLIST_NORMAL); 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->armadahack = cfg_get_bool("armadahack", FALSE);
g_ddraw->tshack = cfg_get_bool("tshack", FALSE); g_ddraw->tshack = cfg_get_bool("tshack", FALSE);

5
src/hook.c
View File

@ -14,6 +14,7 @@
#endif #endif
BOOL g_hook_active; BOOL g_hook_active;
BOOL g_hook_dinput;
int g_hook_method = 1; int g_hook_method = 1;
GETCURSORPOSPROC real_GetCursorPos = GetCursorPos; GETCURSORPOSPROC real_GetCursorPos = GetCursorPos;
@ -381,7 +382,7 @@ void hook_init()
BOOL initial_hook = !g_hook_active; BOOL initial_hook = !g_hook_active;
#ifdef _MSC_VER #ifdef _MSC_VER
if (initial_hook && g_ddraw->dinputhook) if (initial_hook && g_hook_dinput)
{ {
real_DirectInputCreateA = real_DirectInputCreateA =
(DIRECTINPUTCREATEAPROC)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA"); (DIRECTINPUTCREATEAPROC)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA");
@ -460,7 +461,7 @@ void hook_exit()
g_hook_active = FALSE; g_hook_active = FALSE;
#ifdef _MSC_VER #ifdef _MSC_VER
if (g_ddraw->dinputhook) if (g_hook_dinput)
{ {
if (real_DirectInputCreateA) if (real_DirectInputCreateA)
{ {