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

Replace ActorInfo.Traits.WithInterface with ActorInfo.TraitInfos<T>()

Browse Source
This commit is contained in:
atlimit8
2015-09-19 13:22:00 -05:00
parent 6e39a5e264
commit 9acf121eb1
48 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Traits/Disguise.cs
View File

@@ -170,7 +170,7 @@ namespace OpenRA.Mods.RA.Traits
var renderSprites = actorInfo.TraitInfoOrDefault<RenderSpritesInfo>();
AsSprite = renderSprites == null ? null : renderSprites.GetImage(actorInfo, self.World.Map.SequenceProvider, newOwner.Faction.InternalName);
AsPlayer = newOwner;
AsTooltipInfo = actorInfo.Traits.WithInterface<TooltipInfo>().FirstOrDefault();
AsTooltipInfo = actorInfo.TraitInfos<TooltipInfo>().FirstOrDefault();
HandleDisguise(oldEffectiveOwner, oldDisguiseSetting);
}

2
OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
View File

@@ -134,7 +134,7 @@ namespace OpenRA.Mods.RA.Traits
if (!info.ValidStances.HasStance(stance))
return false;
return target.Info.Traits.WithInterface<ITargetableInfo>().Any(t => info.Types.Overlaps(t.GetTargetTypes()));
return target.Info.TraitInfos<ITargetableInfo>().Any(t => info.Types.Overlaps(t.GetTargetTypes()));
}
}
}

2
OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
{
// TODO: remove all the Render*Circle duplication
class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecoration
class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecorationInfo
{
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{

2
OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
{
class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecoration
class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecorationInfo
{
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{