Correct the ordering on DamageState

This commit is contained in:
Paul Chote
2010-07-30 22:02:19 +12:00
parent 4cf0610fd9
commit 8528c5d3a3
12 changed files with 28 additions and 40 deletions

View File

@@ -168,8 +168,8 @@ namespace OpenRA.Mods.RA
}
var ds = Health.DamageState;
currentTemplate = (ds == DamageState.Heavy && Info.DamagedTemplate > 0) ? Info.DamagedTemplate :
(ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate : Info.Template;
currentTemplate = (ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate :
(ds >= DamageState.Heavy && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : Info.Template;
if (Info.Long && ds == DamageState.Dead)
{