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

Make the ICrushable implementation explicit

Browse Source
This commit is contained in:
abcdefg30
2016-01-22 11:01:26 +01:00
parent 8b59ce4dc2
commit f21d1f52e7
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Traits/Mine.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Traits
void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses)
{
if (!CrushableBy(crushClasses, crusher.Owner))
if (!info.CrushClasses.Overlaps(crushClasses))
return;
if (crusher.Info.HasTraitInfo<MineImmuneInfo>() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly))
@@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Traits
self.Kill(crusher);
}
public bool CrushableBy(HashSet<string> crushClasses, Player owner)
bool ICrushable.CrushableBy(HashSet<string> crushClasses, Player owner)
{
return info.CrushClasses.Overlaps(crushClasses);
}