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

move initial facing of missile onto AttackBase in prep for fixing 4tnk

Browse Source
This commit is contained in:
Chris Forbes
2010-01-08 10:25:37 +13:00
parent 538cb9421d
commit 8ed8dad4a9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRa.Game/Effects/Missile.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRa.Game.Effects
int Altitude; int Altitude;
public Missile(string weapon, Player owner, Actor firedBy, public Missile(string weapon, Player owner, Actor firedBy,
int2 src, Actor target, int altitude) int2 src, Actor target, int altitude, int facing)
{ {
Weapon = Rules.WeaponInfo[weapon]; Weapon = Rules.WeaponInfo[weapon];
Projectile = Rules.ProjectileInfo[Weapon.Projectile]; Projectile = Rules.ProjectileInfo[Weapon.Projectile];
@@ -31,9 +31,7 @@ namespace OpenRa.Game.Effects
Target = target; Target = target;
Pos = src.ToFloat2(); Pos = src.ToFloat2();
Altitude = altitude; Altitude = altitude;
Facing = facing;
/* todo: initial facing should be turret facing, or unit facing if we're not turreted */
Facing = Traits.Util.GetFacing( Target.CenterLocation - src.ToFloat2(), 0 );
if (Projectile.Image != null && Projectile.Image != "none") if (Projectile.Image != null && Projectile.Image != "none")
{ {

5
OpenRa.Game/Traits/AttackBase.cs
View File

@@ -118,12 +118,15 @@ namespace OpenRa.Game.Traits
var srcAltitude = unit != null ? unit.Altitude : 0; var srcAltitude = unit != null ? unit.Altitude : 0;
var destAltitude = destUnit != null ? destUnit.Altitude : 0; var destAltitude = destUnit != null ? destUnit.Altitude : 0;
var fireFacing = self.traits.Contains<Turreted>()
? self.traits.Get<Turreted>().turretFacing : unit.Facing;
if( weapon.RenderAsTesla ) if( weapon.RenderAsTesla )
Game.world.Add( new TeslaZap( firePos, thisTarget.CenterLocation.ToInt2() ) ); Game.world.Add( new TeslaZap( firePos, thisTarget.CenterLocation.ToInt2() ) );
if( Rules.ProjectileInfo[ weapon.Projectile ].ROT != 0 ) if( Rules.ProjectileInfo[ weapon.Projectile ].ROT != 0 )
Game.world.Add(new Missile(weaponName, self.Owner, self, Game.world.Add(new Missile(weaponName, self.Owner, self,
firePos, thisTarget, srcAltitude)); firePos, thisTarget, srcAltitude, fireFacing));
else else
Game.world.Add(new Bullet(weaponName, self.Owner, self, Game.world.Add(new Bullet(weaponName, self.Owner, self,
firePos, thisTarget.CenterLocation.ToInt2(), srcAltitude, destAltitude)); firePos, thisTarget.CenterLocation.ToInt2(), srcAltitude, destAltitude));