Browse Source

Merge pull request #421 from FungusGames/fix-execute-block

Rename non-coroutine Execute to StartExecute to be more descriptive
master
Chris Gregan 9 years ago
parent
commit
4d5820ead0
  1. 6
      Assets/Fungus/Flowchart/Scripts/Block.cs
  2. 4
      Assets/Fungus/Narrative/Scripts/MenuDialog.cs
  3. 3
      Assets/Tests/FungusScript/FungusTests.unity

6
Assets/Fungus/Flowchart/Scripts/Block.cs

@ -145,9 +145,9 @@ namespace Fungus
/// <summary> /// <summary>
/// Start a coroutine which executes all commands in the Block. Only one running instance of each Block is permitted. /// Start a coroutine which executes all commands in the Block. Only one running instance of each Block is permitted.
/// </summary> /// </summary>
public virtual void Execute() public virtual void StartExecution()
{ {
StartCoroutine(Execute(0, null)); StartCoroutine(Execute());
} }
/// <summary> /// <summary>
@ -155,7 +155,7 @@ namespace Fungus
/// </summary> /// </summary>
/// <param name="commandIndex">Index of command to start execution at</param> /// <param name="commandIndex">Index of command to start execution at</param>
/// <param name="onComplete">Delegate function to call when execution completes</param> /// <param name="onComplete">Delegate function to call when execution completes</param>
public virtual IEnumerator Execute(int commandIndex, Action onComplete) public virtual IEnumerator Execute(int commandIndex = 0, Action onComplete = null)
{ {
if (executionState != ExecutionState.Idle) if (executionState != ExecutionState.Idle)
{ {

4
Assets/Fungus/Narrative/Scripts/MenuDialog.cs

@ -130,7 +130,7 @@ namespace Fungus
gameObject.SetActive(false); gameObject.SetActive(false);
block.Execute(); block.StartExecution();
} }
}); });
@ -187,7 +187,7 @@ namespace Fungus
if (targetBlock != null) if (targetBlock != null)
{ {
targetBlock.Execute(); targetBlock.StartExecution();
} }
} }
} }

3
Assets/Tests/FungusScript/FungusTests.unity

@ -5064,8 +5064,7 @@ MonoBehaviour:
width: 1114 width: 1114
height: 859 height: 859
selectedBlock: {fileID: 942227027} selectedBlock: {fileID: 942227027}
selectedCommands: selectedCommands: []
- {fileID: 942227053}
variables: variables:
- {fileID: 942227029} - {fileID: 942227029}
- {fileID: 942227035} - {fileID: 942227035}

Loading…
Cancel
Save