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

Remove fp from CenterLocation and aircraft.

Browse Source
This commit is contained in:
Paul Chote
2011-01-01 13:21:22 +13:00
parent d395c5e05d
commit 60e3f7621f
13 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Effects/LaserZap.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.RA.Effects
if (!doneDamage)
{
if (args.target.IsValid)
args.dest = args.target.CenterLocation.ToInt2();
args.dest = args.target.CenterLocation;
Combat.DoImpacts(args);
doneDamage = true;

9
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Effects
readonly ProjectileArgs Args;
int2 offset;
float2 Pos;
int2 Pos;
readonly Animation anim;
int Facing;
int t;
@@ -93,12 +93,13 @@ namespace OpenRA.Mods.RA.Effects
var speed = Scale * Info.Speed * ((targetAltitude > 0 && Info.TurboBoost) ? 1.5f : 1f);
var angle = Facing / 128f * Math.PI;
var move = speed * -float2.FromAngle((float)angle);
// TODO: Replace float2.FromAngle with int2.FromFacing
var move = (speed * -float2.FromAngle((float)angle)).ToInt2();
Pos += move;
if (Info.Trail != null)
world.AddFrameEndTask(w => w.Add(
new Smoke(w, (Pos - 1.5f * move - new int2(0, Altitude)).ToInt2(), Info.Trail)));
new Smoke(w, (Pos - 1.5f * move.ToFloat2() - new int2(0, Altitude)).ToInt2(), Info.Trail)));
if (Info.RangeLimit != 0 && t > Info.RangeLimit * 40)
Explode(world);
@@ -116,7 +117,7 @@ namespace OpenRA.Mods.RA.Effects
void Explode(World world)
{
world.AddFrameEndTask(w => w.Remove(this));
Args.dest = Pos.ToInt2();
Args.dest = Pos;
if (t > Info.Arm * 40) /* don't blow up in our launcher's face! */
Combat.DoImpacts(Args);
}

2
OpenRA.Mods.RA/Effects/TeslaZap.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Effects
if (!doneDamage)
{
if (Args.target.IsValid)
Args.dest = Args.target.CenterLocation.ToInt2();
Args.dest = Args.target.CenterLocation;
Combat.DoImpacts(Args);
doneDamage = true;