epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5412 from RoosterDragon/formatting

Browse Source 
Formatting
This commit is contained in:
Paul Chote
2014-05-28 12:09:47 +12:00
parent ae7ab8f9e0 0c8bdff5be
commit 7eb2244f4b
18 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Scripting/ScriptContext.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Scripting
throw new InvalidOperationException("[LuaGlobal] attribute not found for global table '{0}'".F(type));
Name = names.First().Name;
Bind(new [] { this });
Bind(new[] { this });
}
}
@@ -143,7 +143,7 @@ namespace OpenRA.Scripting
if (ctor == null)
throw new InvalidOperationException("{0} must define a constructor that takes a ScriptContext context parameter".F(b.Name));
var binding = (ScriptGlobal)ctor.Invoke(new [] { this });
var binding = (ScriptGlobal)ctor.Invoke(new[] { this });
using (var obj = binding.ToLuaValue(this))
registerGlobal.Call(binding.Name, obj).Dispose();
}

4
OpenRA.Game/Traits/Render/RenderSprites.cs
View File

@@ -162,8 +162,8 @@ namespace OpenRA.Traits
};
foreach (var s in states)
if (state >= s.First && anim.HasSequence(s.Second+baseSequence))
return s.Second+baseSequence;
if (state >= s.First && anim.HasSequence(s.Second + baseSequence))
return s.Second + baseSequence;
return baseSequence;
}

8
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -217,7 +217,7 @@ namespace OpenRA.Mods.RA.Move
public void SetPosition(Actor self, CPos cell)
{
SetLocation(cell,fromSubCell, cell,fromSubCell);
SetLocation(cell, fromSubCell, cell, fromSubCell);
SetVisualPosition(self, fromCell.CenterPosition + MobileInfo.SubCellOffsets[fromSubCell]);
FinishedMoving(self);
}
@@ -225,7 +225,7 @@ namespace OpenRA.Mods.RA.Move
public void SetPosition(Actor self, WPos pos)
{
var cell = pos.ToCPos();
SetLocation(cell,fromSubCell, cell,fromSubCell);
SetLocation(cell, fromSubCell, cell, fromSubCell);
SetVisualPosition(self, pos);
FinishedMoving(self);
}
@@ -355,7 +355,7 @@ namespace OpenRA.Mods.RA.Move
public string VoicePhraseForOrder(Actor self, Order order)
{
switch( order.OrderString )
switch (order.OrderString)
{
case "Move":
case "Scatter":
@@ -390,7 +390,7 @@ namespace OpenRA.Mods.RA.Move
return new[]{ fromSubCell, SubCell.TopLeft, SubCell.TopRight, SubCell.Center,
SubCell.BottomLeft, SubCell.BottomRight}.First(b =>
{
var blockingActors = self.World.ActorMap.GetUnitsAt(a,b).Where(c => c != ignoreActor);
var blockingActors = self.World.ActorMap.GetUnitsAt(a, b).Where(c => c != ignoreActor);
if (blockingActors.Any())
{
// Non-sharable unit can enter a cell with shareable units only if it can crush all of them