Also support != on divert targets

Luminessa · May 6, 2018 · 1992b1b · 1992b1b
1 parent 575fdfa
commit 1992b1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/compiler/ParsedHierarchy/DivertTarget.cs b/compiler/ParsedHierarchy/DivertTarget.cs
@@ -36,7 +36,7 @@ public override void ResolveReferences (Story context)
                     // Only allowed to compare for equality
 
                     var binaryExprParent = usageParent as BinaryExpression;
-                    if (binaryExprParent.opName != "==") {
+                    if (binaryExprParent.opName != "==" && binaryExprParent.opName != "!=") {
                         badUsage = true;
                     } else {
                         if (!(binaryExprParent.leftExpression is DivertTarget || binaryExprParent.leftExpression is VariableReference)) {

diff --git a/ink-engine-runtime/NativeFunctionCall.cs b/ink-engine-runtime/NativeFunctionCall.cs
@@ -385,11 +385,15 @@ static void GenerateNativeFunctionsIfNecessary()
                 AddListUnaryOp (Count,  (x) => x.Count);
                 AddListUnaryOp (ValueOfList,  (x) => x.maxItem.Value);
 
-                // Special case: The only operation you can do on divert target values
+                // Special case: The only operations you can do on divert target values
                 BinaryOp<Path> divertTargetsEqual = (Path d1, Path d2) => {
                     return d1.Equals (d2) ? 1 : 0;
                 };
+                BinaryOp<Path> divertTargetsNotEqual = (Path d1, Path d2) => {
+                	return d1.Equals (d2) ? 0 : 1;
+                };
                 AddOpToNativeFunc (Equal, 2, ValueType.DivertTarget, divertTargetsEqual);
+                AddOpToNativeFunc (NotEquals, 2, ValueType.DivertTarget, divertTargetsNotEqual);
 
             }
         }