PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fixy fix time, Keen touched the chat system

Browse Source
This commit is contained in:
John Gross
2019-08-22 11:24:19 -07:00
parent 43adecaf99
commit 036f21de81
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Torch.Server/Initializer.cs
View File

@@ -31,7 +31,7 @@ namespace Torch.Server
private const string RUNSCRIPT = @"force_install_dir ../ private const string RUNSCRIPT = @"force_install_dir ../
login anonymous login anonymous
app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate app_update 298740
quit"; quit";
private TorchConfig _config; private TorchConfig _config;

5
Torch/Managers/ChatManager/ChatManagerClient.cs
View File

@@ -15,6 +15,7 @@ using Torch.API;
using Torch.API.Managers; using Torch.API.Managers;
using Torch.Utils; using Torch.Utils;
using VRage.Game; using VRage.Game;
using VRageMath;
namespace Torch.Managers.ChatManager namespace Torch.Managers.ChatManager
{ {
@@ -82,7 +83,7 @@ namespace Torch.Managers.ChatManager
_chatMessageRecievedReplacer.Replace(new Action<ulong, string, ChatChannel, long, string>(Multiplayer_ChatMessageReceived), _chatMessageRecievedReplacer.Replace(new Action<ulong, string, ChatChannel, long, string>(Multiplayer_ChatMessageReceived),
MyMultiplayer.Static); MyMultiplayer.Static);
_scriptedChatMessageRecievedReplacer.Replace( _scriptedChatMessageRecievedReplacer.Replace(
new Action<string, string, string>(Multiplayer_ScriptedChatMessageReceived), MyMultiplayer.Static); new Action<string, string, string, Color>(Multiplayer_ScriptedChatMessageReceived), MyMultiplayer.Static);
} }
else else
{ {
@@ -141,7 +142,7 @@ namespace Torch.Managers.ChatManager
_hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName); _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName);
} }
private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font) private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font, Color color)
{ {
var torchMsg = new TorchChatMessage(author, message, font); var torchMsg = new TorchChatMessage(author, message, font);
if (!RaiseMessageRecieved(torchMsg) && HasHud) if (!RaiseMessageRecieved(torchMsg) && HasHud)