epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify collection initialization

Browse Source
This commit is contained in:
Eduardo Cáceres
2022-05-02 13:24:49 +02:00
committed by atlimit8
parent cae43808d9
commit aa998a46d9
9 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Exts.cs
View File

@@ -424,8 +424,10 @@ namespace OpenRA
if (!dupKeys.TryGetValue(key, out var dupKeyMessages))
{
// Log the initial conflicting value already inserted:
dupKeyMessages = new List<string>();
dupKeyMessages.Add(logValue(d[key]));
dupKeyMessages = new List<string>
{
logValue(d[key])
};
dupKeys.Add(key, dupKeyMessages);
}

12
OpenRA.Game/MiniYaml.cs
View File

@@ -154,8 +154,10 @@ namespace OpenRA
if (stringPool == null)
stringPool = new Dictionary<string, string>();
var levels = new List<List<MiniYamlNode>>();
levels.Add(new List<MiniYamlNode>());
var levels = new List<List<MiniYamlNode>>
{
new List<MiniYamlNode>()
};
var lineNo = 0;
foreach (var ll in lines)
@@ -323,8 +325,10 @@ namespace OpenRA
var resolved = new Dictionary<string, MiniYaml>(tree.Count);
foreach (var kv in tree)
{
var inherited = new Dictionary<string, MiniYamlNode.SourceLocation>();
inherited.Add(kv.Key, default(MiniYamlNode.SourceLocation));
var inherited = new Dictionary<string, MiniYamlNode.SourceLocation>
{
{ kv.Key, default(MiniYamlNode.SourceLocation) }
};
var children = ResolveInherits(kv.Value, tree, inherited);
resolved.Add(kv.Key, new MiniYaml(kv.Value.Value, children));

10
OpenRA.Game/Network/Handshake.cs
View File

@@ -77,10 +77,12 @@ namespace OpenRA.Network
public string Serialize()
{
var data = new List<MiniYamlNode>();
data.Add(new MiniYamlNode("Handshake", null,
new[] { "Mod", "Version", "Password", "Fingerprint", "AuthSignature", "OrdersProtocol" }.Select(p => FieldSaver.SaveField(this, p)).ToList()));
data.Add(new MiniYamlNode("Client", FieldSaver.Save(Client)));
var data = new List<MiniYamlNode>
{
new MiniYamlNode("Handshake", null,
new[] { "Mod", "Version", "Password", "Fingerprint", "AuthSignature", "OrdersProtocol" }.Select(p => FieldSaver.SaveField(this, p)).ToList()),
new MiniYamlNode("Client", FieldSaver.Save(Client))
};
return data.WriteToString();
}