Include index on choice instances for convenience

inkle · Mar 2, 2016 · fb8388d · fb8388d
1 parent a79d9ce
commit fb8388d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ink-engine-runtime/ChoiceInstance.cs b/ink-engine-runtime/ChoiceInstance.cs
@@ -5,6 +5,7 @@ public class ChoiceInstance : Runtime.Object
 	{
         public string choiceText { get; set; }
         public string pathStringOnChoice { get { return choice.pathStringOnChoice; } }
+        public int choiceIndex { get; set; }
 
         internal Choice choice { get; private set; }
         internal bool hasBeenChosen { get; set; }

diff --git a/ink-engine-runtime/Story.cs b/ink-engine-runtime/Story.cs
@@ -29,7 +29,14 @@ public List<ChoiceInstance> currentChoices
 			get 
 			{
                 // Don't include invisible choices for external usage.
-                return _state.currentChoices.Where (c => !c.choice.isInvisibleDefault).ToList ();
+                var choices = new List<ChoiceInstance>();
+                foreach (var c in _state.currentChoices) {
+                    if (!c.choice.isInvisibleDefault) {
+                        c.choiceIndex = choices.Count;
+                        choices.Add (c);
+                    }
+                }
+                return choices;
 			}
 		}
 
@@ -579,7 +586,7 @@ bool PerformLogicAndFlowControl(Runtime.Object contentObj)
                 if (state.callStack.currentElement.type != pop.type || !state.callStack.canPop) {
 
                     var names = new Dictionary<PushPopType, string> ();
-                    names [PushPopType.Function] = "function return statement (~ ~ ~)";
+                    names [PushPopType.Function] = "function return statement (~ return)";
                     names [PushPopType.Tunnel] = "tunnel onwards statement (->->)";
 
                     string expected = names [state.callStack.currentElement.type];