From 61db98ac837ca8675da90ea55a36d2fb9791c116 Mon Sep 17 00:00:00 2001
From: chrisgregan <chris@snozbot.com>
Date: Wed, 27 Aug 2014 14:14:05 +0100
Subject: [PATCH] Fixed dialog layout. Initial coroutine say command.

---
 Assets/Fungus/Dialog/Commands/Say.cs          |  16 +++++-----
 Assets/Fungus/Dialog/Commands/SetDialog.cs    |   2 +-
 .../Fungus/Dialog/Editor/CharacterEditor.cs   |   1 +
 Assets/Fungus/Dialog/Scripts/Dialog.cs        |  28 +++++++++++++-----
 Assets/Shuttle/ShuttleGame.unity              | Bin 101652 -> 101884 bytes
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Assets/Fungus/Dialog/Commands/Say.cs b/Assets/Fungus/Dialog/Commands/Say.cs
index 2d801176..07c458cf 100644
--- a/Assets/Fungus/Dialog/Commands/Say.cs
+++ b/Assets/Fungus/Dialog/Commands/Say.cs
@@ -9,7 +9,7 @@ namespace Fungus.Script
 	[HelpText("Writes a line of story text to the dialog. A list of options can be specified for the player to choose from. Use a non-zero timeout to give the player a limited time to choose.")]
 	public class Say : FungusCommand 
 	{
-		static public Dialog dialogController;
+		static public Dialog dialog;
 
 		public Character character;
 		public string storyText;
@@ -30,7 +30,7 @@ namespace Fungus.Script
 
 		public override void OnEnter()
 		{
-			if (dialogController == null)
+			if (dialog == null)
 			{
 				Continue();
 				return;
@@ -44,9 +44,9 @@ namespace Fungus.Script
 
 			executionCount++;
 
-			dialogController.ShowDialog(true);
+			dialog.ShowDialog(true);
 
-			dialogController.SetCharacter(character);
+			dialog.SetCharacter(character);
 
 			if (options.Count > 0)
 			{
@@ -59,7 +59,7 @@ namespace Fungus.Script
 
 					dialogOption.onSelect = delegate {
 
-						dialogController.ShowDialog(false);
+						dialog.ShowDialog(false);
 
 						if (onSelectSequence == null)
 						{
@@ -74,12 +74,12 @@ namespace Fungus.Script
 					dialogOptions.Add(dialogOption);
 				}
 
-				dialogController.Say(storyText, dialogOptions);
+				dialog.Say(storyText, dialogOptions);
 			}
 			else
 			{
-				dialogController.Say(storyText, delegate {
-					dialogController.ShowDialog(false);
+				dialog.Say(storyText, delegate {
+					dialog.ShowDialog(false);
 					Continue();
 				});
 			}
diff --git a/Assets/Fungus/Dialog/Commands/SetDialog.cs b/Assets/Fungus/Dialog/Commands/SetDialog.cs
index 2c039ff5..8f6c0d98 100644
--- a/Assets/Fungus/Dialog/Commands/SetDialog.cs
+++ b/Assets/Fungus/Dialog/Commands/SetDialog.cs
@@ -16,7 +16,7 @@ namespace Fungus.Script
 		{
 			if (dialogController != null)
 			{
-				Say.dialogController = dialogController;
+				Say.dialog = dialogController;
 			}
 
 			Continue();
diff --git a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs
index 38a72658..2230ed19 100644
--- a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs
+++ b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs
@@ -16,6 +16,7 @@ namespace Fungus.Script
 			if (shader != null)
 			{
 				spriteMaterial = new Material(shader);
+				spriteMaterial.hideFlags = HideFlags.DontSave;
 			}
 		}
 
diff --git a/Assets/Fungus/Dialog/Scripts/Dialog.cs b/Assets/Fungus/Dialog/Scripts/Dialog.cs
index 9ec4b365..11b24e4a 100644
--- a/Assets/Fungus/Dialog/Scripts/Dialog.cs
+++ b/Assets/Fungus/Dialog/Scripts/Dialog.cs
@@ -107,27 +107,39 @@ namespace Fungus.Script
 				storyText.text = text;
 			}
 
-			// TODO: Wait for text to finish writing
-
-			ShowContinueIcon(true);
-			StartCoroutine(WaitForInput(onComplete));
+			StartCoroutine(WriteText(text, delegate {
+				ShowContinueIcon(true);
+				StartCoroutine(WaitForInput(onComplete));
+			}));
 		}
 
 		public void Say(string text, List<Option> options)
 		{
 			Clear();
 
+			ShowContinueIcon(false);
+
+			StartCoroutine(WriteText(text, delegate {
+				foreach (Option option in options)
+				{
+					AddOption(option.text, option.onSelect);
+				}
+			}));
+		}
+
+		IEnumerator WriteText(string text, Action onWritingComplete)
+		{
 			if (storyText != null)
 			{
 				storyText.text = text;
 			}
-			
-			ShowContinueIcon(false);
 
-			foreach (Option option in options)
+			if (onWritingComplete != null)
 			{
-				AddOption(option.text, option.onSelect);
+				onWritingComplete();
 			}
+
+			yield break;
 		}
 
 		IEnumerator WaitForInput(Action onComplete)
diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity
index 53da21f3fcf9d7cc6f560a714bcdc2872c3a9490..07b5b97d48956a07969e99575e76c64aedf4e2be 100644
GIT binary patch
delta 5144
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

delta 4916
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
KoG-P!ng0hmpN!4`