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

Move PlayVoice and PlayVoiceLocal from Sound to Voiced.

Browse Source 
Move HasVoice, HasVoices and GetVoices from WorldUtils to Voiced.
This commit is contained in:
reaperrr
2015-05-12 16:35:31 +02:00
parent 037bd6794c
commit 251d3e6864
9 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Sound/AnnounceOnBuild.cs
View File

@@ -19,7 +19,8 @@ namespace OpenRA.Mods.Common.Traits
{
public void BuildingComplete(Actor self)
{
Sound.PlayVoice("Build", self, self.Owner.Country.Race);
foreach (var voiced in self.TraitsImplementing<IVoiced>())
voiced.PlayVoice("Build", self, self.Owner.Country.Race);
}
}
}

3
OpenRA.Mods.Common/Traits/Sound/AnnounceOnKill.cs
View File

@@ -39,7 +39,8 @@ namespace OpenRA.Mods.Common.Traits
if (e.DamageState == DamageState.Dead && damaged != e.Attacker)
{
if (self.World.WorldTick - lastAnnounce > info.Interval * 25)
Sound.PlayVoice("Kill", self, self.Owner.Country.Race);
foreach (var voiced in self.TraitsImplementing<IVoiced>())
voiced.PlayVoice("Kill", self, self.Owner.Country.Race);
lastAnnounce = self.World.WorldTick;
}

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

@@ -42,9 +42,11 @@ namespace OpenRA.Mods.Common.Traits
var cp = self.CenterPosition;
if (info.DeathTypes.Contains(e.Warhead.DeathType) ||
(!info.DeathTypes.Any() && !self.Info.Traits.WithInterface<DeathSoundsInfo>().Any(dsi => dsi.DeathTypes.Contains(e.Warhead.DeathType))))
Sound.PlayVoiceLocal(info.DeathSound, self, self.Owner.Country.Race, cp, info.VolumeMultiplier);
foreach (var voiced in self.TraitsImplementing<IVoiced>())
if (info.DeathTypes.Contains(e.Warhead.DeathType) ||
(!info.DeathTypes.Any() && !self.Info.Traits.WithInterface<DeathSoundsInfo>()
.Any(dsi => dsi.DeathTypes.Contains(e.Warhead.DeathType))))
voiced.PlayVoiceLocal(info.DeathSound, self, self.Owner.Country.Race, cp, info.VolumeMultiplier);
}
}
}