From f3d887ebcfaec95a661dc7a35dab5219d7218827 Mon Sep 17 00:00:00 2001 From: bicarus-dev <202771338+bicarus-dev@users.noreply.github.com> Date: Sun, 5 Apr 2026 16:51:58 -0700 Subject: [PATCH] update strings --- src/spice2x/games/iidx/iidx.cpp | 16 ++++++++-------- src/spice2x/games/sdvx/sdvx.cpp | 18 +++++++++--------- src/spice2x/launcher/launcher.cpp | 6 +++--- src/spice2x/launcher/options.cpp | 8 ++++---- src/spice2x/launcher/options.h | 2 +- src/spice2x/overlay/windows/iidx_sub.cpp | 2 +- src/spice2x/overlay/windows/sdvx_sub.cpp | 2 +- src/spice2x/util/unity_player.cpp | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/spice2x/games/iidx/iidx.cpp b/src/spice2x/games/iidx/iidx.cpp index 038dda9..68a8f58 100644 --- a/src/spice2x/games/iidx/iidx.cpp +++ b/src/spice2x/games/iidx/iidx.cpp @@ -486,28 +486,28 @@ namespace games::iidx { log_fatal("iidx", "BAD MODEL NAME ERROR - TDJ specified, must be LDJ instead"); } - // check -monitor + TDJ mode + // check -dxmainadapter + TDJ mode if (!GRAPHICS_WINDOWED && D3D9_ADAPTER.has_value() && TDJ_MODE) { IIDX_TDJ_MONITOR_WARNING = true; log_warning( "iidx", - "\n\n!!! using -monitor option with TDJ is NOT recommended due to known !!!\n" - "!!! compatibility issues with the game !!!\n" + "\n\n" + "!!! using -dxmainadapter option with TDJ is NOT recommended !!!\n" + "!!! due to known compatibility issues with the game !!!\n" "!!! !!!\n" "!!! * game may launch in wrong resolution or refresh rate !!!\n" "!!! * touch / mouse input may stop working in subscreen / overlay !!!\n" "!!! !!!\n" - "!!! recommendation is to NOT use -monitor and instead set the !!!\n" - "!!! primary monitor in Windows settings before launching the game !!!\n\n" + "!!! recommendation is to use the Change Main Monitor (-mainmonitor) !!!\n" + "!!! option instead of -dxmainadapter !!!\n\n" ); deferredlogs::defer_error_messages({ - "-monitor option is NOT recommended when running with TDJ mode", + "-dxmainadapter option is NOT recommended when running with TDJ mode", " due to known compatibility issues with the game:", " * game may launch in wrong resolution or refresh rate", " * touch / mouse input may stop working in subscreen / overlay", - " recommended fix is to NOT use -monitor and instead set the primary", - " monitor in Windows settings before launching the game" + " use Change Main Monitor (-mainmonitor) option instead" }); } diff --git a/src/spice2x/games/sdvx/sdvx.cpp b/src/spice2x/games/sdvx/sdvx.cpp index 3fe54ab..68d9b46 100644 --- a/src/spice2x/games/sdvx/sdvx.cpp +++ b/src/spice2x/games/sdvx/sdvx.cpp @@ -350,28 +350,28 @@ namespace games::sdvx { } #ifdef SPICE64 // SDVX5+ specific code - // check -monitor + UFC mode + // check -dxmainadapter + UFC mode if (!GRAPHICS_WINDOWED && D3D9_ADAPTER.has_value() && is_valkyrie_model()) { SHOW_VM_MONITOR_WARNING = true; log_warning( - "sdvx", - "\n\n!!! using -monitor option with VM mode is NOT recommended due to !!!\n" - "!!! known compatibility issues with the game !!!\n" + "iidx", + "\n\n" + "!!! using -dxmainadapter option with Valkyrie mode is NOT !!!\n" + "!!! recommended due to known compatibility issues with the game !!!\n" "!!! !!!\n" "!!! * game may launch in wrong resolution or refresh rate !!!\n" "!!! * touch / mouse input may stop working in subscreen / overlay !!!\n" "!!! !!!\n" - "!!! recommendation is to NOT use -monitor and instead set the !!!\n" - "!!! primary monitor in Windows settings before launching the game !!!\n\n" + "!!! recommendation is to use the Change Main Monitor (-mainmonitor) !!!\n" + "!!! option instead of -dxmainadapter !!!\n\n" ); deferredlogs::defer_error_messages({ - "-monitor option is NOT recommended when running with Valkyrie mode", + "-dxmainadapter option is NOT recommended when running with Valkyrie mode", " due to known compatibility issues with the game:", " * game may launch in wrong resolution or refresh rate", " * touch / mouse input may stop working in subscreen / overlay", - " recommended fix is to NOT use -monitor and instead set the primary", - " monitor in Windows settings before launching the game" + " use Change Main Monitor (-mainmonitor) option instead" }); } #endif diff --git a/src/spice2x/launcher/launcher.cpp b/src/spice2x/launcher/launcher.cpp index 026b7f3..47c13f6 100644 --- a/src/spice2x/launcher/launcher.cpp +++ b/src/spice2x/launcher/launcher.cpp @@ -351,9 +351,9 @@ int main_implementation(int argc, char *argv[]) { GRAPHICS_FORCE_SINGLE_ADAPTER = true; GRAPHICS_PREVENT_SECONDARY_WINDOW = true; } - if (options[launcher::Options::DX9DisplayAdapter].is_active() && - options[launcher::Options::DX9DisplayAdapter].value_uint32() != D3DADAPTER_DEFAULT) { - D3D9_ADAPTER = options[launcher::Options::DX9DisplayAdapter].value_uint32(); + if (options[launcher::Options::DXDisplayAdapter].is_active() && + options[launcher::Options::DXDisplayAdapter].value_uint32() != D3DADAPTER_DEFAULT) { + D3D9_ADAPTER = options[launcher::Options::DXDisplayAdapter].value_uint32(); // when we fix up adapter numbers, we only fix the first adapter, and not any subsequent // adapters, so we can't deal with multi-monitor games diff --git a/src/spice2x/launcher/options.cpp b/src/spice2x/launcher/options.cpp index 52cdd68..63be70b 100644 --- a/src/spice2x/launcher/options.cpp +++ b/src/spice2x/launcher/options.cpp @@ -218,11 +218,11 @@ static const std::vector OPTION_DEFINITIONS = { .picker = OptionPickerType::Monitor, }, { - // DX9DisplayAdapter - .title = "DX9 Primary Display Adapter Override", + // DXDisplayAdapter + .title = "DX Primary Display Adapter Override", .name = "monitor", - .display_name = "dx9mainadapter", - .aliases = "dx9mainadapter", + .display_name = "dxmainadapter", + .aliases = "dxmainadapter", .desc = "Prefer to use Change Main Monitor option instead of this one.\n\n" "Sets the display that the game will be opened in, for multiple monitors.\n\n" "0 is the primary monitor, 1 is the second monitor, and so on.\n\n" diff --git a/src/spice2x/launcher/options.h b/src/spice2x/launcher/options.h index 32684b9..7b72a06 100644 --- a/src/spice2x/launcher/options.h +++ b/src/spice2x/launcher/options.h @@ -27,7 +27,7 @@ namespace launcher { CaptureCursor, ShowCursor, PrimaryMonitor, - DX9DisplayAdapter, + DXDisplayAdapter, GraphicsForceSingleAdapter, GraphicsForceRefresh, FullscreenResolution, diff --git a/src/spice2x/overlay/windows/iidx_sub.cpp b/src/spice2x/overlay/windows/iidx_sub.cpp index 4f8ea5a..53c99e5 100644 --- a/src/spice2x/overlay/windows/iidx_sub.cpp +++ b/src/spice2x/overlay/windows/iidx_sub.cpp @@ -14,7 +14,7 @@ namespace overlay::windows { if (GRAPHICS_IIDX_WSUB) { this->disabled_message = "Close this overlay and use the second window. (try ALT+TAB)"; } else if (games::iidx::IIDX_TDJ_MONITOR_WARNING) { - this->disabled_message = "TDJ mode subscreen overlay is not compatible with -monitor option."; + this->disabled_message = "TDJ mode subscreen overlay is not compatible with -dxmainadapter option; use -mainmonitor instead"; } float size = 0.5f; diff --git a/src/spice2x/overlay/windows/sdvx_sub.cpp b/src/spice2x/overlay/windows/sdvx_sub.cpp index 139140a..5c28f94 100644 --- a/src/spice2x/overlay/windows/sdvx_sub.cpp +++ b/src/spice2x/overlay/windows/sdvx_sub.cpp @@ -13,7 +13,7 @@ namespace overlay::windows { if (!games::sdvx::is_valkyrie_model()) { this->disabled_message = "Valkyrie Model mode is not enabled!"; } else if (games::sdvx::SHOW_VM_MONITOR_WARNING) { - this->disabled_message = "VM mode subscreen overlay is not compatible with -monitor option"; + this->disabled_message = "VM mode subscreen overlay is not compatible with -dxmainadapter option, use -mainmonitor instead"; } else if (GRAPHICS_WINDOWED) { if (GRAPHICS_PREVENT_SECONDARY_WINDOW) { this->disabled_message = "Subscreen has been disabled by the user (-sdvxnosub)."; diff --git a/src/spice2x/util/unity_player.cpp b/src/spice2x/util/unity_player.cpp index eff6736..71fe23f 100644 --- a/src/spice2x/util/unity_player.cpp +++ b/src/spice2x/util/unity_player.cpp @@ -38,7 +38,7 @@ namespace unity_utils { // monitor if (D3D9_ADAPTER.has_value()) { - args += fmt::format(" -monitor {}", D3D9_ADAPTER.value()); + args += fmt::format(" -dxmainadapter {}", D3D9_ADAPTER.value()); } return args;