Merge branch 'master' of git://github.com/chrisforbes/OpenRA

This commit is contained in:
pchote
2009-12-18 16:45:17 -08:00
4 changed files with 16 additions and 28 deletions

View File

@@ -38,8 +38,8 @@ namespace OpenRa.Game.Traits
if (order.OrderString == "UsePortableChronoshift" && CanEnterCell(order.TargetLocation, self))
{
//self.QueueActivity(new Activities.Teleport(order.TargetLocation));
Sound.Play("chrotnk1.aud");
self.QueueActivity(new Activities.Teleport(order.TargetLocation));
// Sound.Play("chrotnk1.aud");
chronoshiftActive = false;
remainingChargeTime = chargeTime;
}