From cc43ca7777f891672eea7d16b65ef366957b21f3 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 25 Aug 2015 16:13:29 +0100 Subject: [PATCH] Renamed Fade Out to Fade When Done MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit More descriptive and doesn’t alias the old Fade Out property (meaning has changed). --- Assets/Fungus/Narrative/Editor/SayEditor.cs | 6 +++--- Assets/Fungus/Narrative/Scripts/Commands/Say.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/Fungus/Narrative/Editor/SayEditor.cs b/Assets/Fungus/Narrative/Editor/SayEditor.cs index 9f5e6518..273b50c9 100644 --- a/Assets/Fungus/Narrative/Editor/SayEditor.cs +++ b/Assets/Fungus/Narrative/Editor/SayEditor.cs @@ -78,7 +78,7 @@ namespace Fungus protected SerializedProperty showAlwaysProp; protected SerializedProperty showCountProp; protected SerializedProperty extendPreviousProp; - protected SerializedProperty fadeOutProp; + protected SerializedProperty fadeWhenDoneProp; protected SerializedProperty waitForClickProp; protected SerializedProperty setSayDialogProp; @@ -95,7 +95,7 @@ namespace Fungus showAlwaysProp = serializedObject.FindProperty("showAlways"); showCountProp = serializedObject.FindProperty("showCount"); extendPreviousProp = serializedObject.FindProperty("extendPrevious"); - fadeOutProp = serializedObject.FindProperty("fadeOut"); + fadeWhenDoneProp = serializedObject.FindProperty("fadeWhenDone"); waitForClickProp = serializedObject.FindProperty("waitForClick"); setSayDialogProp = serializedObject.FindProperty("setSayDialog"); @@ -188,7 +188,7 @@ namespace Fungus rightButton.fontSize = 10; rightButton.font = EditorStyles.toolbarButton.font; - EditorGUILayout.PropertyField(fadeOutProp); + EditorGUILayout.PropertyField(fadeWhenDoneProp); EditorGUILayout.PropertyField(waitForClickProp); EditorGUILayout.PropertyField(setSayDialogProp); diff --git a/Assets/Fungus/Narrative/Scripts/Commands/Say.cs b/Assets/Fungus/Narrative/Scripts/Commands/Say.cs index ad8ac87e..2cefe526 100644 --- a/Assets/Fungus/Narrative/Scripts/Commands/Say.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/Say.cs @@ -37,7 +37,7 @@ namespace Fungus public bool extendPrevious = false; [Tooltip("Fade out the dialog box when writing has finished and not waiting for input.")] - public bool fadeOut = true; + public bool fadeWhenDone = true; [Tooltip("Wait for player to click before continuing.")] public bool waitForClick = true; @@ -90,7 +90,7 @@ namespace Fungus string subbedText = flowchart.SubstituteVariables(displayText); - sayDialog.Say(subbedText, !extendPrevious, waitForClick, fadeOut, voiceOverClip, delegate { + sayDialog.Say(subbedText, !extendPrevious, waitForClick, fadeWhenDone, voiceOverClip, delegate { Continue(); }); }