make RenderBuildingOre slightly more robust; remove some junk

This commit is contained in:
Chris Forbes
2011-04-17 19:17:41 +12:00
committed by Paul Chote
parent ae645bbafe
commit 76b3e2325b
3 changed files with 6 additions and 9 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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" );
}
} }
} }