Merge pull request #5227 from Phrohdoh/MultiEnumYaml

Enum yaml fix.
This commit is contained in:
Chris Forbes
2014-05-02 12:55:38 +12:00

View File

@@ -263,9 +263,14 @@ namespace OpenRA
else if (fieldType.IsEnum)
{
if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(value.ToLower()))
try
{
return Enum.Parse(fieldType, value, true);
}
catch (ArgumentException)
{
return InvalidValueAction(value, fieldType, fieldName);
return Enum.Parse(fieldType, value, true);
}
}
else if (fieldType == typeof(bool))