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

removing a bunch of excessively low-level pixel -> cell conversions

Browse Source
This commit is contained in:
Chris Forbes
2010-06-23 17:53:46 +12:00
committed by Paul Chote
parent 2dcc85f608
commit b8093b7f6c
15 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Activities/Fly.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Activities
var aircraft = self.traits.Get<Aircraft>();
self.CenterLocation += speed * -float2.FromAngle((float)angle);
aircraft.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
aircraft.Location = Util.CellContaining(self.CenterLocation);
unit.Altitude += Math.Sign(desiredAltitude - unit.Altitude);
}

4
OpenRA.Mods.RA/Activities/HeliFly.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.RA.Activities
if (float2.WithinEpsilon(float2.Zero, dist, 2))
{
self.CenterLocation = Dest;
aircraft.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
aircraft.Location = Util.CellContaining(self.CenterLocation);
return NextActivity;
}
@@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA.Activities
var rawSpeed = .2f * Util.GetEffectiveSpeed(self, UnitMovementType.Fly);
self.CenterLocation += (rawSpeed / dist.Length) * dist;
aircraft.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
aircraft.Location = Util.CellContaining(self.CenterLocation);
return this;
}

2
OpenRA.Mods.RA/Activities/Land.cs
View File

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Activities
var angle = unit.Facing / 128f * Math.PI;
self.CenterLocation += speed * -float2.FromAngle((float)angle);
aircraft.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
aircraft.Location = Util.CellContaining(self.CenterLocation);
return this;
}

2
OpenRA.Mods.RA/Activities/LayMines.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Activities
if (rearmTarget == null)
return new Wait(20);
return new Move(((1 / 24f) * rearmTarget.CenterLocation).ToInt2(), rearmTarget)
return new Move(Util.CellContaining(rearmTarget.CenterLocation), rearmTarget)
{ NextActivity = new Rearm() { NextActivity = new Repair(rearmTarget) { NextActivity = this } } };
}