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

Replace .WithInterface<T>().Any() => .HasTraitInfo<T>()

Browse Source
This commit is contained in:
atlimit8
2015-09-19 12:38:16 -05:00
parent b38b6eadd0
commit 6e39a5e264
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -279,7 +279,7 @@ namespace OpenRA.Traits
[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")] [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")]
public interface Requires<T> where T : class, ITraitInfo { } public interface Requires<T> where T : class, ITraitInfo { }
[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")] [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")]
public interface UsesInit<T> where T : IActorInit { } public interface UsesInit<T> : ITraitInfo where T : IActorInit { }
public interface INotifySelected { void Selected(Actor self); } public interface INotifySelected { void Selected(Actor self); }
public interface INotifySelection { void SelectionChanged(); } public interface INotifySelection { void SelectionChanged(); }

4
OpenRA.Mods.Common/EditorBrushes/EditorDefaultBrush.cs
View File

@@ -96,13 +96,13 @@ namespace OpenRA.Mods.Common.Widgets
var facing = underCursor.Init<FacingInit>(); var facing = underCursor.Init<FacingInit>();
if (facing != null) if (facing != null)
underCursor.ReplaceInit(new FacingInit((facing.Value(world) + mi.ScrollDelta) % 256)); underCursor.ReplaceInit(new FacingInit((facing.Value(world) + mi.ScrollDelta) % 256));
else if (underCursor.Info.Traits.WithInterface<UsesInit<FacingInit>>().Any()) else if (underCursor.Info.HasTraitInfo<UsesInit<FacingInit>>())
underCursor.ReplaceInit(new FacingInit(mi.ScrollDelta)); underCursor.ReplaceInit(new FacingInit(mi.ScrollDelta));
var turret = underCursor.Init<TurretFacingInit>(); var turret = underCursor.Init<TurretFacingInit>();
if (turret != null) if (turret != null)
underCursor.ReplaceInit(new TurretFacingInit((turret.Value(world) + mi.ScrollDelta) % 256)); underCursor.ReplaceInit(new TurretFacingInit((turret.Value(world) + mi.ScrollDelta) % 256));
else if (underCursor.Info.Traits.WithInterface<UsesInit<TurretFacingInit>>().Any()) else if (underCursor.Info.HasTraitInfo<UsesInit<TurretFacingInit>>())
underCursor.ReplaceInit(new TurretFacingInit(mi.ScrollDelta)); underCursor.ReplaceInit(new TurretFacingInit(mi.ScrollDelta));
} }
} }

4
OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Common.Traits
this.info = info; this.info = info;
manager = self.Trait<UpgradeManager>(); manager = self.Trait<UpgradeManager>();
checkTerrainType = info.AllowedTerrainTypes.Count > 0; checkTerrainType = info.AllowedTerrainTypes.Count > 0;
canTurn = self.Info.Traits.WithInterface<IFacingInfo>().Any(); canTurn = self.Info.HasTraitInfo<IFacingInfo>();
body = Exts.Lazy(self.TraitOrDefault<ISpriteBody>); body = Exts.Lazy(self.TraitOrDefault<ISpriteBody>);
} }
@@ -168,4 +168,4 @@ namespace OpenRA.Mods.Common.Traits
manager.RevokeUpgrade(self, up, this); manager.RevokeUpgrade(self, up, this);
} }
} }
} }

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -241,7 +241,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var assets = template.Get<LabelWidget>("ASSETS"); var assets = template.Get<LabelWidget>("ASSETS");
assets.GetText = () => "$" + world.Actors assets.GetText = () => "$" + world.Actors
.Where(a => a.Owner == player && !a.IsDead && a.Info.Traits.WithInterface<ValuedInfo>().Any()) .Where(a => a.Owner == player && !a.IsDead && a.Info.HasTraitInfo<ValuedInfo>())
.Sum(a => a.Info.Traits.WithInterface<ValuedInfo>().First().Cost); .Sum(a => a.Info.Traits.WithInterface<ValuedInfo>().First().Cost);
var harvesters = template.Get<LabelWidget>("HARVESTERS"); var harvesters = template.Get<LabelWidget>("HARVESTERS");