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

StyleCop clean Session

Browse Source
This commit is contained in:
Matthias Mailänder
2014-11-01 07:50:03 +01:00
parent a4b6ddc836
commit 7decbdeae0
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OpenRA.Game/Network/Session.cs
View File

@@ -94,10 +94,14 @@ namespace OpenRA.Network
public class Client public class Client
{ {
public static Client Deserialize(MiniYaml data)
{
return FieldLoader.Load<Client>(data);
}
public int Index; public int Index;
public HSLColor PreferredColor; // Color that the client normally uses from settings.yaml. public HSLColor PreferredColor; // Color that the client normally uses from settings.yaml.
public HSLColor Color; // Actual color that the client is using. public HSLColor Color; // Actual color that the client is using. Usually the same as PreferredColor but can be different on maps with locked colors.
// Usually the same as PreferredColor but can be different on maps with locked colors.
public string Country; public string Country;
public int SpawnPoint; public int SpawnPoint;
public string Name; public string Name;
@@ -116,11 +120,6 @@ namespace OpenRA.Network
{ {
return new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this)); return new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this));
} }
public static Client Deserialize(MiniYaml data)
{
return FieldLoader.Load<Client>(data);
}
} }
public ClientPing PingFromClient(Client client) public ClientPing PingFromClient(Client client)
@@ -135,15 +134,15 @@ namespace OpenRA.Network
public int LatencyJitter = -1; public int LatencyJitter = -1;
public int[] LatencyHistory = { }; public int[] LatencyHistory = { };
public MiniYamlNode Serialize()
{
return new MiniYamlNode("ClientPing@{0}".F(this.Index), FieldSaver.Save(this));
}
public static ClientPing Deserialize(MiniYaml data) public static ClientPing Deserialize(MiniYaml data)
{ {
return FieldLoader.Load<ClientPing>(data); return FieldLoader.Load<ClientPing>(data);
} }
public MiniYamlNode Serialize()
{
return new MiniYamlNode("ClientPing@{0}".F(this.Index), FieldSaver.Save(this));
}
} }
public class Slot public class Slot
@@ -158,15 +157,15 @@ namespace OpenRA.Network
public bool LockSpawn; public bool LockSpawn;
public bool Required; public bool Required;
public MiniYamlNode Serialize()
{
return new MiniYamlNode("Slot@{0}".F(this.PlayerReference), FieldSaver.Save(this));
}
public static Slot Deserialize(MiniYaml data) public static Slot Deserialize(MiniYaml data)
{ {
return FieldLoader.Load<Slot>(data); return FieldLoader.Load<Slot>(data);
} }
public MiniYamlNode Serialize()
{
return new MiniYamlNode("Slot@{0}".F(this.PlayerReference), FieldSaver.Save(this));
}
} }
public class Global public class Global
@@ -185,20 +184,20 @@ namespace OpenRA.Network
public bool Fog = true; public bool Fog = true;
public bool AllyBuildRadius = true; public bool AllyBuildRadius = true;
public int StartingCash = 5000; public int StartingCash = 5000;
public String TechLevel = "none"; public string TechLevel = "none";
public string StartingUnitsClass = "none"; public string StartingUnitsClass = "none";
public bool AllowVersionMismatch; public bool AllowVersionMismatch;
public string GameUid; public string GameUid;
public MiniYamlNode Serialize()
{
return new MiniYamlNode("GlobalSettings", FieldSaver.Save(this));
}
public static Global Deserialize(MiniYaml data) public static Global Deserialize(MiniYaml data)
{ {
return FieldLoader.Load<Global>(data); return FieldLoader.Load<Global>(data);
} }
public MiniYamlNode Serialize()
{
return new MiniYamlNode("GlobalSettings", FieldSaver.Save(this));
}
} }
public string Serialize() public string Serialize()