Make RemoveOption Case-Insensitive

Deaod · Apr 6, 2024 · 16d226a · 16d226a
1 parent df89500
commit 16d226a
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/Classes/NewCTF.uc b/Classes/NewCTF.uc
@@ -436,22 +436,34 @@ event PlayerPawn Login(
     return Result;
 }
 
-function string RemoveOption(string Options, string ToRemove) {
+function string RemoveOptionSingle(string Option, string ToRemove) {
     local int Pos;
-    local string Result;
 
-    Pos = InStr(Options, "?"$ToRemove$"=");
+    Pos = InStr(Option, "=");
+    if ((Pos >= 0 && Left(Option, Pos) ~= ToRemove) || (Pos < 0 && Option ~= ToRemove)) {
+        return "";
+    } else {
+        return "?" $ Option;
+    }
+}
 
-    if (Pos < 0)
-        return Options; // nothing to remove;
+function string RemoveOption(string Options, string ToRemove) {
+    local int Pos;
+    local string Result, Option;
+
+    if (Left(Options, 1) == "?")
+        Options = Mid(Options, 1);
 
-    Result = Left(Options, Pos);
-    Options = Mid(Options, Pos + Len(ToRemove) + 2);
     Pos = InStr(Options, "?");
-    if (Pos < 0)
-        return Result;
 
-    return RemoveOption(Result $ Mid(Options, Pos), ToRemove); // recurse to find all occurrences
+    while(Pos >= 0) {
+        Result = Result $ RemoveOptionSingle(Left(Options, Pos), ToRemove);
+
+        Options = Mid(Options, Pos + 1);
+        Pos = InStr(Options, "?");
+    }
+
+    return Result $ RemoveOptionSingle(Options, ToRemove);
 }
 
 function Mutator FindWarmupMutator() {