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

Merge pull request #10156 from abcdefg30/deathSoundsAny

Browse Source 
Fix DeathSounds not working without DeathTypes defined
This commit is contained in:
Oliver Brakmann
2015-12-05 18:16:50 +01:00
parent 0c44bac636 642e213049
commit d5dc49db85
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs
View File

@@ -41,11 +41,8 @@ namespace OpenRA.Mods.Common.Traits
{ {
var warhead = e.Warhead as DamageWarhead; var warhead = e.Warhead as DamageWarhead;
// Killed by some non-standard means // If the warhead is null, the actor was killed by some non-standard means
if (warhead == null) if (info.DeathTypes.Count == 0 || (warhead != null && warhead.DamageTypes.Overlaps(info.DeathTypes)))
return;
if (warhead.DamageTypes.Overlaps(info.DeathTypes))
self.PlayVoiceLocal(info.Voice, info.VolumeMultiplier); self.PlayVoiceLocal(info.Voice, info.VolumeMultiplier);
} }
} }