From 46c4b25eb6096317bb7905af41b7f4274ef65f80 Mon Sep 17 00:00:00 2001 From: Christopher Date: Tue, 16 Aug 2016 10:50:12 +0100 Subject: [PATCH] Renamed SyncSetDialog to SetSayDialog --- Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt | 4 ++-- Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt index 5eaf0aad..1f0c9d88 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt @@ -143,10 +143,10 @@ M.sayoptions.waitforinput = true M.sayoptions.fadewhendone = true M.sayoptions.stopvoiceover = true --- Set the active saydialog to use with the say function +-- Set the active saydialog to use with the say and conversation functions function M.setsaydialog(saydialog) M.sayoptions.saydialog = saydialog - luautils.SyncSayDialog(saydialog) + luautils.SetSayDialog(saydialog) end -- Gets the active say dialog, or creates one if none exists yet diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs index 266dd46d..f36539b9 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs @@ -485,7 +485,7 @@ namespace Fungus /// Sync the active say dialog with what Lua thinks the SayDialog should be /// /// - public void SyncSayDialog(SayDialog sayDialog) + public void SetSayDialog(SayDialog sayDialog) { SayDialog.activeSayDialog = sayDialog; }