From 479eb307d65a9edd84978838c9f6c7527a032643 Mon Sep 17 00:00:00 2001 From: penev92 Date: Wed, 15 Jul 2015 04:58:50 +0300 Subject: [PATCH] Remove unused parameter from Player's constructor --- OpenRA.Game/Player.cs | 2 +- OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs | 10 +++++----- OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs index 4d7117ef63..1805074320 100644 --- a/OpenRA.Game/Player.cs +++ b/OpenRA.Game/Player.cs @@ -80,7 +80,7 @@ namespace OpenRA return factions.FirstOrDefault(f => f.InternalName == factionName) ?? factions.First(); } - public Player(World world, Session.Client client, Session.Slot slot, PlayerReference pr) + public Player(World world, Session.Client client, PlayerReference pr) { string botType; diff --git a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs index 3d3a4b7bcc..1f24e02b94 100644 --- a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs +++ b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs @@ -26,28 +26,28 @@ namespace OpenRA.Mods.Common.Traits // Create the unplayable map players -- neutral, shellmap, scripted, etc. foreach (var kv in players.Where(p => !p.Value.Playable)) { - var player = new Player(w, null, null, kv.Value); + var player = new Player(w, null, kv.Value); w.AddPlayer(player); if (kv.Value.OwnsWorld) w.WorldActor.Owner = player; } - // Create the players which are bound through slots. + // Create the regular playable players. foreach (var kv in w.LobbyInfo.Slots) { var client = w.LobbyInfo.ClientInSlot(kv.Key); if (client == null) continue; - var player = new Player(w, client, kv.Value, players[kv.Value.PlayerReference]); + var player = new Player(w, client, players[kv.Value.PlayerReference]); w.AddPlayer(player); if (client.Index == Game.LocalClientId) w.SetLocalPlayer(player.InternalName); } - // create a player that is allied with everyone for shared observer shroud - w.AddPlayer(new Player(w, null, null, new PlayerReference + // Create a player that is allied with everyone for shared observer shroud. + w.AddPlayer(new Player(w, null, new PlayerReference { Name = "Everyone", NonCombatant = true, diff --git a/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs b/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs index 8c956627e1..1ba44586c7 100644 --- a/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs @@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits Players = new MapPlayers(w.Map.PlayerDefinitions); var worldOwner = Players.Players.Select(kvp => kvp.Value).First(p => !p.Playable && p.OwnsWorld); - w.WorldActor.Owner = new Player(w, null, null, worldOwner); + w.WorldActor.Owner = new Player(w, null, worldOwner); } public void WorldLoaded(World world, WorldRenderer wr)