Unstable 0.15.15.0 (and the one before it I forgor)

This commit is contained in:
Markus Isberg
2021-11-18 21:34:30 +09:00
parent 10e5fd5f3e
commit 80f39cd2a3
257 changed files with 4916 additions and 2582 deletions
@@ -10,6 +10,7 @@ using System.Security.Cryptography;
using System.Text;
using System.Xml;
using System.Xml.Linq;
using Barotrauma.Extensions;
namespace Barotrauma.Networking
{
@@ -48,7 +49,8 @@ namespace Barotrauma.Networking
Message = 0x2,
Properties = 0x4,
Misc = 0x8,
LevelSeed = 0x10
LevelSeed = 0x10,
HiddenSubs = 0x20
}
public static readonly string PermissionPresetFile = "Data" + Path.DirectorySeparatorChar + "permissionpresets.xml";
@@ -284,6 +286,8 @@ namespace Barotrauma.Networking
ExtraCargo = new Dictionary<ItemPrefab, int>();
HiddenSubs = new HashSet<string>();
PermissionPreset.LoadAll(PermissionPresetFile);
InitProjSpecific();
@@ -369,6 +373,8 @@ namespace Barotrauma.Networking
public Dictionary<ItemPrefab, int> ExtraCargo { get; private set; }
public HashSet<string> HiddenSubs { get; private set; }
private float selectedLevelDifficulty;
private string password;
@@ -506,6 +512,13 @@ namespace Barotrauma.Networking
}
}
[Serialize(Barotrauma.LosMode.Opaque, true)]
public LosMode LosMode
{
get;
set;
}
[Serialize(800, true)]
public int LinesPerLogFile
{
@@ -1023,5 +1036,29 @@ namespace Barotrauma.Networking
msg.Write((byte)kvp.Value);
}
}
public void ReadHiddenSubs(IReadMessage msg)
{
HiddenSubs.Clear();
uint count = msg.ReadVariableUInt32();
for (int i = 0; i < count; i++)
{
string submarineName = msg.ReadString();
HiddenSubs.Add(submarineName);
}
#if SERVER
SelectNonHiddenSubmarine();
#endif
}
public void WriteHiddenSubs(IWriteMessage msg)
{
msg.WriteVariableUInt32((uint)HiddenSubs.Count);
foreach (string submarineName in HiddenSubs)
{
msg.Write(submarineName);
}
}
}
}