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

merge ParachuteAttachment and Parachutable

Browse Source
This commit is contained in:
Matthias Mailänder
2014-06-22 14:49:00 +02:00
parent e04ff18060
commit ff1be8daea
6 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,12 +28,13 @@ namespace OpenRA.Mods.RA.Effects
{
this.cargo = cargo;
var pai = cargo.Info.Traits.GetOrDefault<ParachuteAttachmentInfo>();
paraAnim = new Animation(cargo.World, pai != null ? pai.ParachuteSprite : "parach");
var parachutableInfo = cargo.Info.Traits.GetOrDefault<ParachutableInfo>();
var sprite = parachutableInfo != null ? parachutableInfo.ParachuteSprite : "parach";
paraAnim = new Animation(cargo.World, sprite);
paraAnim.PlayThen("open", () => paraAnim.PlayRepeating("idle"));
if (pai != null)
parachuteOffset = pai.Offset;
if (parachutableInfo != null)
parachuteOffset = parachutableInfo.ParachuteOffset;
// Adjust x,y to match the target subcell
cargo.Trait<IPositionable>().SetPosition(cargo, cargo.World.Map.CellContaining(dropPosition));