diff --git a/Assets/Fungus/Scripts/Components/DialogInput.cs b/Assets/Fungus/Scripts/Components/DialogInput.cs index cbbe69bd..b601ef6a 100644 --- a/Assets/Fungus/Scripts/Components/DialogInput.cs +++ b/Assets/Fungus/Scripts/Components/DialogInput.cs @@ -24,7 +24,7 @@ namespace Fungus /// /// Input handler for say dialogs. /// - public class DialogInput : MonoBehaviour, IDialogInput + public class DialogInput : MonoBehaviour { [Tooltip("Click to advance story")] [SerializeField] protected ClickMode clickMode; @@ -123,14 +123,20 @@ namespace Fungus } } - #region IDialogInput + #region Public methods - public void SetNextLineFlag() + /// + /// Trigger next line input event from script. + /// + public virtual void SetNextLineFlag() { nextLineInputFlag = true; } - public void SetDialogClickedFlag() + /// + /// Set the dialog clicked flag (usually from an Event Trigger component in the dialog UI). + /// + public virtual void SetDialogClickedFlag() { // Ignore repeat clicks for a short time to prevent accidentally clicking through the character dialogue if (ignoreClickTimer > 0f) @@ -146,7 +152,10 @@ namespace Fungus } } - public void SetButtonClickedFlag() + /// + /// Sets the button clicked flag. + /// + public virtual void SetButtonClickedFlag() { // Only applies if clicking is not disabled if (clickMode != ClickMode.Disabled) diff --git a/Assets/Fungus/Scripts/Interfaces/IDialogInput.cs b/Assets/Fungus/Scripts/Interfaces/IDialogInput.cs deleted file mode 100644 index aa4d5a85..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IDialogInput.cs +++ /dev/null @@ -1,34 +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) - -namespace Fungus -{ - /// - /// Input handler for say dialogues. - /// - public interface IDialogInput - { - /// - /// Trigger next line input event from script. - /// - void SetNextLineFlag(); - - /// - /// Set the dialog clicked flag (usually from an Event Trigger component in the dialog UI). - /// - void SetDialogClickedFlag(); - - /// - /// Sets the button clicked flag. - /// - void SetButtonClickedFlag(); - } - - /// - /// Interface for listening for dialogue input events. - /// - public interface IDialogInputListener - { - void OnNextLineEvent(); - } -} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Interfaces/IDialogInputListener.cs b/Assets/Fungus/Scripts/Interfaces/IDialogInputListener.cs new file mode 100644 index 00000000..3693b63d --- /dev/null +++ b/Assets/Fungus/Scripts/Interfaces/IDialogInputListener.cs @@ -0,0 +1,13 @@ +// 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) + +namespace Fungus +{ + /// + /// Interface for listening for dialogue input events. + /// + public interface IDialogInputListener + { + void OnNextLineEvent(); + } +} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Interfaces/IDialogInput.cs.meta b/Assets/Fungus/Scripts/Interfaces/IDialogInputListener.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/Interfaces/IDialogInput.cs.meta rename to Assets/Fungus/Scripts/Interfaces/IDialogInputListener.cs.meta