Unstable v0.19.3.0
This commit is contained in:
@@ -381,18 +381,18 @@ namespace Barotrauma
|
||||
private static void SendResponse(UInt16 actionId, int selectedOption)
|
||||
{
|
||||
IWriteMessage outmsg = new WriteOnlyMessage();
|
||||
outmsg.Write((byte)ClientPacketHeader.EVENTMANAGER_RESPONSE);
|
||||
outmsg.Write(actionId);
|
||||
outmsg.Write((byte)selectedOption);
|
||||
outmsg.WriteByte((byte)ClientPacketHeader.EVENTMANAGER_RESPONSE);
|
||||
outmsg.WriteUInt16(actionId);
|
||||
outmsg.WriteByte((byte)selectedOption);
|
||||
GameMain.Client?.ClientPeer?.Send(outmsg, DeliveryMethod.Reliable);
|
||||
}
|
||||
|
||||
private static void SendIgnore(UInt16 actionId)
|
||||
{
|
||||
IWriteMessage outmsg = new WriteOnlyMessage();
|
||||
outmsg.Write((byte)ClientPacketHeader.EVENTMANAGER_RESPONSE);
|
||||
outmsg.Write(actionId);
|
||||
outmsg.Write(byte.MaxValue);
|
||||
outmsg.WriteByte((byte)ClientPacketHeader.EVENTMANAGER_RESPONSE);
|
||||
outmsg.WriteUInt16(actionId);
|
||||
outmsg.WriteByte(byte.MaxValue);
|
||||
GameMain.Client?.ClientPeer?.Send(outmsg, DeliveryMethod.Reliable);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
using Barotrauma.Networking;
|
||||
|
||||
namespace Barotrauma
|
||||
namespace Barotrauma
|
||||
{
|
||||
partial class CombatMission : Mission
|
||||
{
|
||||
@@ -8,7 +6,7 @@ namespace Barotrauma
|
||||
{
|
||||
get
|
||||
{
|
||||
if (descriptions == null) return "";
|
||||
if (descriptions == null) { return ""; }
|
||||
|
||||
if (GameMain.Client?.Character == null)
|
||||
{
|
||||
|
||||
@@ -80,6 +80,10 @@ namespace Barotrauma
|
||||
|
||||
LocalizedString header = messageIndex < Headers.Length ? Headers[messageIndex] : "";
|
||||
LocalizedString message = messageIndex < Messages.Length ? Messages[messageIndex] : "";
|
||||
if (!message.IsNullOrEmpty())
|
||||
{
|
||||
message = ModifyMessage(message);
|
||||
}
|
||||
|
||||
CoroutineManager.StartCoroutine(ShowMessageBoxAfterRoundSummary(header, message));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user