From 77b88729e6bb363c913e6116e08f60110e951ab3 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 23 Apr 2010 21:30:13 +1200 Subject: [PATCH] fix crash in prev; fix broken pathing wrt crushables --- OpenRA.Game/GameRules/WeaponInfo.cs | 1 + OpenRA.Game/PathFinder.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index b02bb98ace..10ec37effd 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -102,6 +102,7 @@ namespace OpenRA.GameRules case "Charges": FieldLoader.LoadField(this, "Charges", content.Nodes["Charges"].Value); break; case "ValidTargets": FieldLoader.LoadField(this, "ValidTargets", content.Nodes["ValidTargets"].Value); break; case "Underwater": FieldLoader.LoadField(this, "Underwater", content.Nodes["Underwater"].Value); break; + case "BurstDelay": FieldLoader.LoadField(this, "BurstDelay", content.Nodes["BurstDelay"].Value); break; case "Warhead": { diff --git a/OpenRA.Game/PathFinder.cs b/OpenRA.Game/PathFinder.cs index 9821506316..72a6f48df9 100644 --- a/OpenRA.Game/PathFinder.cs +++ b/OpenRA.Game/PathFinder.cs @@ -72,9 +72,9 @@ namespace OpenRA } var pb = FindBidiPath( - PathSearch.FromPoint(world, target, from, umt, false) + PathSearch.FromPoint(world, target, from, umt, true) .WithCustomBlocker(AvoidUnitsNear(from, 4)), - PathSearch.FromPoint(world, from, target, umt, false) + PathSearch.FromPoint(world, from, target, umt, true) .WithCustomBlocker(AvoidUnitsNear(from, 4)) .InReverse());