fix: logic

Author: LiahMartens

tsw-controller-mod/ue4ss-mod/src/dllmain.cpp

@@ -188,37 +188,31 @@ class TSWControllerMod : public RC::CppUserModBase
 
         /* regex pattern to match {SIDE} with optional front/back placeholders */
         /* captures: front placeholder (optional), back placeholder (optional) */
-        std::regex side_placeholder_regex(R"(\{SIDE(:[^:]+)?(:[^:]+)?\})");
-        std::smatch match;
-        std::wregex_match(control_name.begin(), control_name.end(), match, side_placeholder_regex);
-
-        if (match.size() >= 1)
+        std::wregex side_placeholder_regex(STR(R"(\{SIDE(:[^:]+)?(:[^:]+)?\})"));
+        std::wsmatch side_placeholder_matches;
+        if (std::regex_match(control_name, side_placeholder_matches, side_placeholder_regex))
         {
-            std::size_t placeholder_start = match[0].position();
-            std::size_t placeholder_end = match[0].position() + match[0].length();
+            std::size_t placeholder_start = side_placeholder_matches[0].first;
+            std::size_t placeholder_end = side_placeholder_matches[0].second;
 
-            /* determine which value to use based on train side */
             RC::StringType front_value = STR("F");
             RC::StringType back_value = STR("B");
 
-            /* extract front placeholder if specified (between first and second colon) */
-            if (match.size() >= 2)
+            if (side_placeholder_matches.length() >= 2)
             {
-                front_value = STR(match[1].str().substr(1));
+                front_value = side_placeholder_matches[1].str().substr(1);
             }
 
-            /* extract back placeholder if specified (after second colon) */
-            if (match.size() >= 3)
+            if (side_placeholder_matches.length() >= 3)
             {
-                back_value = STR(match[2].str().substr(1));
+                back_value = side_placeholder_matches[2].str().substr(1);
             }
 
-            /* select appropriate value based on train side */
+            /* determine which value to use based on train side */
             RC::StringType train_side_str = train_side == 0 ? front_value : back_value;
-
-            /* replace the placeholder with the selected value */
             control_name.replace(placeholder_start, placeholder_end - placeholder_start, train_side_str);
         }
+
         /* if no {SIDE} -> just return raw*/
         return control_name;
     }