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

Rename existing fields that are caching TraitsImplementing calls for consistency.

Browse Source
This commit is contained in:
RoosterDragon
2015-04-22 20:09:41 +01:00
parent a48a878a71
commit 6125d7c117
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Actor.cs
View File

@@ -83,8 +83,8 @@ namespace OpenRA
} }
} }
readonly IRenderModifier[] traitsImplementingRenderModifier; readonly IRenderModifier[] renderModifiers;
readonly IRender[] traitsImplementingRender; readonly IRender[] renders;
internal Actor(World world, string name, TypeDictionary initDict) internal Actor(World world, string name, TypeDictionary initDict)
{ {
@@ -126,8 +126,8 @@ namespace OpenRA
return new Rectangle(offset.X, offset.Y, size.X, size.Y); return new Rectangle(offset.X, offset.Y, size.X, size.Y);
}); });
traitsImplementingRenderModifier = TraitsImplementing<IRenderModifier>().ToArray(); renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
traitsImplementingRender = TraitsImplementing<IRender>().ToArray(); renders = TraitsImplementing<IRender>().ToArray();
} }
public void Tick() public void Tick()
@@ -143,14 +143,14 @@ namespace OpenRA
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
var renderables = Renderables(wr); var renderables = Renderables(wr);
foreach (var modifier in traitsImplementingRenderModifier) foreach (var modifier in renderModifiers)
renderables = modifier.ModifyRender(this, wr, renderables); renderables = modifier.ModifyRender(this, wr, renderables);
return renderables; return renderables;
} }
IEnumerable<IRenderable> Renderables(WorldRenderer wr) IEnumerable<IRenderable> Renderables(WorldRenderer wr)
{ {
foreach (var render in traitsImplementingRender) foreach (var render in renders)
foreach (var renderable in render.Render(this, wr)) foreach (var renderable in render.Render(this, wr))
yield return renderable; yield return renderable;
} }