diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 101e77aeec..071b40e6e7 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -86,7 +86,7 @@ namespace OpenRA.GameRules public class WeaponInfo { public readonly float Range = 0; - public readonly string Report = null; + public readonly string[] Report = null; public readonly int ROF = 1; public readonly int Burst = 1; public readonly bool Charges = false; diff --git a/OpenRA.Mods.RA/CarpetBomb.cs b/OpenRA.Mods.RA/CarpetBomb.cs index 34409a3031..1e9473f972 100644 --- a/OpenRA.Mods.RA/CarpetBomb.cs +++ b/OpenRA.Mods.RA/CarpetBomb.cs @@ -56,8 +56,8 @@ namespace OpenRA.Mods.RA self.World.Add(args.weapon.Projectile.Create(args)); - if (!string.IsNullOrEmpty(args.weapon.Report)) - Sound.Play(args.weapon.Report + ".aud", self.CenterLocation); + if (args.weapon.Report != null) + Sound.Play(args.weapon.Report.Random(self.World.SharedRandom) + ".aud", self.CenterLocation); } } } diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index b8071db40e..f880f01a12 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -154,7 +154,7 @@ namespace OpenRA.Mods.RA }; if (args.weapon.Report != null) - Sound.Play(args.weapon.Report + ".aud", pos); + Sound.Play(args.weapon.Report.Random(attacker.World.SharedRandom) + ".aud", pos); DoImpacts(args); } diff --git a/OpenRA.Mods.RA/Weapon.cs b/OpenRA.Mods.RA/Weapon.cs index 675923f9e5..ecee503ad6 100644 --- a/OpenRA.Mods.RA/Weapon.cs +++ b/OpenRA.Mods.RA/Weapon.cs @@ -1,4 +1,4 @@ -#region Copyright & License Information +#region Copyright & License Information /* * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made @@ -148,8 +148,8 @@ namespace OpenRA.Mods.RA if (projectile != null) self.World.Add(projectile); - if (!string.IsNullOrEmpty(args.weapon.Report)) - Sound.Play(args.weapon.Report + ".aud", self.CenterLocation); + if (args.weapon.Report != null) + Sound.Play(args.weapon.Report.Random(self.World.SharedRandom) + ".aud", self.CenterLocation); } });