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

Remove IDisable for good

Browse Source
This commit is contained in:
reaperrr
2017-11-19 18:12:55 +01:00
committed by Paul Chote
parent c1cba4ecc1
commit 01a88862b3
7 changed files with 22 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Actor.cs
View File

@@ -75,7 +75,6 @@ namespace OpenRA
readonly IRenderModifier[] renderModifiers;
readonly IRender[] renders;
readonly IMouseBounds[] mouseBounds;
readonly IDisable[] disables;
readonly IVisibilityModifier[] visibilityModifiers;
readonly IDefaultVisibility defaultVisibility;
@@ -116,7 +115,6 @@ namespace OpenRA
renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
renders = TraitsImplementing<IRender>().ToArray();
mouseBounds = TraitsImplementing<IMouseBounds>().ToArray();
disables = TraitsImplementing<IDisable>().ToArray();
visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
defaultVisibility = Trait<IDefaultVisibility>();
Targetables = TraitsImplementing<ITargetable>().ToArray();
@@ -325,18 +323,6 @@ namespace OpenRA
health.Kill(this, attacker);
}
/// <summary>
/// DEPRECATED! See <see cref="http://bugs.openra.net/10237"/>. Use conditional traits and IsTraitDisabled instead.
/// </summary>
public bool IsDisabled()
{
// PERF: Avoid LINQ.
foreach (var disable in disables)
if (disable.Disabled)
return true;
return false;
}
public bool CanBeViewedByPlayer(Player player)
{
// PERF: Avoid LINQ.