From 3dd27fcb77bc5aec1c51260ad3ef5999f5c5e3e6 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 6 Nov 2010 16:35:51 +1300 Subject: [PATCH] fix crash involving crushing and dead walls --- OpenRA.Game/Traits/World/UnitInfluence.cs | 4 ++-- OpenRA.Mods.RA/Buildings/Wall.cs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Traits/World/UnitInfluence.cs b/OpenRA.Game/Traits/World/UnitInfluence.cs index 06fd0d06c8..9cb9fdf0f5 100644 --- a/OpenRA.Game/Traits/World/UnitInfluence.cs +++ b/OpenRA.Game/Traits/World/UnitInfluence.cs @@ -72,8 +72,8 @@ namespace OpenRA.Traits return; else if( influenceNode.actor == toRemove ) influenceNode = influenceNode.next; - else - RemoveInner( ref influenceNode.next, toRemove ); + + RemoveInner( ref influenceNode.next, toRemove ); } public void Update(Actor self, IOccupySpace unit) diff --git a/OpenRA.Mods.RA/Buildings/Wall.cs b/OpenRA.Mods.RA/Buildings/Wall.cs index 8e93e5314a..45671b7f6a 100755 --- a/OpenRA.Mods.RA/Buildings/Wall.cs +++ b/OpenRA.Mods.RA/Buildings/Wall.cs @@ -29,7 +29,6 @@ namespace OpenRA.Mods.RA.Buildings { this.self = self; this.info = info; - self.World.WorldActor.Trait().Add(self, self.Trait()); } public IEnumerable CrushClasses { get { return info.CrushClasses; } }