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

fix a hack in RenderWarFactory

Browse Source
This commit is contained in:
Bob
2010-01-18 16:51:51 +13:00
parent dada4a99fe
commit 18e46bb886
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Traits/RenderBuilding.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRa.Traits
if( Game.skipMakeAnims ) if( Game.skipMakeAnims )
Complete( self ); Complete( self );
else else
anim.PlayThen( "make", () => Complete( self ) ); anim.PlayThen( "make", () => Game.world.AddFrameEndTask( _ => Complete( self ) ) );
DoBib(self, false); DoBib(self, false);
} }

17
OpenRa.Game/Traits/RenderBuildingWarFactory.cs
View File

@@ -9,14 +9,11 @@ namespace OpenRa.Traits
public object Create(Actor self) { return new RenderWarFactory(self); } public object Create(Actor self) { return new RenderWarFactory(self); }
} }
class RenderWarFactory : IRender, INotifyBuildComplete, INotifyDamage, ITick, INotifyProduction class RenderWarFactory : INotifyBuildComplete, INotifyDamage, ITick, INotifyProduction
{ {
public Animation roof; public Animation roof;
[Sync] [Sync]
bool doneBuilding;
[Sync]
bool isOpen; bool isOpen;
public readonly Actor self;
string GetPrefix(Actor self) string GetPrefix(Actor self)
{ {
@@ -25,27 +22,17 @@ namespace OpenRa.Traits
public RenderWarFactory(Actor self) public RenderWarFactory(Actor self)
{ {
this.self = self;
roof = new Animation(self.traits.Get<RenderSimple>().GetImage(self)); roof = new Animation(self.traits.Get<RenderSimple>().GetImage(self));
} }
public void BuildingComplete( Actor self ) public void BuildingComplete( Actor self )
{ {
doneBuilding = true;
roof.Play( GetPrefix(self) + "idle-top" ); roof.Play( GetPrefix(self) + "idle-top" );
} self.traits.Get<RenderSimple>().anims.Add( "roof", new RenderSimple.AnimationWithOffset( roof ) { ZOffset = 2 } );
public IEnumerable<Renderable> Render(Actor self)
{
if (doneBuilding)
yield return new Renderable(roof.Image,
Game.CellSize * (float2)self.Location, self.Owner.Palette, 2);
} }
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (doneBuilding) roof.Tick();
var b = self.GetBounds(false); var b = self.GetBounds(false);
if (isOpen && !Game.world.UnitInfluence.GetUnitsAt(((1/24f) * self.CenterLocation).ToInt2()).Any()) if (isOpen && !Game.world.UnitInfluence.GetUnitsAt(((1/24f) * self.CenterLocation).ToInt2()).Any())
{ {