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

inkle · Aug 22, 2016 · 285d537 · 285d537
2 parents fbee47a + ea63335
commit 285d537
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/ink-engine-runtime/CallStack.cs b/ink-engine-runtime/CallStack.cs
@@ -56,7 +56,7 @@ public Element(PushPopType type, Container container, int contentIndex, bool inE
             public Element Copy()
             {
                 var copy = new Element (this.type, this.currentContainer, this.currentContentIndex, this.inExpressionEvaluation);
-                copy.temporaryVariables = this.temporaryVariables;
+                copy.temporaryVariables = new Dictionary<string,Object>(this.temporaryVariables);
                 return copy;
             }
         }
@@ -246,7 +246,7 @@ public void PopThread()
             if (canPopThread) {
                 _threads.Remove (currentThread);
             } else {
-                Debug.Fail ("Can't pop thread");
+				throw new System.Exception("Can't pop thread");
             }
         }
 
@@ -280,7 +280,7 @@ public void Pop(PushPopType? type = null)
                 callStack.RemoveAt (callStack.Count - 1);
                 return;
             } else {
-                Debug.Fail ("Mismatched push/pop in Callstack");
+				throw new System.Exception("Mismatched push/pop in Callstack");
             }
         }
 

diff --git a/ink-engine-runtime/Story.cs b/ink-engine-runtime/Story.cs
@@ -972,7 +972,7 @@ public bool HasFunction (string functionName)
         {
             try {
                 return ContentAtPath (new Path (functionName)) is Runtime.Container;
-            } catch (StoryException e) {
+            } catch {
                 return false;
             }
         }
@@ -1203,7 +1203,7 @@ object TryCoerce<T>(object value)
             if (value == null)
                 return null;
 
-            if (value.GetType () == typeof(T))
+            if (value is T)
                 return (T) value;
 
             if (value is float && typeof(T) == typeof(int)) {

diff --git a/ink-engine-runtime/StoryState.cs b/ink-engine-runtime/StoryState.cs
@@ -223,8 +223,8 @@ internal StoryState Copy()
         /// <summary>
         /// Object representation of full JSON state. Usually you should use
         /// LoadJson and ToJson since they serialise directly to string for you.
-        /// But, if your game uses Json.Net itself, it may be useful to get
-        /// the JToken so that you can integrate it into your own save format.
+        /// But it may be useful to get the object representation so that you
+        //// can integrate it into your own serialisation system.
         /// </summary>
         public Dictionary<string, object> jsonToken
         {