From d929cdf7c8477f4fb1c150a7cc9b9e5ca1210f3a Mon Sep 17 00:00:00 2001
From: bicarus-dev <202771338+bicarus-dev@users.noreply.github.com>
Date: Mon, 25 May 2026 17:30:38 -0700
Subject: [PATCH] clean up for release

---
 src/spice2x/launcher/options.cpp | 44 ++++++++++++++++----------------
 src/spice2x/launcher/options.h   |  4 +--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/spice2x/launcher/options.cpp b/src/spice2x/launcher/options.cpp
index 032b4dc..ce88348 100644
--- a/src/spice2x/launcher/options.cpp
+++ b/src/spice2x/launcher/options.cpp
@@ -156,6 +156,28 @@ static const std::vector<OptionDefinition> OPTION_DEFINITIONS = {
         .category = "Network (Advanced)",
         .sensitive = true,
     },
+    {
+        // AutoPinMacroTrigger0
+        .title = "Player 1 PIN Macro Auto Trigger on Log",
+        .name = "autopinmacrotrigger0",
+        .desc =
+            "Substring matched against game log output to detect when Player 1's PIN entry "
+            "screen is ready. When the substring appears in any log line, the PIN macro is "
+            "typed for Player 1 only. Leave blank to disable auto-trigger for P1.",
+        .type = OptionType::Text,
+        .category = "Network (Advanced)",
+    },
+    {
+        // AutoPinMacroTrigger1
+        .title = "Player 2 PIN Macro Auto Trigger on Log",
+        .name = "autopinmacrotrigger1",
+        .desc =
+            "Substring matched against game log output to detect when Player 2's PIN entry "
+            "screen is ready. When the substring appears in any log line, the PIN macro is "
+            "typed for Player 2 only. Leave blank to disable auto-trigger for P2.",
+        .type = OptionType::Text,
+        .category = "Network (Advanced)",
+    },
     {
         .title = "Windowed Mode",
         .name = "w",
@@ -2490,28 +2512,6 @@ static const std::vector<OptionDefinition> OPTION_DEFINITIONS = {
             {"both", ""},
         },
     },
-    {
-        // AutoPinMacroTrigger0
-        .title = "Auto PIN Macro Trigger Log String (P1)",
-        .name = "autopinmacrotrigger0",
-        .desc =
-            "Substring matched against game log output to detect when Player 1's PIN entry "
-            "screen is ready. When the substring appears in any log line, the PIN macro is "
-            "typed for Player 1 only. Leave blank to disable auto-trigger for P1.",
-        .type = OptionType::Text,
-        .category = "Network (Advanced)",
-    },
-    {
-        // AutoPinMacroTrigger1
-        .title = "Auto PIN Macro Trigger Log String (P2)",
-        .name = "autopinmacrotrigger1",
-        .desc =
-            "Substring matched against game log output to detect when Player 2's PIN entry "
-            "screen is ready. When the substring appears in any log line, the PIN macro is "
-            "typed for Player 2 only. Leave blank to disable auto-trigger for P2.",
-        .type = OptionType::Text,
-        .category = "Network (Advanced)",
-    },
     {
         // spice2x_LowLatencySharedAudio
         .title = "Low Latency Shared Audio",
diff --git a/src/spice2x/launcher/options.h b/src/spice2x/launcher/options.h
index 61f3e56..c250cb4 100644
--- a/src/spice2x/launcher/options.h
+++ b/src/spice2x/launcher/options.h
@@ -20,6 +20,8 @@ namespace launcher {
             Player2Card,
             Player1PinMacro,
             Player2PinMacro,
+            AutoPinMacroTrigger0,
+            AutoPinMacroTrigger1,
             WindowedMode,
             InjectHook,
             EarlyInjectHook,
@@ -255,8 +257,6 @@ namespace launcher {
             IIDXSubMonitorOverride,
             spice2x_IIDXEmulateSubscreenKeypadTouch,
             spice2x_AutoCard,
-            AutoPinMacroTrigger0,
-            AutoPinMacroTrigger1,
             spice2x_LowLatencySharedAudio,
             spice2x_TapeLedAlgorithm,
             spice2x_NoNVAPI,