make RenderBuildingOre slightly more robust; remove some junk
This commit is contained in:
@@ -51,7 +51,7 @@ namespace OpenRA.Mods.RA.Render
|
|||||||
self.QueueActivity(new MakeAnimation(self));
|
self.QueueActivity(new MakeAnimation(self));
|
||||||
|
|
||||||
// Can't call Complete() from ctor because other traits haven't been inited yet
|
// Can't call Complete() from ctor because other traits haven't been inited yet
|
||||||
self.QueueActivity(new CallFunc(() => self.World.AddFrameEndTask( _ => Complete( self ) )));
|
self.QueueActivity(new CallFunc(() => Complete(self)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
|
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
|
||||||
|
|||||||
@@ -29,8 +29,10 @@ namespace OpenRA.Mods.RA.Render
|
|||||||
|
|
||||||
public void BuildingComplete( Actor self )
|
public void BuildingComplete( Actor self )
|
||||||
{
|
{
|
||||||
anim.PlayFetchIndex( "idle",
|
anim.PlayFetchIndex("idle",
|
||||||
() => (49 * PlayerResources.Ore) / (10*PlayerResources.OreCapacity));
|
() => PlayerResources.OreCapacity != 0
|
||||||
|
? (49 * PlayerResources.Ore) / (10 * PlayerResources.OreCapacity)
|
||||||
|
: 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnCapture (Actor self, Actor captor, Player oldOwner, Player newOwner)
|
public void OnCapture (Actor self, Actor captor, Player oldOwner, Player newOwner)
|
||||||
|
|||||||
@@ -18,14 +18,9 @@ namespace OpenRA.Mods.RA.Render
|
|||||||
public override object Create(ActorInitializer init) { return new RenderBuildingTurreted( init, this ); }
|
public override object Create(ActorInitializer init) { return new RenderBuildingTurreted( init, this ); }
|
||||||
}
|
}
|
||||||
|
|
||||||
class RenderBuildingTurreted : RenderBuilding, INotifyBuildComplete
|
class RenderBuildingTurreted : RenderBuilding
|
||||||
{
|
{
|
||||||
public RenderBuildingTurreted( ActorInitializer init, RenderBuildingInfo info )
|
public RenderBuildingTurreted( ActorInitializer init, RenderBuildingInfo info )
|
||||||
: base(init, info, () => init.self.Trait<Turreted>().turretFacing) { }
|
: base(init, info, () => init.self.Trait<Turreted>().turretFacing) { }
|
||||||
|
|
||||||
public void BuildingComplete( Actor self )
|
|
||||||
{
|
|
||||||
anim.Play( "idle" );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user