From 9d905d82915604011aed5c2bb5e1b779c5e0ea36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Dec 2021 13:27:29 +0100 Subject: [PATCH] Remove unused parameters and variables. --- OpenRA.Game/Manifest.cs | 2 +- OpenRA.Game/MiniYaml.cs | 10 +++++----- OpenRA.Mods.Cnc/Activities/Teleport.cs | 2 +- .../Traits/Infiltration/InfiltrateForTransform.cs | 2 +- OpenRA.Mods.Cnc/Traits/TransformsNearResources.cs | 2 +- OpenRA.Mods.Common/Activities/RepairBridge.cs | 2 +- OpenRA.Mods.Common/Activities/RideTransport.cs | 2 +- OpenRA.Mods.Common/Activities/Transform.cs | 2 +- OpenRA.Mods.Common/Activities/UnloadCargo.cs | 4 ++-- OpenRA.Mods.Common/Traits/AffectsShroud.cs | 2 +- OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 2 -- OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs | 2 +- .../Traits/Buildings/TransformsIntoAircraft.cs | 2 +- .../Buildings/TransformsIntoEntersTunnels.cs | 2 +- .../Traits/Buildings/TransformsIntoMobile.cs | 2 +- .../Traits/Buildings/TransformsIntoPassenger.cs | 2 +- .../Traits/Buildings/TransformsIntoRepairable.cs | 2 +- OpenRA.Mods.Common/Traits/Cargo.cs | 14 +++++++------- .../Traits/Conditions/GrantConditionOnBotOwner.cs | 4 ++-- .../Conditions/GrantConditionOnPrerequisite.cs | 4 ++-- OpenRA.Mods.Common/Traits/CreatesShroud.cs | 6 +++--- .../Traits/Palettes/ColorPickerPalette.cs | 4 ++-- OpenRA.Mods.Common/Traits/ParaDrop.cs | 4 ++-- OpenRA.Mods.Common/Traits/ProducibleWithLevel.cs | 4 ++-- OpenRA.Mods.Common/Traits/RevealsShroud.cs | 6 +++--- OpenRA.Mods.Common/Traits/Sound/AttackSounds.cs | 4 ++-- .../Traits/TransformCrusherOnCrush.cs | 2 +- OpenRA.Mods.Common/Traits/TransformOnCapture.cs | 2 +- OpenRA.Mods.Common/Traits/Transforms.cs | 6 +++--- .../Traits/World/ActorSpawnManager.cs | 4 ++-- .../Widgets/Logic/Ingame/CommandBarLogic.cs | 5 +---- 31 files changed, 54 insertions(+), 59 deletions(-) diff --git a/OpenRA.Game/Manifest.cs b/OpenRA.Game/Manifest.cs index e05efc9e91..b5db57a369 100644 --- a/OpenRA.Game/Manifest.cs +++ b/OpenRA.Game/Manifest.cs @@ -205,7 +205,7 @@ namespace OpenRA customDataLoaded = true; } - static string[] YamlList(Dictionary yaml, string key, bool parsePaths = false) + static string[] YamlList(Dictionary yaml, string key) { if (!yaml.ContainsKey(key)) return Array.Empty(); diff --git a/OpenRA.Game/MiniYaml.cs b/OpenRA.Game/MiniYaml.cs index ae3189eca8..0c31373c4d 100644 --- a/OpenRA.Game/MiniYaml.cs +++ b/OpenRA.Game/MiniYaml.cs @@ -326,13 +326,13 @@ namespace OpenRA var inherited = new Dictionary(); inherited.Add(kv.Key, default(MiniYamlNode.SourceLocation)); - var children = ResolveInherits(kv.Key, kv.Value, tree, inherited); + var children = ResolveInherits(kv.Value, tree, inherited); resolved.Add(kv.Key, new MiniYaml(kv.Value.Value, children)); } // Resolve any top-level removals (e.g. removing whole actor blocks) var nodes = new MiniYaml("", resolved.Select(kv => new MiniYamlNode(kv.Key, kv.Value)).ToList()); - return ResolveInherits("", nodes, tree, new Dictionary()); + return ResolveInherits(nodes, tree, new Dictionary()); } static void MergeIntoResolved(MiniYamlNode overrideNode, List existingNodes, @@ -342,13 +342,13 @@ namespace OpenRA if (existingNode != null) { existingNode.Value = MergePartial(existingNode.Value, overrideNode.Value); - existingNode.Value.Nodes = ResolveInherits(existingNode.Key, existingNode.Value, tree, inherited); + existingNode.Value.Nodes = ResolveInherits(existingNode.Value, tree, inherited); } else existingNodes.Add(overrideNode.Clone()); } - static List ResolveInherits(string key, MiniYaml node, Dictionary tree, Dictionary inherited) + static List ResolveInherits(MiniYaml node, Dictionary tree, Dictionary inherited) { var resolved = new List(node.Nodes.Count); @@ -367,7 +367,7 @@ namespace OpenRA throw new YamlException($"{n.Location}: Parent type `{n.Value.Value}` was already inherited by this yaml tree at {inherited[n.Value.Value]} (note: may be from a derived tree)"); inherited.Add(n.Value.Value, n.Location); - foreach (var r in ResolveInherits(n.Key, parent, tree, inherited)) + foreach (var r in ResolveInherits(parent, tree, inherited)) MergeIntoResolved(r, resolved, tree, inherited); } else if (n.Key.StartsWith("-", StringComparison.Ordinal)) diff --git a/OpenRA.Mods.Cnc/Activities/Teleport.cs b/OpenRA.Mods.Cnc/Activities/Teleport.cs index bf13511f28..6dc7943840 100644 --- a/OpenRA.Mods.Cnc/Activities/Teleport.cs +++ b/OpenRA.Mods.Cnc/Activities/Teleport.cs @@ -85,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Activities var cargo = self.TraitOrDefault(); if (cargo != null && teleporter != null) { - while (!cargo.IsEmpty(self)) + while (!cargo.IsEmpty()) { var a = cargo.Unload(self); diff --git a/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForTransform.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForTransform.cs index b3b48964f5..43838d84d9 100644 --- a/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForTransform.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForTransform.cs @@ -50,7 +50,7 @@ namespace OpenRA.Mods.Cnc.Traits if (!info.Types.Overlaps(types)) return; - var transform = new Transform(self, info.IntoActor) + var transform = new Transform(info.IntoActor) { ForceHealthPercentage = info.ForceHealthPercentage, Faction = faction, diff --git a/OpenRA.Mods.Cnc/Traits/TransformsNearResources.cs b/OpenRA.Mods.Cnc/Traits/TransformsNearResources.cs index 1d9fd0df56..663bd9a11d 100644 --- a/OpenRA.Mods.Cnc/Traits/TransformsNearResources.cs +++ b/OpenRA.Mods.Cnc/Traits/TransformsNearResources.cs @@ -86,7 +86,7 @@ namespace OpenRA.Mods.Cnc.Traits void Transform(Actor self) { - var transform = new Transform(self, info.IntoActor); + var transform = new Transform(info.IntoActor); var facing = self.TraitOrDefault(); if (facing != null) diff --git a/OpenRA.Mods.Common/Activities/RepairBridge.cs b/OpenRA.Mods.Common/Activities/RepairBridge.cs index a7b2785114..9affd3bbc7 100644 --- a/OpenRA.Mods.Common/Activities/RepairBridge.cs +++ b/OpenRA.Mods.Common/Activities/RepairBridge.cs @@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Activities if (enterLegacyHut != null) enterLegacyHut.Repair(self); else if (enterHut != null) - enterHut.Repair(enterActor, self); + enterHut.Repair(self); Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", notification, self.Owner.Faction.InternalName); diff --git a/OpenRA.Mods.Common/Activities/RideTransport.cs b/OpenRA.Mods.Common/Activities/RideTransport.cs index 668877a03c..c8d1901467 100644 --- a/OpenRA.Mods.Common/Activities/RideTransport.cs +++ b/OpenRA.Mods.Common/Activities/RideTransport.cs @@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Activities if (targetActor != enterActor) return; - if (!enterCargo.CanLoad(enterActor, self)) + if (!enterCargo.CanLoad(self)) return; enterCargo.Load(enterActor, self); diff --git a/OpenRA.Mods.Common/Activities/Transform.cs b/OpenRA.Mods.Common/Activities/Transform.cs index 5702b858ee..858112f0e1 100644 --- a/OpenRA.Mods.Common/Activities/Transform.cs +++ b/OpenRA.Mods.Common/Activities/Transform.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Activities public bool SkipMakeAnims = false; public string Faction = null; - public Transform(Actor self, string toActor) + public Transform(string toActor) { ToActor = toActor; } diff --git a/OpenRA.Mods.Common/Activities/UnloadCargo.cs b/OpenRA.Mods.Common/Activities/UnloadCargo.cs index bc63321458..66664eca09 100644 --- a/OpenRA.Mods.Common/Activities/UnloadCargo.cs +++ b/OpenRA.Mods.Common/Activities/UnloadCargo.cs @@ -92,7 +92,7 @@ namespace OpenRA.Mods.Common.Activities public override bool Tick(Actor self) { - if (IsCanceling || cargo.IsEmpty(self)) + if (IsCanceling || cargo.IsEmpty()) return true; if (cargo.CanUnload()) @@ -100,7 +100,7 @@ namespace OpenRA.Mods.Common.Activities foreach (var inu in notifiers) inu.Unloading(self); - var actor = cargo.Peek(self); + var actor = cargo.Peek(); var spawn = self.CenterPosition; var exitSubCell = ChooseExitSubCell(actor); diff --git a/OpenRA.Mods.Common/Traits/AffectsShroud.cs b/OpenRA.Mods.Common/Traits/AffectsShroud.cs index e237cc13be..4d84e06854 100644 --- a/OpenRA.Mods.Common/Traits/AffectsShroud.cs +++ b/OpenRA.Mods.Common/Traits/AffectsShroud.cs @@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits protected abstract void AddCellsToPlayerShroud(Actor self, Player player, PPos[] uv); protected abstract void RemoveCellsFromPlayerShroud(Actor self, Player player); - public AffectsShroud(Actor self, AffectsShroudInfo info) + public AffectsShroud(AffectsShroudInfo info) : base(info) { if (Info.Type == VisibilityType.Footprint) diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index b58017f592..f41a7954ba 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -224,8 +224,6 @@ namespace OpenRA.Mods.Common.Traits INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyActorDisposing, INotifyBecomingIdle, ICreationActivity, IActorPreviewInitModifier, IDeathActorInitModifier, IIssueDeployOrder, IIssueOrder, IResolveOrder, IOrderVoice { - static readonly (CPos, SubCell)[] NoCells = { }; - readonly Actor self; Repairable repairable; diff --git a/OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs b/OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs index d478d7bcde..5014e2eaac 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs @@ -133,7 +133,7 @@ namespace OpenRA.Mods.Common.Traits } } - public void Repair(Actor self, Actor repairer) + public void Repair(Actor repairer) { if (Info.RepairPropagationDelay > 0) { diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs index c60d1b6bd5..d08b275f1c 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs @@ -144,7 +144,7 @@ namespace OpenRA.Mods.Common.Traits return; // Manually manage the inner activity queue - var activity = currentTransform ?? transform.GetTransformActivity(self); + var activity = currentTransform ?? transform.GetTransformActivity(); if (!order.Queued) activity.NextActivity?.Cancel(self); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs index 816234213f..a53e160d15 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs @@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits return; // Manually manage the inner activity queue - var activity = currentTransform ?? transform.GetTransformActivity(self); + var activity = currentTransform ?? transform.GetTransformActivity(); if (!order.Queued) activity.NextActivity?.Cancel(self); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoMobile.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoMobile.cs index beeee22809..bc108067ac 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoMobile.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoMobile.cs @@ -120,7 +120,7 @@ namespace OpenRA.Mods.Common.Traits return; // Manually manage the inner activity queue - var activity = currentTransform ?? transform.GetTransformActivity(self); + var activity = currentTransform ?? transform.GetTransformActivity(); if (!order.Queued) activity.NextActivity?.Cancel(self); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs index bb1fda6e6d..25a3e98458 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs @@ -133,7 +133,7 @@ namespace OpenRA.Mods.Common.Traits return; // Manually manage the inner activity queue - var activity = currentTransform ?? transform.GetTransformActivity(self); + var activity = currentTransform ?? transform.GetTransformActivity(); if (!order.Queued) activity.NextActivity?.Cancel(self); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs index 1b3d9f514b..155eb0612e 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs @@ -127,7 +127,7 @@ namespace OpenRA.Mods.Common.Traits return; // Manually manage the inner activity queue - var activity = currentTransform ?? transform.GetTransformActivity(self); + var activity = currentTransform ?? transform.GetTransformActivity(); if (!order.Queued) activity.NextActivity?.Cancel(self); diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs index f23422c8cf..790a230754 100644 --- a/OpenRA.Mods.Common/Traits/Cargo.cs +++ b/OpenRA.Mods.Common/Traits/Cargo.cs @@ -243,11 +243,11 @@ namespace OpenRA.Mods.Common.Traits return false; } - return !IsEmpty(self) && (aircraft == null || aircraft.CanLand(self.Location, blockedByMobile: false)) + return !IsEmpty() && (aircraft == null || aircraft.CanLand(self.Location, blockedByMobile: false)) && CurrentAdjacentCells != null && CurrentAdjacentCells.Any(c => Passengers.Any(p => !p.IsDead && p.Trait().CanEnterCell(c, null, check))); } - public bool CanLoad(Actor self, Actor a) + public bool CanLoad(Actor a) { return reserves.Contains(a) || HasSpace(GetWeight(a)); } @@ -320,16 +320,16 @@ namespace OpenRA.Mods.Common.Traits public string VoicePhraseForOrder(Actor self, Order order) { - if (order.OrderString != "Unload" || IsEmpty(self) || !self.HasVoice(Info.UnloadVoice)) + if (order.OrderString != "Unload" || IsEmpty() || !self.HasVoice(Info.UnloadVoice)) return null; return Info.UnloadVoice; } public bool HasSpace(int weight) { return totalWeight + reservedWeight + weight <= Info.MaxWeight; } - public bool IsEmpty(Actor self) { return cargo.Count == 0; } + public bool IsEmpty() { return cargo.Count == 0; } - public Actor Peek(Actor self) { return cargo.Last(); } + public Actor Peek() { return cargo.Last(); } public Actor Unload(Actor self, Actor passenger = null) { @@ -406,7 +406,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyKilled.Killed(Actor self, AttackInfo e) { if (Info.EjectOnDeath) - while (!IsEmpty(self) && CanUnload(BlockedByActor.All)) + while (!IsEmpty() && CanUnload(BlockedByActor.All)) { var passenger = Unload(self); var cp = self.CenterPosition; @@ -445,7 +445,7 @@ namespace OpenRA.Mods.Common.Traits if (!Info.EjectOnSell || cargo == null) return; - while (!IsEmpty(self)) + while (!IsEmpty()) SpawnPassenger(Unload(self)); } diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnBotOwner.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnBotOwner.cs index a8ee0aa9ff..51a85aa09c 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnBotOwner.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnBotOwner.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Bot types that trigger the condition.")] public readonly string[] Bots = Array.Empty(); - public override object Create(ActorInitializer init) { return new GrantConditionOnBotOwner(init, this); } + public override object Create(ActorInitializer init) { return new GrantConditionOnBotOwner(this); } } public class GrantConditionOnBotOwner : INotifyCreated, INotifyOwnerChanged @@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits int conditionToken = Actor.InvalidConditionToken; - public GrantConditionOnBotOwner(ActorInitializer init, GrantConditionOnBotOwnerInfo info) + public GrantConditionOnBotOwner(GrantConditionOnBotOwnerInfo info) { this.info = info; } diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs index 75d9d55f02..8e8f3fc7d9 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("List of required prerequisites.")] public readonly string[] Prerequisites = Array.Empty(); - public override object Create(ActorInitializer init) { return new GrantConditionOnPrerequisite(init.Self, this); } + public override object Create(ActorInitializer init) { return new GrantConditionOnPrerequisite(this); } } public class GrantConditionOnPrerequisite : INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyOwnerChanged @@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits GrantConditionOnPrerequisiteManager globalManager; int conditionToken = Actor.InvalidConditionToken; - public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info) + public GrantConditionOnPrerequisite(GrantConditionOnPrerequisiteInfo info) { this.info = info; } diff --git a/OpenRA.Mods.Common/Traits/CreatesShroud.cs b/OpenRA.Mods.Common/Traits/CreatesShroud.cs index fbddcd0734..c0022cc0cd 100644 --- a/OpenRA.Mods.Common/Traits/CreatesShroud.cs +++ b/OpenRA.Mods.Common/Traits/CreatesShroud.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Relationship the watching player needs to see the generated shroud.")] public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Neutral | PlayerRelationship.Enemy; - public override object Create(ActorInitializer init) { return new CreatesShroud(init.Self, this); } + public override object Create(ActorInitializer init) { return new CreatesShroud(this); } } public class CreatesShroud : AffectsShroud @@ -28,8 +28,8 @@ namespace OpenRA.Mods.Common.Traits readonly CreatesShroudInfo info; IEnumerable rangeModifiers; - public CreatesShroud(Actor self, CreatesShroudInfo info) - : base(self, info) + public CreatesShroud(CreatesShroudInfo info) + : base(info) { this.info = info; } diff --git a/OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs b/OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs index 42a5512116..8c9d7b80ca 100644 --- a/OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs @@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Allow palette modifiers to change the palette.")] public readonly bool AllowModifiers = true; - public override object Create(ActorInitializer init) { return new ColorPickerPalette(init.World, this); } + public override object Create(ActorInitializer init) { return new ColorPickerPalette(this); } } class ColorPickerPalette : ILoadsPalettes, IProvidesAssetBrowserColorPickerPalettes, ITickRender @@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits readonly ColorPickerManagerInfo colorManager; Color color; - public ColorPickerPalette(World world, ColorPickerPaletteInfo info) + public ColorPickerPalette(ColorPickerPaletteInfo info) { // All users need to use the same TraitInfo instance, chosen as the default mod rules colorManager = Game.ModData.DefaultRules.Actors[SystemActors.World].TraitInfo(); diff --git a/OpenRA.Mods.Common/Traits/ParaDrop.cs b/OpenRA.Mods.Common/Traits/ParaDrop.cs index 786100a530..76b7800948 100644 --- a/OpenRA.Mods.Common/Traits/ParaDrop.cs +++ b/OpenRA.Mods.Common/Traits/ParaDrop.cs @@ -81,10 +81,10 @@ namespace OpenRA.Mods.Common.Traits OnExitedDropRange(self); // Are we able to drop the next trooper? - if (!inDropRange || cargo.IsEmpty(self) || !self.World.Map.Contains(self.Location)) + if (!inDropRange || cargo.IsEmpty() || !self.World.Map.Contains(self.Location)) return; - var dropActor = cargo.Peek(self); + var dropActor = cargo.Peek(); var dropPositionable = dropActor.Trait(); var dropCell = self.Location; var dropSubCell = dropPositionable.GetAvailableSubCell(dropCell); diff --git a/OpenRA.Mods.Common/Traits/ProducibleWithLevel.cs b/OpenRA.Mods.Common/Traits/ProducibleWithLevel.cs index 587c95a15d..4af6420543 100644 --- a/OpenRA.Mods.Common/Traits/ProducibleWithLevel.cs +++ b/OpenRA.Mods.Common/Traits/ProducibleWithLevel.cs @@ -27,14 +27,14 @@ namespace OpenRA.Mods.Common.Traits [Desc("Should the level-up animation be suppressed when actor is created?")] public readonly bool SuppressLevelupAnimation = true; - public override object Create(ActorInitializer init) { return new ProducibleWithLevel(init, this); } + public override object Create(ActorInitializer init) { return new ProducibleWithLevel(this); } } public class ProducibleWithLevel : INotifyCreated { readonly ProducibleWithLevelInfo info; - public ProducibleWithLevel(ActorInitializer init, ProducibleWithLevelInfo info) + public ProducibleWithLevel(ProducibleWithLevelInfo info) { this.info = info; } diff --git a/OpenRA.Mods.Common/Traits/RevealsShroud.cs b/OpenRA.Mods.Common/Traits/RevealsShroud.cs index adad126e64..6055a50b47 100644 --- a/OpenRA.Mods.Common/Traits/RevealsShroud.cs +++ b/OpenRA.Mods.Common/Traits/RevealsShroud.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Can this actor reveal shroud generated by the `" + nameof(CreatesShroud) + "` trait?")] public readonly bool RevealGeneratedShroud = true; - public override object Create(ActorInitializer init) { return new RevealsShroud(init.Self, this); } + public override object Create(ActorInitializer init) { return new RevealsShroud(this); } } public class RevealsShroud : AffectsShroud @@ -32,8 +32,8 @@ namespace OpenRA.Mods.Common.Traits readonly Shroud.SourceType type; IEnumerable rangeModifiers; - public RevealsShroud(Actor self, RevealsShroudInfo info) - : base(self, info) + public RevealsShroud(RevealsShroudInfo info) + : base(info) { this.info = info; type = info.RevealGeneratedShroud ? Shroud.SourceType.Visibility diff --git a/OpenRA.Mods.Common/Traits/Sound/AttackSounds.cs b/OpenRA.Mods.Common/Traits/Sound/AttackSounds.cs index 8d5e410776..b24e683f2c 100644 --- a/OpenRA.Mods.Common/Traits/Sound/AttackSounds.cs +++ b/OpenRA.Mods.Common/Traits/Sound/AttackSounds.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits.Sound [Desc("Should the sound be delayed relative to preparation or actual attack?")] public readonly AttackDelayType DelayRelativeTo = AttackDelayType.Preparation; - public override object Create(ActorInitializer init) { return new AttackSounds(init, this); } + public override object Create(ActorInitializer init) { return new AttackSounds(this); } } public class AttackSounds : ConditionalTrait, INotifyAttack, ITick @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits.Sound readonly AttackSoundsInfo info; int tick; - public AttackSounds(ActorInitializer init, AttackSoundsInfo info) + public AttackSounds(AttackSoundsInfo info) : base(info) { this.info = info; diff --git a/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs b/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs index 573d6b9462..35bb3f900b 100644 --- a/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs +++ b/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits return; var facing = crusher.TraitOrDefault(); - var transform = new Transform(crusher, info.IntoActor) { Faction = faction }; + var transform = new Transform(info.IntoActor) { Faction = faction }; if (facing != null) transform.Facing = facing.Facing; diff --git a/OpenRA.Mods.Common/Traits/TransformOnCapture.cs b/OpenRA.Mods.Common/Traits/TransformOnCapture.cs index 87a60deb40..46220dd382 100644 --- a/OpenRA.Mods.Common/Traits/TransformOnCapture.cs +++ b/OpenRA.Mods.Common/Traits/TransformOnCapture.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits return; var facing = self.TraitOrDefault(); - var transform = new Transform(self, info.IntoActor) { ForceHealthPercentage = info.ForceHealthPercentage, Faction = faction }; + var transform = new Transform(info.IntoActor) { ForceHealthPercentage = info.ForceHealthPercentage, Faction = faction }; if (facing != null) transform.Facing = facing.Facing; transform.SkipMakeAnims = info.SkipMakeAnims; self.QueueActivity(false, transform); diff --git a/OpenRA.Mods.Common/Traits/Transforms.cs b/OpenRA.Mods.Common/Traits/Transforms.cs index 3f0fd1b672..fc22c8c1c5 100644 --- a/OpenRA.Mods.Common/Traits/Transforms.cs +++ b/OpenRA.Mods.Common/Traits/Transforms.cs @@ -89,9 +89,9 @@ namespace OpenRA.Mods.Common.Traits return buildingInfo == null || self.World.CanPlaceBuilding(self.Location + Info.Offset, actorInfo, buildingInfo, self); } - public Activity GetTransformActivity(Actor self) + public Activity GetTransformActivity() { - return new Transform(self, Info.IntoActor) + return new Transform(Info.IntoActor) { Offset = Info.Offset, Facing = Info.Facing, @@ -140,7 +140,7 @@ namespace OpenRA.Mods.Common.Traits return; } - self.QueueActivity(queued, GetTransformActivity(self)); + self.QueueActivity(queued, GetTransformActivity()); } public void ResolveOrder(Actor self, Order order) diff --git a/OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs b/OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs index 54a4b0f404..0a444583fd 100644 --- a/OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs +++ b/OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs @@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits throw new YamlException($"{nameof(ActorSpawnManager)}.{nameof(SpawnInterval)}'s value(s) must not be less than 0"); } - public override object Create(ActorInitializer init) { return new ActorSpawnManager(init.Self, this); } + public override object Create(ActorInitializer init) { return new ActorSpawnManager(this); } } public class ActorSpawnManager : ConditionalTrait, ITick @@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits int spawnCountdown; int actorsPresent; - public ActorSpawnManager(Actor self, ActorSpawnManagerInfo info) + public ActorSpawnManager(ActorSpawnManagerInfo info) : base(info) { this.info = info; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs index 67149c4f53..800cbe77c7 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs @@ -276,10 +276,7 @@ namespace OpenRA.Mods.Common.Widgets if (world.OrderGenerator is ForceModifiersOrderGenerator fmog && fmog.Modifiers.HasFlag(modifiers)) return true; - if (world.OrderGenerator is UnitOrderGenerator uog && Game.GetModifierKeys().HasFlag(modifiers)) - return true; - - return false; + return world.OrderGenerator is UnitOrderGenerator && Game.GetModifierKeys().HasFlag(modifiers); } void UpdateStateIfNecessary()