diff --git a/Torch.API/Managers/IChatManagerClient.cs b/Torch.API/Managers/IChatManagerClient.cs index 0c8ca18..a3a1f64 100644 --- a/Torch.API/Managers/IChatManagerClient.cs +++ b/Torch.API/Managers/IChatManagerClient.cs @@ -35,26 +35,26 @@ namespace Torch.API.Managers /// /// /// If true, this event has been consumed and should be ignored - public delegate void DelMessageRecieved(TorchChatMessage msg, ref bool consumed); + public delegate void MessageRecievedDel(TorchChatMessage msg, ref bool consumed); /// /// Callback used to indicate the user is attempting to send a message locally. /// /// Message the user is attempting to send /// If true, this event has been consumed and should be ignored - public delegate void DelMessageSending(string msg, ref bool consumed); + public delegate void MessageSendingDel(string msg, ref bool consumed); public interface IChatManagerClient : IManager { /// - /// Event that is raised when a message addressed to us is recieved. + /// Event that is raised when a message addressed to us is recieved. /// - event DelMessageRecieved MessageRecieved; + event MessageRecievedDel MessageRecieved; /// - /// Event that is raised when we are attempting to send a message. + /// Event that is raised when we are attempting to send a message. /// - event DelMessageSending MessageSending; + event MessageSendingDel MessageSending; /// /// Triggers the event, diff --git a/Torch.API/Managers/IChatManagerServer.cs b/Torch.API/Managers/IChatManagerServer.cs index 3a402c8..52bd75f 100644 --- a/Torch.API/Managers/IChatManagerServer.cs +++ b/Torch.API/Managers/IChatManagerServer.cs @@ -9,19 +9,19 @@ namespace Torch.API.Managers { /// - /// Callback used to indicate the server has recieved a message to process. + /// Callback used to indicate the server has recieved a message to process and forward on to others. /// /// Steam ID of the user sending a message /// Message the user is attempting to send /// If true, this event has been consumed and should be ignored - public delegate void DelMessageProcessing(TorchChatMessage msg, ref bool consumed); + public delegate void MessageProcessingDel(TorchChatMessage msg, ref bool consumed); public interface IChatManagerServer : IChatManagerClient { /// - /// Event triggered when the server has recieved a message and should process it. + /// Event triggered when the server has recieved a message and should process it. /// - event DelMessageProcessing MessageProcessing; + event MessageProcessingDel MessageProcessing; /// diff --git a/Torch/Managers/ChatManager/ChatManagerClient.cs b/Torch/Managers/ChatManager/ChatManagerClient.cs index 796b8de..3aacbdb 100644 --- a/Torch/Managers/ChatManager/ChatManagerClient.cs +++ b/Torch/Managers/ChatManager/ChatManagerClient.cs @@ -26,11 +26,11 @@ namespace Torch.Managers.ChatManager /// // TODO doesn't work in Offline worlds. Method injection or network injection. - public event DelMessageRecieved MessageRecieved; + public event MessageRecievedDel MessageRecieved; /// // TODO doesn't work at all. Method injection or network injection. - public event DelMessageSending MessageSending; + public event MessageSendingDel MessageSending; /// public void SendMessageAsSelf(string message) diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs index 8f1a507..4a93c45 100644 --- a/Torch/Managers/ChatManager/ChatManagerServer.cs +++ b/Torch/Managers/ChatManager/ChatManagerServer.cs @@ -36,7 +36,7 @@ namespace Torch.Managers.ChatManager } /// - public event DelMessageProcessing MessageProcessing; + public event MessageProcessingDel MessageProcessing; /// public void SendMessageAsOther(ulong authorId, string message, ulong targetSteamId = 0) @@ -59,9 +59,9 @@ namespace Torch.Managers.ChatManager #pragma warning disable 649 - private delegate void DelMultiplayerBaseSendChatMessage(ref ChatMsg arg); + private delegate void MultiplayerBaseSendChatMessageDel(ref ChatMsg arg); [ReflectedStaticMethod(Name = "SendChatMessage", Type = typeof(MyMultiplayerBase))] - private static DelMultiplayerBaseSendChatMessage _dedicatedServerBaseSendChatMessage; + private static MultiplayerBaseSendChatMessageDel _dedicatedServerBaseSendChatMessage; // [ReflectedMethod] doesn't play well with instance methods and refs. [ReflectedMethodInfo(typeof(MyDedicatedServerBase), "OnChatMessage")]