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

Use a consistent set of arguments for Render* ctors.

Browse Source
This commit is contained in:
Paul Chote
2014-07-09 19:00:35 +12:00
committed by Paul Chote
parent d135e58ad9
commit f606a1bfd7
12 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Traits/Render/RenderDisguise.cs
View File

@@ -15,7 +15,7 @@ namespace OpenRA.Mods.RA.Traits
{
class RenderDisguiseInfo : RenderInfantryInfo, Requires<DisguiseInfo>
{
public override object Create(ActorInitializer init) { return new RenderDisguise(init.Self, this); }
public override object Create(ActorInitializer init) { return new RenderDisguise(init, this); }
}
class RenderDisguise : RenderInfantry
@@ -24,11 +24,11 @@ namespace OpenRA.Mods.RA.Traits
string intendedSprite;
Disguise disguise;
public RenderDisguise(Actor self, RenderDisguiseInfo info)
: base(self, info)
public RenderDisguise(ActorInitializer init, RenderDisguiseInfo info)
: base(init, info)
{
this.info = info;
disguise = self.Trait<Disguise>();
disguise = init.Self.Trait<Disguise>();
intendedSprite = disguise.AsSprite;
}

8
OpenRA.Mods.RA/Traits/Render/RenderLandingCraft.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Traits
public readonly string OpenAnim = "open";
public readonly string UnloadAnim = "unload";
public override object Create(ActorInitializer init) { return new RenderLandingCraft(init.Self, this); }
public override object Create(ActorInitializer init) { return new RenderLandingCraft(init, this); }
}
public class RenderLandingCraft : RenderUnit
@@ -31,11 +31,11 @@ namespace OpenRA.Mods.RA.Traits
readonly IMove move;
bool open;
public RenderLandingCraft(Actor self, RenderLandingCraftInfo info)
: base(self)
public RenderLandingCraft(ActorInitializer init, RenderLandingCraftInfo info)
: base(init, info)
{
this.info = info;
this.self = self;
self = init.Self;
cargo = self.Trait<Cargo>();
move = self.Trait<IMove>();
}

10
OpenRA.Mods.RA/Traits/Render/RenderUnitReload.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA.Traits
[Desc("Armament name")]
public readonly string Armament = "primary";
public override object Create(ActorInitializer init) { return new RenderUnitReload(init.Self, this); }
public override object Create(ActorInitializer init) { return new RenderUnitReload(init, this); }
}
class RenderUnitReload : RenderUnit
@@ -27,11 +27,11 @@ namespace OpenRA.Mods.RA.Traits
readonly AttackBase attack;
readonly Armament armament;
public RenderUnitReload(Actor self, RenderUnitReloadInfo info)
: base(self)
public RenderUnitReload(ActorInitializer init, RenderUnitReloadInfo info)
: base(init, info)
{
attack = self.Trait<AttackBase>();
armament = self.TraitsImplementing<Armament>()
attack = init.Self.Trait<AttackBase>();
armament = init.Self.TraitsImplementing<Armament>()
.Single(a => a.Info.Name == info.Armament);
}