Browse Source

Handle Choose with no AddOption commands

master
chrisgregan 11 years ago
parent
commit
5f6ade578c
  1. 7
      Assets/Fungus/Dialog/Commands/Choose.cs
  2. 12
      Assets/Fungus/Dialog/Scripts/SayDialog.cs
  3. BIN
      Assets/Shuttle/ShuttleGame.unity

7
Assets/Fungus/Dialog/Commands/Choose.cs

@ -44,16 +44,15 @@ namespace Fungus.Script
activeDialog = dialog; activeDialog = dialog;
} }
dialog.ShowDialog(true);
dialog.SetCharacter(character);
if (options.Count == 0) if (options.Count == 0)
{ {
Continue(); Continue();
} }
else else
{ {
dialog.ShowDialog(true);
dialog.SetCharacter(character);
List<ChooseDialog.Option> dialogOptions = new List<ChooseDialog.Option>(); List<ChooseDialog.Option> dialogOptions = new List<ChooseDialog.Option>();
foreach (Option option in options) foreach (Option option in options)
{ {

12
Assets/Fungus/Dialog/Scripts/SayDialog.cs

@ -8,8 +8,6 @@ namespace Fungus.Script
public class SayDialog : Dialog public class SayDialog : Dialog
{ {
public Image continueImage;
public void Say(string text, Action onComplete) public void Say(string text, Action onComplete)
{ {
Clear(); Clear();
@ -20,7 +18,6 @@ namespace Fungus.Script
} }
StartCoroutine(WriteText(text, delegate { StartCoroutine(WriteText(text, delegate {
ShowContinueIcon(true);
StartCoroutine(WaitForInput(delegate { StartCoroutine(WaitForInput(delegate {
Clear(); Clear();
@ -37,15 +34,6 @@ namespace Fungus.Script
protected override void Clear() protected override void Clear()
{ {
base.Clear(); base.Clear();
ShowContinueIcon(false);
}
void ShowContinueIcon(bool visible)
{
if (continueImage != null)
{
continueImage.enabled = visible;
}
} }
IEnumerator WaitForInput(Action onInput) IEnumerator WaitForInput(Action onInput)

BIN
Assets/Shuttle/ShuttleGame.unity

Binary file not shown.
Loading…
Cancel
Save