Browse Source

Set inline SayDialog portraits if no Stage present

master
Christopher 8 years ago
parent
commit
c2079d2613
  1. 6
      Assets/Fungus/Narrative/Scripts/ConversationManager.cs
  2. 1486
      Assets/Tests/Narrative/ConversationTests.unity

6
Assets/Fungus/Narrative/Scripts/ConversationManager.cs

@ -123,6 +123,12 @@ namespace Fungus
stage.Show(portraitOptions); stage.Show(portraitOptions);
} }
if (stage == null &&
currentPortrait != null)
{
sayDialog.SetCharacterImage(currentPortrait);
}
previousCharacter = currentCharacter; previousCharacter = currentCharacter;
previousPortrait = currentPortrait; previousPortrait = currentPortrait;
previousPosition = currentPosition; previousPosition = currentPosition;

1486
Assets/Tests/Narrative/ConversationTests.unity

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save