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

Merge pull request #6453 from reaperrr/wda-followup

Browse Source 
Follow-up to #6396 (WithDeathAnimation)
This commit is contained in:
Matthias Mailänder
2014-09-14 08:43:51 +02:00
parent eab8e2e6e2 c451b07c05
commit 819ad44d93
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Crushable.cs
View File

@@ -54,8 +54,8 @@ namespace OpenRA.Mods.RA
var wda = self.TraitOrDefault<WithDeathAnimation>();
if (wda != null)
{
var palette = wda.Info.DeathSequencePalette;
if (wda.Info.DeathPaletteIsPlayerPalette)
var palette = wda.Info.CrushedSequencePalette;
if (wda.Info.CrushedPaletteIsPlayerPalette)
palette += self.Owner.InternalName;
wda.SpawnDeathAnimation(self, wda.Info.CrushedSequence, palette);