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

Fix crushed sequences not appearing due to an FrameEndTask

Browse Source
This commit is contained in:
abcdefg30
2016-01-29 21:40:44 +01:00
parent 24ec7b0ad7
commit 5327ea1418
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Traits
if (e.Warhead == null || !(e.Warhead is DamageWarhead)) if (e.Warhead == null || !(e.Warhead is DamageWarhead))
{ {
if (Info.FallbackSequence != null) if (Info.FallbackSequence != null)
SpawnDeathAnimation(self, Info.FallbackSequence, palette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), Info.FallbackSequence, palette);
return; return;
} }
@@ -102,16 +102,12 @@ namespace OpenRA.Mods.Common.Traits
sequence += Info.DeathTypes[damageType]; sequence += Info.DeathTypes[damageType];
} }
SpawnDeathAnimation(self, sequence, palette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), sequence, palette);
} }
public void SpawnDeathAnimation(Actor self, string sequence, string palette) public void SpawnDeathAnimation(Actor self, WPos pos, string image, string sequence, string palette)
{ {
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w => w.Add(new Corpse(w, pos, image, sequence, palette)));
{
if (!self.Disposed)
w.Add(new Corpse(w, self.CenterPosition, rs.GetImage(self), sequence, palette));
});
} }
void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses) void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses)
@@ -125,7 +121,7 @@ namespace OpenRA.Mods.Common.Traits
if (Info.CrushedPaletteIsPlayerPalette) if (Info.CrushedPaletteIsPlayerPalette)
crushPalette += self.Owner.InternalName; crushPalette += self.Owner.InternalName;
SpawnDeathAnimation(self, Info.CrushedSequence, crushPalette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), Info.CrushedSequence, crushPalette);
} }
void INotifyCrushed.WarnCrush(Actor self, Actor crusher, HashSet<string> crushClasses) { } void INotifyCrushed.WarnCrush(Actor self, Actor crusher, HashSet<string> crushClasses) { }