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

Remove passing the warheads from DamageWarhead to AttackInfo.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Actor.cs
View File

@@ -317,12 +317,12 @@ namespace OpenRA
return (health == null) ? DamageState.Undamaged : health.DamageState;
}
public void InflictDamage(Actor attacker, int damage, IWarhead warhead)
public void InflictDamage(Actor attacker, Damage damage)
{
if (Disposed || health == null)
return;
health.InflictDamage(this, attacker, damage, warhead, false);
health.InflictDamage(this, attacker, damage, false);
}
public void Kill(Actor attacker)