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

Rename Actor.Destroy/Destroyed to Dispose/Disposed.

Browse Source
This commit is contained in:
Paul Chote
2015-05-23 19:50:30 +01:00
parent 4c72b0066c
commit 585a43fd8f
45 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/ProximityCapturable.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Traits
{
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed || captor.Destroyed) return;
if (self.Disposed || captor.Disposed) return;
var previousOwner = self.Owner;
@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<Actor> UnitsInRange()
{
return Self.World.FindActorsInCircle(Self.CenterPosition, WRange.FromCells(Info.Range))
.Where(a => a.IsInWorld && a != Self && !a.Destroyed && !a.Owner.NonCombatant);
.Where(a => a.IsInWorld && a != Self && !a.Disposed && !a.Owner.NonCombatant);
}
bool IsClear(Actor self, Player currentOwner, Player originalOwner)