From ebc63819f8e1be0f384584fe6d1e737cdc0a964b Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 26 Sep 2016 15:06:55 +0100 Subject: [PATCH] Reverted IConversationManager interface --- .../Interfaces/IConversationManager.cs | 23 ------------------- .../Interfaces/IConversationManager.cs.meta | 12 ---------- .../Scripts/Utils/ConversationManager.cs | 13 +++++++++-- 3 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 Assets/Fungus/Scripts/Interfaces/IConversationManager.cs delete mode 100644 Assets/Fungus/Scripts/Interfaces/IConversationManager.cs.meta diff --git a/Assets/Fungus/Scripts/Interfaces/IConversationManager.cs b/Assets/Fungus/Scripts/Interfaces/IConversationManager.cs deleted file mode 100644 index 594748bc..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IConversationManager.cs +++ /dev/null @@ -1,23 +0,0 @@ -// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). -// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) - -using System.Collections; - -namespace Fungus -{ - /// - /// Helper class to manage parsing and executing the conversation format. - /// - public interface IConversationManager - { - /// - /// Caches the character objects in the scene for fast lookup during conversations. - /// - void PopulateCharacterCache(); - - /// - /// Parse and execute a conversation string. - /// - IEnumerator DoConversation(string conv); - } -} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Interfaces/IConversationManager.cs.meta b/Assets/Fungus/Scripts/Interfaces/IConversationManager.cs.meta deleted file mode 100644 index ca2c9951..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IConversationManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 3a7ff247990a84e1a96765d1c03735b6 -timeCreated: 1473679803 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fungus/Scripts/Utils/ConversationManager.cs b/Assets/Fungus/Scripts/Utils/ConversationManager.cs index 99f27993..d3b1e254 100644 --- a/Assets/Fungus/Scripts/Utils/ConversationManager.cs +++ b/Assets/Fungus/Scripts/Utils/ConversationManager.cs @@ -9,7 +9,10 @@ using System.Text; namespace Fungus.Utils { - public class ConversationManager : IConversationManager + /// + /// Helper class to manage parsing and executing the conversation format. + /// + public class ConversationManager { protected struct ConversationItem { @@ -261,14 +264,20 @@ namespace Fungus.Utils return item; } - #region IConversationManager + #region Public methods + /// + /// Caches the character objects in the scene for fast lookup during conversations. + /// public void PopulateCharacterCache() { // cache characters for faster lookup characters = UnityEngine.Object.FindObjectsOfType(); } + /// + /// Parse and execute a conversation string. + /// public IEnumerator DoConversation(string conv) { if (string.IsNullOrEmpty(conv))