Merge branch 'master' of https://github.com/inkle/ink

inkle · Oct 28, 2016 · 8d2874b · 8d2874b
2 parents e2f3d15 + ecc1183
commit 8d2874b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ink-engine-runtime/StoryState.cs b/ink-engine-runtime/StoryState.cs
@@ -697,7 +697,6 @@ internal List<Runtime.Object> PopEvaluationStack(int numberOfObjects)
 
         public void ForceEnd()
         {
-            currentContentObject = null;
 
             while (callStack.canPopThread)
                 callStack.PopThread ();
@@ -707,6 +706,7 @@ public void ForceEnd()
 
             currentChoices.Clear();
 
+            currentContentObject = null;
             previousContentObject = null;
 
             didSafeExit = true;

diff --git a/inklecate/InkParser/InkParser_Choices.cs b/inklecate/InkParser/InkParser_Choices.cs
@@ -91,7 +91,9 @@ protected Choice Choice()
             var tags = Parse (Tags);
             if (tags != null) {
                 if (hasWeaveStyleInlineBrackets) {
-                    innerContent.AddContent (tags);
+                    if (!innerContent)
+                        innerContent = new ContentList();
+                    innerContent.AddContent(tags);
                 } else {
                     startContent.AddContent (tags);
                 }

diff --git a/inklecate/ParsedHierarchy/DivertTarget.cs b/inklecate/ParsedHierarchy/DivertTarget.cs
@@ -47,7 +47,7 @@ public override void ResolveReferences (Story context)
                         if (!(binaryExprParent.leftExpression is DivertTarget || binaryExprParent.leftExpression is VariableReference)) {
                             badUsage = true;
                         }
-                        if (!(binaryExprParent.leftExpression is DivertTarget || binaryExprParent.leftExpression is VariableReference)) {
+                        if (!(binaryExprParent.rightExpression is DivertTarget || binaryExprParent.rightExpression is VariableReference)) {
                             badUsage = true;
                         }
                     }