From ff6bad2495e997f24f56d84d65324890dc5d2b34 Mon Sep 17 00:00:00 2001 From: icex2 Date: Sun, 6 Oct 2019 21:31:51 +0200 Subject: [PATCH] iidxhook1/2 config: Remove deprecated use_d3d9_hooks param --- dist/iidx/iidxhook-09.conf | 3 --- dist/iidx/iidxhook-10.conf | 3 --- dist/iidx/iidxhook-11.conf | 3 --- dist/iidx/iidxhook-12.conf | 3 --- dist/iidx/iidxhook-13.conf | 3 --- src/main/iidxhook1/config-iidxhook1.c | 17 ----------------- src/main/iidxhook1/config-iidxhook1.h | 1 - src/main/iidxhook2/config-iidxhook2.c | 17 ----------------- src/main/iidxhook2/config-iidxhook2.h | 1 - .../iidxhook/iidxhook-config-iidxhook1-test.c | 5 ----- .../iidxhook/iidxhook-config-iidxhook2-test.c | 5 ----- 11 files changed, 61 deletions(-) diff --git a/dist/iidx/iidxhook-09.conf b/dist/iidx/iidxhook-09.conf index 69b47ed..c187bf3 100755 --- a/dist/iidx/iidxhook-09.conf +++ b/dist/iidx/iidxhook-09.conf @@ -43,9 +43,6 @@ gfx.scale_back_buffer_filter=none # Disable operator clock setting system clock time misc.disable_clock_set=false -# Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires d3d8to9 wrapper library to be used with this game. -misc.use_d3d9_hooks=false - # Stub calls to rteffect.dll (10th to DistorteD) misc.rteffect_stub=false diff --git a/dist/iidx/iidxhook-10.conf b/dist/iidx/iidxhook-10.conf index 8ee07be..0f2c9d7 100755 --- a/dist/iidx/iidxhook-10.conf +++ b/dist/iidx/iidxhook-10.conf @@ -43,9 +43,6 @@ gfx.scale_back_buffer_filter=none # Disable operator clock setting system clock time misc.disable_clock_set=false -# Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires d3d8to9 wrapper library to be used with this game. -misc.use_d3d9_hooks=false - # Stub calls to rteffect.dll (10th to DistorteD) misc.rteffect_stub=false diff --git a/dist/iidx/iidxhook-11.conf b/dist/iidx/iidxhook-11.conf index 2258ff5..d1b81be 100755 --- a/dist/iidx/iidxhook-11.conf +++ b/dist/iidx/iidxhook-11.conf @@ -43,9 +43,6 @@ gfx.scale_back_buffer_filter=none # Disable operator clock setting system clock time misc.disable_clock_set=false -# Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires d3d8to9 wrapper library to be used with this game. -misc.use_d3d9_hooks=false - # Stub calls to rteffect.dll (10th to DistorteD) misc.rteffect_stub=false diff --git a/dist/iidx/iidxhook-12.conf b/dist/iidx/iidxhook-12.conf index f39c8c1..cf1b441 100755 --- a/dist/iidx/iidxhook-12.conf +++ b/dist/iidx/iidxhook-12.conf @@ -43,9 +43,6 @@ gfx.scale_back_buffer_filter=none # Fix broken 3D background on Happy Sky's music select (if appearing completely white) misc.happy_sky_ms_bg_fix=false -# Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires d3d8to9 wrapper library to be used with this game. -misc.use_d3d9_hooks=false - # Disable operator clock setting system clock time misc.disable_clock_set=false diff --git a/dist/iidx/iidxhook-13.conf b/dist/iidx/iidxhook-13.conf index 051b2ed..037ae7e 100755 --- a/dist/iidx/iidxhook-13.conf +++ b/dist/iidx/iidxhook-13.conf @@ -43,9 +43,6 @@ gfx.scale_back_buffer_filter=none # Fix broken 3D background on DistorteD's music select (if appearing completely black) misc.distorted_ms_bg_fix=false -# Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires d3d8to9 wrapper library to be used with this game. -misc.use_d3d9_hooks=false - # Disable operator clock setting system clock time misc.disable_clock_set=false diff --git a/src/main/iidxhook1/config-iidxhook1.c b/src/main/iidxhook1/config-iidxhook1.c index 6119156..8d68a50 100644 --- a/src/main/iidxhook1/config-iidxhook1.c +++ b/src/main/iidxhook1/config-iidxhook1.c @@ -5,10 +5,8 @@ #include "util/log.h" #define IIDXHOOK_CONFIG_MISC_HAPPY_SKY_MS_BG_FIX_KEY "misc.happy_sky_ms_bg_fix" -#define IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY "misc.use_d3d9_hooks" #define IIDXHOOK_CONFIG_MISC_DEFAULT_HAPPY_SKY_MS_BG_FIX_VALUE false -#define IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE false void iidxhook_config_iidxhook1_init(struct cconfig* config) { @@ -17,12 +15,6 @@ void iidxhook_config_iidxhook1_init(struct cconfig* config) IIDXHOOK_CONFIG_MISC_DEFAULT_HAPPY_SKY_MS_BG_FIX_VALUE, "Fix broken 3D background on Happy Sky's music select (if appearing " "completely white)"); - - cconfig_util_set_bool(config, - IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY, - IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE, - "Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires " - " d3d8to9 wrapper library to be used with this game."); } void iidxhook_config_iidxhook1_get( @@ -37,13 +29,4 @@ void iidxhook_config_iidxhook1_get( "to default '%d'", IIDXHOOK_CONFIG_MISC_HAPPY_SKY_MS_BG_FIX_KEY, IIDXHOOK_CONFIG_MISC_DEFAULT_HAPPY_SKY_MS_BG_FIX_VALUE); } - - if (!cconfig_util_get_bool(config, - IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY, - &config_iidxhook1->use_d3d9_hooks, - IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE)) { - log_warning("Invalid value for key '%s' specified, fallback " - "to default '%d'", IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY, - IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE); - } } \ No newline at end of file diff --git a/src/main/iidxhook1/config-iidxhook1.h b/src/main/iidxhook1/config-iidxhook1.h index a39a7a5..e90ce0f 100644 --- a/src/main/iidxhook1/config-iidxhook1.h +++ b/src/main/iidxhook1/config-iidxhook1.h @@ -5,7 +5,6 @@ struct iidxhook_config_iidxhook1 { bool happy_sky_ms_bg_fix; - bool use_d3d9_hooks; }; void iidxhook_config_iidxhook1_init(struct cconfig* config); diff --git a/src/main/iidxhook2/config-iidxhook2.c b/src/main/iidxhook2/config-iidxhook2.c index f2859d4..7ab33a7 100644 --- a/src/main/iidxhook2/config-iidxhook2.c +++ b/src/main/iidxhook2/config-iidxhook2.c @@ -5,10 +5,8 @@ #include "util/log.h" #define IIDXHOOK_CONFIG_MISC_DISTORTED_MS_BG_FIX_KEY "misc.distorted_ms_bg_fix" -#define IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY "misc.use_d3d9_hooks" #define IIDXHOOK_CONFIG_MISC_DEFAULT_DISTORTED_MS_BG_FIX_VALUE false -#define IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE false void iidxhook_config_iidxhook2_init(struct cconfig* config) { @@ -17,12 +15,6 @@ void iidxhook_config_iidxhook2_init(struct cconfig* config) IIDXHOOK_CONFIG_MISC_DEFAULT_DISTORTED_MS_BG_FIX_VALUE, "Fix broken 3D background on DistorteD's music select (if appearing " "completely black)"); - - cconfig_util_set_bool(config, - IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY, - IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE, - "Use d3d9 hooks instead of d3d8 to enable d3d9 hook features not available on d3d8 (e.g. upscaling). Requires " - " d3d8to9 wrapper library to be used with this game."); } void iidxhook_config_iidxhook2_get( @@ -37,13 +29,4 @@ void iidxhook_config_iidxhook2_get( "to default '%d'", IIDXHOOK_CONFIG_MISC_DISTORTED_MS_BG_FIX_KEY, IIDXHOOK_CONFIG_MISC_DEFAULT_DISTORTED_MS_BG_FIX_VALUE); } - - if (!cconfig_util_get_bool(config, - IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY, - &config_iidxhook2->use_d3d9_hooks, - IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE)) { - log_warning("Invalid value for key '%s' specified, fallback " - "to default '%d'", IIDXHOOK_CONFIG_MISC_USE_D3D9_HOOKS_KEY, - IIDXHOOK_CONFIG_MISC_DEFAULT_USE_D3D9_HOOKS_VALUE); - } } \ No newline at end of file diff --git a/src/main/iidxhook2/config-iidxhook2.h b/src/main/iidxhook2/config-iidxhook2.h index ce1f4a5..be828ed 100644 --- a/src/main/iidxhook2/config-iidxhook2.h +++ b/src/main/iidxhook2/config-iidxhook2.h @@ -5,7 +5,6 @@ struct iidxhook_config_iidxhook2 { bool distorted_ms_bg_fix; - bool use_d3d9_hooks; }; void iidxhook_config_iidxhook2_init(struct cconfig* config); diff --git a/src/test/iidxhook/iidxhook-config-iidxhook1-test.c b/src/test/iidxhook/iidxhook-config-iidxhook1-test.c index 2e55834..a3954ef 100644 --- a/src/test/iidxhook/iidxhook-config-iidxhook1-test.c +++ b/src/test/iidxhook/iidxhook-config-iidxhook1-test.c @@ -18,7 +18,6 @@ static void test_config_iidxhook1_defaults() cconfig_finit(config); check_bool_false(config_iidxhook1.happy_sky_ms_bg_fix); - check_bool_false(config_iidxhook1.use_d3d9_hooks); } static void test_config_iidxhook1() @@ -31,14 +30,12 @@ static void test_config_iidxhook1() iidxhook_config_iidxhook1_init(config); cconfig_set2(config, "misc.happy_sky_ms_bg_fix", "true"); - cconfig_set2(config, "misc.use_d3d9_hooks", "true"); iidxhook_config_iidxhook1_get(&config_iidxhook1, config); cconfig_finit(config); check_bool_true(config_iidxhook1.happy_sky_ms_bg_fix); - check_bool_true(config_iidxhook1.use_d3d9_hooks); } static void test_config_iidxhook1_invalid_values() @@ -51,14 +48,12 @@ static void test_config_iidxhook1_invalid_values() iidxhook_config_iidxhook1_init(config); cconfig_set2(config, "misc.happy_sky_ms_bg_fix", "123"); - cconfig_set2(config, "misc.use_d3d9_hooks", "sss"); iidxhook_config_iidxhook1_get(&config_iidxhook1, config); cconfig_finit(config); check_bool_false(config_iidxhook1.happy_sky_ms_bg_fix); - check_bool_false(config_iidxhook1.use_d3d9_hooks); } TEST_MODULE_BEGIN("iidxhook-config-iidxhook1") diff --git a/src/test/iidxhook/iidxhook-config-iidxhook2-test.c b/src/test/iidxhook/iidxhook-config-iidxhook2-test.c index f14ebed..5a5f597 100644 --- a/src/test/iidxhook/iidxhook-config-iidxhook2-test.c +++ b/src/test/iidxhook/iidxhook-config-iidxhook2-test.c @@ -18,7 +18,6 @@ static void test_config_iidxhook2_defaults() cconfig_finit(config); check_bool_false(config_iidxhook2.distorted_ms_bg_fix); - check_bool_false(config_iidxhook2.use_d3d9_hooks); } static void test_config_iidxhook2() @@ -31,14 +30,12 @@ static void test_config_iidxhook2() iidxhook_config_iidxhook2_init(config); cconfig_set2(config, "misc.distorted_ms_bg_fix", "true"); - cconfig_set2(config, "misc.use_d3d9_hooks", "true"); iidxhook_config_iidxhook2_get(&config_iidxhook2, config); cconfig_finit(config); check_bool_true(config_iidxhook2.distorted_ms_bg_fix); - check_bool_true(config_iidxhook2.use_d3d9_hooks); } static void test_config_iidxhook2_invalid_values() @@ -51,14 +48,12 @@ static void test_config_iidxhook2_invalid_values() iidxhook_config_iidxhook2_init(config); cconfig_set2(config, "misc.distorted_ms_bg_fix", "123"); - cconfig_set2(config, "misc.use_d3d9_hooks", "sss"); iidxhook_config_iidxhook2_get(&config_iidxhook2, config); cconfig_finit(config); check_bool_false(config_iidxhook2.distorted_ms_bg_fix); - check_bool_false(config_iidxhook2.use_d3d9_hooks); } TEST_MODULE_BEGIN("iidxhook-config-iidxhook2")