Remove passing the warheads from DamageWarhead to AttackInfo.

Added a Damage class to pass damage value and damage(types) instead.
This removes a great amount of overhead and longterm opens possibilities to have damagetypes without warheads.
This commit is contained in:
Zimmermann Gyula
2016-06-24 13:18:15 +02:00
parent 6342b40bfd
commit cf8fff2b99
30 changed files with 69 additions and 64 deletions

View File

@@ -55,13 +55,13 @@ namespace OpenRA.Mods.Common.Traits
if (--ticks <= 0)
{
ticks = Info.Delay;
self.InflictDamage(self, -Info.Step, null);
self.InflictDamage(self, new Damage(-Info.Step));
}
}
public void Damaged(Actor self, AttackInfo e)
{
if (e.Damage > 0)
if (e.Damage.Value > 0)
damageTicks = Info.DamageCooldown;
}
}