From 6989cb806e7b13699cc2d1da360f4d1964cc77da Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Mon, 31 Jul 2023 10:42:02 +0200 Subject: [PATCH] remove dinput_show_cursor setting --- inc/dd.h | 1 - src/config.c | 5 +---- src/directinput.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/inc/dd.h b/inc/dd.h index fb87103..7aca2ef 100644 --- a/inc/dd.h +++ b/inc/dd.h @@ -140,7 +140,6 @@ typedef struct CNCDDRAW BOOL wine; HCURSOR old_cursor; int show_cursor_count; - BOOL dinput_show_cursor; BOOL allow_wmactivate; BOOL opengl_core; BOOL accurate_timers; diff --git a/src/config.c b/src/config.c index 0a7e671..827600a 100644 --- a/src/config.c +++ b/src/config.c @@ -46,7 +46,6 @@ void cfg_load() g_ddraw->d3d9_filter = cfg_get_int("d3d9_filter", FILTER_CUBIC); g_ddraw->d3d9on12 = cfg_get_bool("d3d9on12", FALSE); g_ddraw->resolutions = cfg_get_int("resolutions", RESLIST_NORMAL); - g_ddraw->dinput_show_cursor = cfg_get_bool("dinput_show_cursor", FALSE); g_ddraw->allow_wmactivate = cfg_get_bool("allow_wmactivate", FALSE); g_ddraw->guard_lines = cfg_get_int("guard_lines", 200); g_ddraw->max_resolutions = cfg_get_int("max_resolutions", 0); @@ -374,8 +373,7 @@ static void cfg_create_ini() "fixmousehook=false\n" "bpp=0\n" "rgb555=false\n" - "hook_peekmessage=false\n" - "dinput_show_cursor=false\n" + "hook_peekmessage=false\n" "no_dinput_hook=false\n" "\n" "\n" @@ -1027,7 +1025,6 @@ static void cfg_create_ini() "; RollerCoaster Tycoon\n" "[rct]\n" "no_dinput_hook=true\n" - "dinput_show_cursor=true\n" "singlecpu=false\n" "maxfps=0\n" "adjmouse=true\n" diff --git a/src/directinput.c b/src/directinput.c index 9dd1944..86be466 100644 --- a/src/directinput.c +++ b/src/directinput.c @@ -40,7 +40,7 @@ static HRESULT WINAPI fake_did_SetCooperativeLevel(IDirectInputDeviceA* This, HW { TRACE("DirectInput SetCooperativeLevel(This=%p, hwnd=%p, dwFlags=0x%08X)\n", This, hwnd, dwFlags); - if (This == g_mouse_device && g_ddraw && (dwFlags & DISCL_EXCLUSIVE) && !g_ddraw->dinput_show_cursor) + if (This == g_mouse_device && g_ddraw && (dwFlags & DISCL_EXCLUSIVE)) { if (g_mouse_locked || g_ddraw->devmode) {