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

Merge pull request #2931 from Mailaender/missing-sound-exception

Browse Source 
Throw specific exception on missing sound definitions
This commit is contained in:
Chris Forbes
2013-04-03 02:05:55 -07:00
parent 7bbac5659d 3dfce53bf8
commit 0cff898954
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Sound.cs
View File

@@ -259,9 +259,7 @@ namespace OpenRA
var ID = (voicedUnit != null) ? voicedUnit.ActorID : 0;
var clip = (voicedUnit != null) ? rules.VoicePools.Value[definition].GetNext() : rules.NotificationsPools.Value[definition].GetNext();
if (clip == null) return false;
string clip;
var suffix = rules.DefaultVariant;
var prefix = rules.DefaultPrefix;
@@ -272,7 +270,21 @@ namespace OpenRA
if (!rules.VoicePools.Value.ContainsKey("AttackMove"))
rules.VoicePools.Value.Add("AttackMove", rules.VoicePools.Value["Move"]);
if (!rules.VoicePools.Value.ContainsKey(definition))
throw new InvalidOperationException("Can't find {0} in voice pool.".F(definition));
clip = rules.VoicePools.Value[definition].GetNext();
}
else
{
if (!rules.NotificationsPools.Value.ContainsKey(definition))
throw new InvalidOperationException("Can't find {0} in notification pool.".F(definition));
clip = rules.NotificationsPools.Value[definition].GetNext();
}
if (String.IsNullOrEmpty(clip)) return false;
if (variant != null)
{