Dissolve Move namespace into Activities & Traits

This commit is contained in:
reaperrr
2014-12-21 00:44:21 +01:00
parent 38b579a081
commit 5c5210f5e3
40 changed files with 36 additions and 48 deletions

View File

@@ -8,7 +8,8 @@
*/
#endregion
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
@@ -30,14 +31,14 @@ namespace OpenRA.Mods.RA.Scripting
"(in cells) that will be considered close enough to complete the activity.")]
public void Move(CPos cell, int closeEnough = 0)
{
self.QueueActivity(new Move.Move(self, cell, WRange.FromCells(closeEnough)));
self.QueueActivity(new Move(self, cell, WRange.FromCells(closeEnough)));
}
[ScriptActorPropertyActivity]
[Desc("Moves within the cell grid, ignoring lane biases.")]
public void ScriptedMove(CPos cell)
{
self.QueueActivity(new Move.Move(self, cell));
self.QueueActivity(new Move(self, cell));
}
[ScriptActorPropertyActivity]