Browse Source

Fixed incorrect portraits and positioning across multiple conversation() commands

master
Christopher 9 years ago
parent
commit
964a1e504a
  1. 13
      Assets/Fungus/Narrative/Scripts/ConversationManager.cs

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

@ -76,15 +76,8 @@ namespace Fungus
currentCharacter = item.Character; currentCharacter = item.Character;
} }
if (item.Portrait != null) currentPortrait = item.Portrait;
{ currentPosition = item.Position;
currentPortrait = item.Portrait;
}
if (item.Position != null)
{
currentPosition = item.Position;
}
SayDialog sayDialog = GetSayDialog(currentCharacter); SayDialog sayDialog = GetSayDialog(currentCharacter);
@ -110,7 +103,7 @@ namespace Fungus
{ {
PortraitOptions portraitOptions = new PortraitOptions(true); PortraitOptions portraitOptions = new PortraitOptions(true);
portraitOptions.character = currentCharacter; portraitOptions.character = currentCharacter;
portraitOptions.fromPosition = currentCharacter.state.position ?? previousPosition; portraitOptions.fromPosition = currentCharacter.state.position;
portraitOptions.toPosition = currentPosition; portraitOptions.toPosition = currentPosition;
portraitOptions.portrait = currentPortrait; portraitOptions.portrait = currentPortrait;

Loading…
Cancel
Save