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

Change the parameters of ICrushable.CrushableBy

Browse Source
This commit is contained in:
abcdefg30
2016-01-23 15:39:03 +01:00
parent 9ea2a7a0bd
commit fe5754e2bd
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -304,7 +304,7 @@ namespace OpenRA.Traits
[RequireExplicitImplementation] [RequireExplicitImplementation]
public interface ICrushable public interface ICrushable
{ {
bool CrushableBy(HashSet<string> crushClasses, Player owner); bool CrushableBy(Actor self, Actor crusher, HashSet<string> crushClasses);
} }
[RequireExplicitImplementation] [RequireExplicitImplementation]

2
OpenRA.Mods.Common/Traits/Crates/Crate.cs
View File

@@ -198,7 +198,7 @@ namespace OpenRA.Mods.Common.Traits
return GetAvailableSubCell(a, SubCell.Any, ignoreActor, checkTransientActors) != SubCell.Invalid; return GetAvailableSubCell(a, SubCell.Any, ignoreActor, checkTransientActors) != SubCell.Invalid;
} }
bool ICrushable.CrushableBy(HashSet<string> crushClasses, Player owner) bool ICrushable.CrushableBy(Actor self, Actor crusher, HashSet<string> crushClasses)
{ {
// Crate can only be crushed if it is not in the air. // Crate can only be crushed if it is not in the air.
return self.IsAtGroundLevel() && crushClasses.Contains(info.CrushClass); return self.IsAtGroundLevel() && crushClasses.Contains(info.CrushClass);

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

@@ -71,9 +71,9 @@ namespace OpenRA.Mods.Common.Traits
self.Kill(crusher); self.Kill(crusher);
} }
bool ICrushable.CrushableBy(HashSet<string> crushClasses, Player crushOwner) bool ICrushable.CrushableBy(Actor self, Actor crusher, HashSet<string> crushClasses)
{ {
return CrushableInner(crushClasses, crushOwner); return CrushableInner(crushClasses, crusher.Owner);
} }
bool CrushableInner(HashSet<string> crushClasses, Player crushOwner) bool CrushableInner(HashSet<string> crushClasses, Player crushOwner)

2
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -260,7 +260,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var crushable in crushables) foreach (var crushable in crushables)
{ {
lacksCrushability = false; lacksCrushability = false;
if (!crushable.CrushableBy(Crushes, self.Owner)) if (!crushable.CrushableBy(otherActor, self, Crushes))
return true; return true;
} }

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

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Traits
self.Kill(crusher); self.Kill(crusher);
} }
bool ICrushable.CrushableBy(HashSet<string> crushClasses, Player owner) bool ICrushable.CrushableBy(Actor self, Actor crusher, HashSet<string> crushClasses)
{ {
return info.CrushClasses.Overlaps(crushClasses); return info.CrushClasses.Overlaps(crushClasses);
} }