diff --git a/Assets/Fungus/Flowchart/Scripts/Block.cs b/Assets/Fungus/Flowchart/Scripts/Block.cs index 8cc403d9..1c528820 100644 --- a/Assets/Fungus/Flowchart/Scripts/Block.cs +++ b/Assets/Fungus/Flowchart/Scripts/Block.cs @@ -145,9 +145,9 @@ namespace Fungus /// /// Start a coroutine which executes all commands in the Block. Only one running instance of each Block is permitted. /// - public virtual void Execute() + public virtual void StartExecution() { - StartCoroutine(Execute(0, null)); + StartCoroutine(Execute()); } /// @@ -155,7 +155,7 @@ namespace Fungus /// /// Index of command to start execution at /// Delegate function to call when execution completes - public virtual IEnumerator Execute(int commandIndex, Action onComplete) + public virtual IEnumerator Execute(int commandIndex = 0, Action onComplete = null) { if (executionState != ExecutionState.Idle) { diff --git a/Assets/Fungus/Narrative/Scripts/MenuDialog.cs b/Assets/Fungus/Narrative/Scripts/MenuDialog.cs index 941a93d0..c4eb29d4 100644 --- a/Assets/Fungus/Narrative/Scripts/MenuDialog.cs +++ b/Assets/Fungus/Narrative/Scripts/MenuDialog.cs @@ -130,7 +130,7 @@ namespace Fungus gameObject.SetActive(false); - block.Execute(); + block.StartExecution(); } }); @@ -187,7 +187,7 @@ namespace Fungus if (targetBlock != null) { - targetBlock.Execute(); + targetBlock.StartExecution(); } } } diff --git a/Assets/Tests/FungusScript/FungusTests.unity b/Assets/Tests/FungusScript/FungusTests.unity index 2057ea62..a95c666e 100644 --- a/Assets/Tests/FungusScript/FungusTests.unity +++ b/Assets/Tests/FungusScript/FungusTests.unity @@ -5064,8 +5064,7 @@ MonoBehaviour: width: 1114 height: 859 selectedBlock: {fileID: 942227027} - selectedCommands: - - {fileID: 942227053} + selectedCommands: [] variables: - {fileID: 942227029} - {fileID: 942227035}