diff --git a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs index b9d48ba2..19908782 100644 --- a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs +++ b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs @@ -64,12 +64,6 @@ namespace Fungus [Tooltip("Description text displayed in the Fungus Script editor window")] public string description = ""; - /** - * Portrait Stage to use for this game. - */ - [Tooltip("Default stage to display portraits on")] - public PortraitStage defaultPortraitStage; - /** * Minimum time for each command to execute when runSlowInEditor is enabled. */ diff --git a/Assets/Fungus/Portrait/Editor/PortraitEditor.cs b/Assets/Fungus/Portrait/Editor/PortraitEditor.cs index 1452929d..505e7503 100644 --- a/Assets/Fungus/Portrait/Editor/PortraitEditor.cs +++ b/Assets/Fungus/Portrait/Editor/PortraitEditor.cs @@ -101,7 +101,6 @@ namespace Fungus } if (t.portraitStage == null) // If default portrait stage selected { - ps = t.GetFungusScript().defaultPortraitStage;; // Try to get game's default portrait stage if (t.portraitStage == null) // If no default specified, try to get any portrait stage in the scene { ps = GameObject.FindObjectOfType(); diff --git a/Assets/Fungus/Portrait/Editor/StageEditor.cs b/Assets/Fungus/Portrait/Editor/StageEditor.cs index ecc28e30..48a0bd22 100644 --- a/Assets/Fungus/Portrait/Editor/StageEditor.cs +++ b/Assets/Fungus/Portrait/Editor/StageEditor.cs @@ -65,7 +65,6 @@ namespace Fungus // Only show optional portrait fields once required fields have been filled... if (t.portraitStage != null) // Character is selected { - ps = t.GetFungusScript().defaultPortraitStage;; // Try to get game's default portrait stage if (t.portraitStage == null) // If no default specified, try to get any portrait stage in the scene { ps = GameObject.FindObjectOfType(); diff --git a/Assets/Fungus/Portrait/Scripts/Portrait.cs b/Assets/Fungus/Portrait/Scripts/Portrait.cs index 8c578327..4c3f50f9 100644 --- a/Assets/Fungus/Portrait/Scripts/Portrait.cs +++ b/Assets/Fungus/Portrait/Scripts/Portrait.cs @@ -119,7 +119,6 @@ namespace Fungus // Selected "use default Portrait Stage" if (portraitStage == null) // Default portrait stage selected { - portraitStage = GetFungusScript().defaultPortraitStage;; // Try to get game's default portrait stage if (portraitStage == null) // If no default specified, try to get any portrait stage in the scene { portraitStage = GameObject.FindObjectOfType(); diff --git a/Assets/Fungus/Portrait/Scripts/Stage.cs b/Assets/Fungus/Portrait/Scripts/Stage.cs index b91af16b..5e4e61c8 100644 --- a/Assets/Fungus/Portrait/Scripts/Stage.cs +++ b/Assets/Fungus/Portrait/Scripts/Stage.cs @@ -52,7 +52,6 @@ namespace Fungus // Selected "use default Portrait Stage" if (portraitStage == null) // Default portrait stage selected { - portraitStage = GetFungusScript().defaultPortraitStage;; // Try to get game's default portrait stage if (portraitStage == null) // If no default specified, try to get any portrait stage in the scene { portraitStage = GameObject.FindObjectOfType(); @@ -67,7 +66,6 @@ namespace Fungus // Selected "use default Portrait Stage" if (display == StageDisplayType.Swap) // Default portrait stage selected { - replacedPortraitStage = GetFungusScript().defaultPortraitStage;; // Try to get game's default portrait stage if (replacedPortraitStage == null) // If no default specified, try to get any portrait stage in the scene { replacedPortraitStage = GameObject.FindObjectOfType(); diff --git a/Assets/FungusExamples/Sherlock/TheExperiment.unity b/Assets/FungusExamples/Sherlock/TheExperiment.unity index d5ace940..4b8d7ee4 100644 --- a/Assets/FungusExamples/Sherlock/TheExperiment.unity +++ b/Assets/FungusExamples/Sherlock/TheExperiment.unity @@ -4035,10 +4035,9 @@ MonoBehaviour: height: 2818.85034 selectedSequence: {fileID: 1390555298} selectedCommands: - - {fileID: 1390555343} + - {fileID: 1390555345} variables: [] description: 'Example scene from Sherlock: The Game Is On' - defaultPortraitStage: {fileID: 0} runSlowDuration: 0 colorCommands: 1 hideComponents: 1 @@ -4094,7 +4093,7 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -2589.33252 + x: -2590.33252 y: -1077.83801 width: 120 height: 40