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

Make Tick and TickIdle explicit in WithInfantryBody

Browse Source
This commit is contained in:
reaperrr
2017-09-07 17:38:23 +02:00
committed by Matthias Mailänder
parent a1ef581749
commit ddfed13db4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Render/WithDisguisingInfantryBody.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
intendedSprite = disguise.AsSprite; intendedSprite = disguise.AsSprite;
} }
public override void Tick(Actor self) protected override void Tick(Actor self)
{ {
if (disguise.AsSprite != intendedSprite) if (disguise.AsSprite != intendedSprite)
{ {

9
OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
View File

@@ -122,7 +122,12 @@ namespace OpenRA.Mods.Common.Traits.Render
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { } void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { }
public virtual void Tick(Actor self) void ITick.Tick(Actor self)
{
Tick(self);
}
protected virtual void Tick(Actor self)
{ {
if (rsm != null) if (rsm != null)
{ {
@@ -147,7 +152,7 @@ namespace OpenRA.Mods.Common.Traits.Render
dirty = false; dirty = false;
} }
public void TickIdle(Actor self) void INotifyIdle.TickIdle(Actor self)
{ {
if (state != AnimationState.Idle && state != AnimationState.IdleAnimating && state != AnimationState.Attacking) if (state != AnimationState.Idle && state != AnimationState.IdleAnimating && state != AnimationState.Attacking)
{ {