Fixed setmenudialog() lua function does not set main active menu dialog

#578
snozbot · Dec 8, 2016 · c8a257f · c8a257f
1 parent 5a487df
commit c8a257f
Show file tree

Hide file tree

Showing 3 changed files with 2,849 additions and 654 deletions.
diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt
@@ -220,6 +220,7 @@ M.menuoptions = {}
 -- Set the active menudialog to use with the menu function
 function M.setmenudialog(menudialog)
     M.menuoptions.menudialog = menudialog
+	luautils.SetMenuDialog(menudialog)
 end
 
 -- Gets the active menu dialog, or creates one if none exists yet

diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs
@@ -461,6 +461,14 @@ public void SetSayDialog(SayDialog sayDialog)
             SayDialog.ActiveSayDialog = sayDialog;
         }
 
+        /// <summary>
+        /// Sync the active menu dialog with what Lua thinks the MenuDialog should be
+        /// </summary>
+        public void SetMenuDialog(MenuDialog menuDialog)
+        {
+            MenuDialog.ActiveMenuDialog = menuDialog;
+        }
+
         #endregion
 
         #region LuaEnvironmentInitializer implementation