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

Move the creation of the CrushedSequence to WithDeathAnimation

Browse Source
This commit is contained in:
abcdefg30
2016-01-22 13:55:05 +01:00
parent fe5754e2bd
commit a46815e532
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Traits/Crushable.cs
View File

@@ -57,17 +57,6 @@ namespace OpenRA.Mods.Common.Traits
Game.Sound.Play(info.CrushSound, crusher.CenterPosition); Game.Sound.Play(info.CrushSound, crusher.CenterPosition);
var wda = self.TraitsImplementing<WithDeathAnimation>()
.FirstOrDefault(s => s.Info.CrushedSequence != null);
if (wda != null)
{
var palette = wda.Info.CrushedSequencePalette;
if (wda.Info.CrushedPaletteIsPlayerPalette)
palette += self.Owner.InternalName;
wda.SpawnDeathAnimation(self, wda.Info.CrushedSequence, palette);
}
self.Kill(crusher); self.Kill(crusher);
} }

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

@@ -117,6 +117,15 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses) void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses)
{ {
crushed = true; crushed = true;
if (Info.CrushedSequence == null)
return;
var crushPalette = Info.CrushedSequencePalette;
if (Info.CrushedPaletteIsPlayerPalette)
crushPalette += self.Owner.InternalName;
SpawnDeathAnimation(self, Info.CrushedSequence, crushPalette);
} }
void INotifyCrushed.WarnCrush(Actor self, Actor crusher, HashSet<string> crushClasses) { } void INotifyCrushed.WarnCrush(Actor self, Actor crusher, HashSet<string> crushClasses) { }