From 2bec555fe8540f836fcd1efbac1cdb68bd0b69f5 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Wed, 25 Dec 2024 04:29:22 +0100
Subject: [PATCH] remove direct3d_passthrough setting
---
inc/config.h | 1 -
src/IDirect3D/IDirect3D.c | 2 +-
src/IDirect3D/IDirect3D2.c | 2 +-
src/IDirect3D/IDirect3D3.c | 2 +-
src/config.c | 6 ------
5 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/inc/config.h b/inc/config.h
index 4e9731d..d1600d5 100644
--- a/inc/config.h
+++ b/inc/config.h
@@ -72,7 +72,6 @@ typedef struct CNCDDRAWCONFIG
BOOL flipclear;
BOOL rgb555;
BOOL no_dinput_hook;
- BOOL direct3d_passthrough;
BOOL center_cursor_fix;
char fake_mode[128];
BOOL lock_mouse_top_left;
diff --git a/src/IDirect3D/IDirect3D.c b/src/IDirect3D/IDirect3D.c
index 02ba607..e4b0ee5 100644
--- a/src/IDirect3D/IDirect3D.c
+++ b/src/IDirect3D/IDirect3D.c
@@ -67,7 +67,7 @@ HRESULT __stdcall IDirect3D__EnumDevices(
if (lpEnumDevicesCallback)
{
D3DDEVICEDESC desc = { 0 };
- //lpEnumDevicesCallback((GUID FAR*)&IID_IDirect3DNullDevice, "NULL", "NULL", &desc, &desc, lpUserArg);
+ lpEnumDevicesCallback((GUID FAR*)&GUID_NULL, "NULL", "NULL", &desc, &desc, lpUserArg);
}
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
diff --git a/src/IDirect3D/IDirect3D2.c b/src/IDirect3D/IDirect3D2.c
index 9e20a93..3a9d493 100644
--- a/src/IDirect3D/IDirect3D2.c
+++ b/src/IDirect3D/IDirect3D2.c
@@ -59,7 +59,7 @@ HRESULT __stdcall IDirect3D2__EnumDevices(
if (lpEnumDevicesCallback)
{
D3DDEVICEDESC desc = { 0 };
- //lpEnumDevicesCallback((GUID FAR*)&IID_IDirect3DNullDevice, "NULL", "NULL", &desc, &desc, lpUserArg);
+ //lpEnumDevicesCallback((GUID FAR*)&GUID_NULL, "NULL", "NULL", &desc, &desc, lpUserArg);
}
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
diff --git a/src/IDirect3D/IDirect3D3.c b/src/IDirect3D/IDirect3D3.c
index 0820630..6302bf6 100644
--- a/src/IDirect3D/IDirect3D3.c
+++ b/src/IDirect3D/IDirect3D3.c
@@ -59,7 +59,7 @@ HRESULT __stdcall IDirect3D3__EnumDevices(
if (lpEnumDevicesCallback)
{
D3DDEVICEDESC desc = { 0 };
- //lpEnumDevicesCallback((GUID FAR*)&IID_IDirect3DNullDevice, "NULL", "NULL", &desc, &desc, lpUserArg);
+ //lpEnumDevicesCallback((GUID FAR*)&GUID_NULL, "NULL", "NULL", &desc, &desc, lpUserArg);
}
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
diff --git a/src/config.c b/src/config.c
index 76dd487..48a967e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -85,7 +85,6 @@ void cfg_load()
GET_BOOL(g_config.flipclear, "flipclear", FALSE);
GET_BOOL(g_config.rgb555, "rgb555", FALSE);
GET_BOOL(g_config.no_dinput_hook, "no_dinput_hook", FALSE);
- GET_BOOL(g_config.direct3d_passthrough, "direct3d_passthrough", FALSE);
GET_BOOL(g_config.center_cursor_fix, "center_cursor_fix", FALSE);
GET_STRING("fake_mode", "", g_config.fake_mode, sizeof(g_config.fake_mode));
GET_BOOL(g_config.lock_mouse_top_left, "lock_mouse_top_left", FALSE);
@@ -329,7 +328,6 @@ static void cfg_create_ini()
"flipclear=false\n"
"rgb555=false\n"
"no_dinput_hook=false\n"
- "direct3d_passthrough=false\n"
"center_cursor_fix=false\n"
";fake_mode=640x480x32\n"
"lock_mouse_top_left=false\n"
@@ -1192,10 +1190,6 @@ static void cfg_create_ini()
"sirtech_hack=true\n"
"fix_alt_key_stuck=true\n"
"\n"
- "; Jedi Knight Dark Forces 2\n"
- "[JK]\n"
- "direct3d_passthrough=true\n"
- "\n"
"; Jeopardy! - NOT WORKING YET\n"
"[jeoppc]\n"
"singlecpu=false\n"