fix ternary comparisons

OpenDreamProject · Jun 3, 2024 · b84148c · b84148c
1 parent 127d2ff
commit b84148c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/OpenDreamClient/Interface/DMF/IDMFProperty.cs b/OpenDreamClient/Interface/DMF/IDMFProperty.cs
@@ -10,6 +10,7 @@
 namespace OpenDreamClient.Interface.DMF;
 
 public interface IDMFProperty {
+    public bool Equals(string comparison);
     public string AsArg();
     public string AsEscaped();
     public string AsString();
@@ -82,6 +83,10 @@ public string AsRaw() {
     public override string ToString() {
         return AsRaw();
     }
+
+    public bool Equals(string comparison) {
+        return comparison.Equals(Value, StringComparison.InvariantCulture);
+    }
 }
 
 public struct DMFPropertyNum(float value) : IDMFProperty {
@@ -128,6 +133,11 @@ public string AsRaw() {
     public override string ToString() {
         return AsRaw();
     }
+
+    public bool Equals(string comparison) {
+        DMFPropertyNum comparisonNum = new(comparison);
+        return comparisonNum.Value == Value;
+    }
 }
 
 public struct DMFPropertyVec2 : IDMFProperty {
@@ -193,6 +203,11 @@ public string AsRaw() {
     public override string ToString() {
         return AsRaw();
     }
+
+    public bool Equals(string comparison) {
+        DMFPropertyVec2 comparisonVec = new(comparison);
+        return comparisonVec.X == X && comparisonVec.Y == Y;
+    }
 }
 
 public struct DMFPropertyColor : IDMFProperty {
@@ -254,6 +269,11 @@ public string AsRaw() {
     public override string ToString() {
         return AsRaw();
     }
+
+    public bool Equals(string comparison) {
+        DMFPropertyColor comparisonColor = new(comparison);
+        return comparisonColor.Value == Value;
+    }
 }
 
 public struct DMFPropertyBool(bool value) : IDMFProperty {
@@ -293,6 +313,11 @@ public string AsRaw() {
     public override string ToString() {
         return AsRaw();
     }
+
+    public bool Equals(string comparison) {
+        DMFPropertyBool comparisonBool = new(comparison);
+        return comparisonBool.Value == Value;
+    }
 }
 
 #region Serializers

diff --git a/OpenDreamClient/Interface/DreamInterfaceManager.cs b/OpenDreamClient/Interface/DreamInterfaceManager.cs
@@ -570,7 +570,7 @@ bool CheckParserErrors() {
                         if(conditionalElement is null)
                             _sawmill.Error($"Invalid element on ternary condition \"{elementId}\"");
                         else
-                            if(conditionalElement.TryGetProperty(winSet.Attribute, out var conditionalCheckValue) && conditionalCheckValue.AsRaw().Equals(winSet.Value, StringComparison.InvariantCultureIgnoreCase)) {
+                            if(conditionalElement.TryGetProperty(winSet.Attribute, out var conditionalCheckValue) && conditionalCheckValue.Equals(winSet.Value)) {
                                 foreach(DMFWinSet statement in winSet.TrueStatements) {
                                     string? statementElementId = statement.Element ?? elementId;
                                     InterfaceElement? statementElement = FindElementWithId(statementElementId);