Move to a cell you cannot enter doesn't make affirmative sound or cancel existing orders

This commit is contained in:
alzeih
2010-02-27 00:22:55 +13:00
parent 29499ba3d8
commit 9f5e83aed9
6 changed files with 28 additions and 18 deletions

View File

@@ -1,4 +1,4 @@
#region Copyright & License Information
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
@@ -92,8 +92,11 @@ namespace OpenRa.Traits
{
if (order.OrderString == "Move")
{
self.CancelActivity();
self.QueueActivity(new Activities.Move(order.TargetLocation, 8));
if (self.traits.GetOrDefault<IMovement>().CanEnterCell(order.TargetLocation))
{
self.CancelActivity();
self.QueueActivity(new Activities.Move(order.TargetLocation, 8));
}
}
}