From 964a1e504af56bc17f79dc21e67491c1f76702e0 Mon Sep 17 00:00:00 2001 From: Christopher Date: Tue, 26 Jul 2016 15:49:06 +0100 Subject: [PATCH] Fixed incorrect portraits and positioning across multiple conversation() commands --- .../Fungus/Narrative/Scripts/ConversationManager.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Assets/Fungus/Narrative/Scripts/ConversationManager.cs b/Assets/Fungus/Narrative/Scripts/ConversationManager.cs index 3f04f487..4e8d9431 100644 --- a/Assets/Fungus/Narrative/Scripts/ConversationManager.cs +++ b/Assets/Fungus/Narrative/Scripts/ConversationManager.cs @@ -76,15 +76,8 @@ namespace Fungus currentCharacter = item.Character; } - if (item.Portrait != null) - { - currentPortrait = item.Portrait; - } - - if (item.Position != null) - { - currentPosition = item.Position; - } + currentPortrait = item.Portrait; + currentPosition = item.Position; SayDialog sayDialog = GetSayDialog(currentCharacter); @@ -110,7 +103,7 @@ namespace Fungus { PortraitOptions portraitOptions = new PortraitOptions(true); portraitOptions.character = currentCharacter; - portraitOptions.fromPosition = currentCharacter.state.position ?? previousPosition; + portraitOptions.fromPosition = currentCharacter.state.position; portraitOptions.toPosition = currentPosition; portraitOptions.portrait = currentPortrait;