Browse Source

Fixed up shuttle demo

master
chrisgregan 10 years ago
parent
commit
403b2e57d8
  1. 5
      Assets/Fungus/Dialog/Commands/Say.cs
  2. 10
      Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs
  3. BIN
      Assets/Shuttle/ShuttleGame.unity

5
Assets/Fungus/Dialog/Commands/Say.cs

@ -102,7 +102,10 @@ namespace Fungus.Script
{ {
foreach (SayOption option in options) foreach (SayOption option in options)
{ {
connectedSequences.Add(option.targetSequence); if (option.targetSequence != null)
{
connectedSequences.Add(option.targetSequence);
}
} }
} }
} }

10
Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs

@ -289,6 +289,11 @@ namespace Fungus.Script
void DrawConnections(FungusScript fungusScript, Sequence sequence, bool highlightedOnly) void DrawConnections(FungusScript fungusScript, Sequence sequence, bool highlightedOnly)
{ {
if (sequence == null)
{
return;
}
List<Sequence> connectedSequences = new List<Sequence>(); List<Sequence> connectedSequences = new List<Sequence>();
bool sequenceIsSelected = (fungusScript.selectedSequence == sequence); bool sequenceIsSelected = (fungusScript.selectedSequence == sequence);
@ -309,6 +314,11 @@ namespace Fungus.Script
foreach (Sequence sequenceB in connectedSequences) foreach (Sequence sequenceB in connectedSequences)
{ {
if (sequenceB == null)
{
continue;
}
DrawRectConnection(sequence.nodeRect, sequenceB.nodeRect, highlight); DrawRectConnection(sequence.nodeRect, sequenceB.nodeRect, highlight);
} }
} }

BIN
Assets/Shuttle/ShuttleGame.unity

Binary file not shown.
Loading…
Cancel
Save