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

Add support for multiple IWallConnector traits

Browse Source
This commit is contained in:
teees
2015-11-26 13:09:24 +01:00
parent 1de1458fda
commit 18e26d87c7
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Render/WithGateSpriteBody.cs
View File

@@ -73,8 +73,8 @@ namespace OpenRA.Mods.Common.Traits
var adjacentActorTraits = adjacent.SelectMany(self.World.ActorMap.GetActorsAt) var adjacentActorTraits = adjacent.SelectMany(self.World.ActorMap.GetActorsAt)
.SelectMany(a => a.TraitsImplementing<IWallConnector>()); .SelectMany(a => a.TraitsImplementing<IWallConnector>());
foreach (var aat in adjacentActorTraits) foreach (var rb in adjacentActorTraits)
aat.SetDirty(); rb.SetDirty();
} }
public void RemovedFromWorld(Actor self) public void RemovedFromWorld(Actor self)

13
OpenRA.Mods.Common/Traits/Render/WithWallSpriteBody.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
var haveNeighbour = false; var haveNeighbour = false;
foreach (var n in kv.Value) foreach (var n in kv.Value)
{ {
var rb = init.World.Map.Rules.Actors[n].TraitInfoOrDefault<WithWallSpriteBodyInfo>(); var rb = init.World.Map.Rules.Actors[n].TraitInfos<WithWallSpriteBodyInfo>().FirstOrDefault(Exts.IsTraitEnabled);
if (rb != null && rb.Type == Type) if (rb != null && rb.Type == Type)
{ {
haveNeighbour = true; haveNeighbour = true;
@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var a in adjacentActors) foreach (var a in adjacentActors)
{ {
CVec facing; CVec facing;
var wc = a.TraitOrDefault<IWallConnector>(); var wc = a.TraitsImplementing<IWallConnector>().FirstOrDefault(Exts.IsTraitEnabled);
if (wc == null || !wc.AdjacentWallCanConnect(a, self.Location, wallInfo.Type, out facing)) if (wc == null || !wc.AdjacentWallCanConnect(a, self.Location, wallInfo.Type, out facing))
continue; continue;
@@ -132,13 +132,12 @@ namespace OpenRA.Mods.Common.Traits
static void UpdateNeighbours(Actor self) static void UpdateNeighbours(Actor self)
{ {
var adjacentActors = CVec.Directions.SelectMany(dir => var adjacentActorTraits = CVec.Directions.SelectMany(dir =>
self.World.ActorMap.GetActorsAt(self.Location + dir)) self.World.ActorMap.GetActorsAt(self.Location + dir))
.Select(a => a.TraitOrDefault<IWallConnector>()) .SelectMany(a => a.TraitsImplementing<IWallConnector>());
.Where(a => a != null);
foreach (var rb in adjacentActors) foreach (var aat in adjacentActorTraits)
rb.SetDirty(); aat.SetDirty();
} }
public void RemovedFromWorld(Actor self) public void RemovedFromWorld(Actor self)