A call to -> END resets the state of "previousContentObject", which a…

…ffects which containers get updated with visit counts and turn indices. Exposed ForceEnd() to allow the C# runtime to make this call if necessary.
y-lohse · Sep 9, 2016 · b822360 · b822360
1 parent 343f638
commit b822360
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ink-engine-runtime/Story.cs b/ink-engine-runtime/Story.cs
@@ -174,7 +174,7 @@ public void ResetErrors()
         /// </summary>
         public void ResetCallstack()
         {
-            _state.ForceEndFlow ();
+            _state.ForceEnd ();
         }
 
         void ResetGlobals()
@@ -844,7 +844,7 @@ bool PerformLogicAndFlowControl(Runtime.Object contentObj)
 
                 // Force flow to end completely
                 case ControlCommand.CommandType.End:
-                    state.ForceEndFlow ();
+                    state.ForceEnd ();
                     break;
 
                 default:
@@ -1771,7 +1771,7 @@ void AddError (string message, bool useEndLineNumber)
             state.AddError (message);
 
             // In a broken state don't need to know about any other errors.
-            state.ForceEndFlow ();
+            state.ForceEnd ();
         }
 
         void Assert(bool condition, string message = null, params object[] formatParams)

diff --git a/ink-engine-runtime/StoryState.cs b/ink-engine-runtime/StoryState.cs
@@ -672,7 +672,7 @@ internal Runtime.Object PeekEvaluationStack()
         }
 
 
-        internal void ForceEndFlow()
+        public void ForceEnd()
         {
             currentContentObject = null;
 
@@ -684,6 +684,8 @@ internal void ForceEndFlow()
 
             currentChoices.Clear();
 
+            previousContentObject = null;
+
             didSafeExit = true;
         }