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

Add FieldLoader.AllowEmptyEntries attribute.

Browse Source
This commit is contained in:
Paul Chote
2017-01-30 18:22:22 +00:00
parent 892825aeb9
commit 27cd31879f
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/FieldLoader.cs
View File

@@ -455,7 +455,9 @@ namespace OpenRA
if (value == null) if (value == null)
return Array.CreateInstance(fieldType.GetElementType(), 0); return Array.CreateInstance(fieldType.GetElementType(), 0);
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var options = field != null && field.HasAttribute<AllowEmptyEntriesAttribute>() ?
StringSplitOptions.None : StringSplitOptions.RemoveEmptyEntries;
var parts = value.Split(new char[] { ',' }, options);
var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length); var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
for (var i = 0; i < parts.Length; i++) for (var i = 0; i < parts.Length; i++)
@@ -679,6 +681,13 @@ namespace OpenRA
: base(true, true) { } : base(true, true) { }
} }
[AttributeUsage(AttributeTargets.Field)]
public sealed class AllowEmptyEntriesAttribute : SerializeAttribute
{
public AllowEmptyEntriesAttribute()
: base(allowEmptyEntries: true) { }
}
[AttributeUsage(AttributeTargets.Field)] [AttributeUsage(AttributeTargets.Field)]
public sealed class LoadUsingAttribute : SerializeAttribute public sealed class LoadUsingAttribute : SerializeAttribute
{ {
@@ -702,11 +711,13 @@ namespace OpenRA
public bool FromYamlKey; public bool FromYamlKey;
public bool DictionaryFromYamlKey; public bool DictionaryFromYamlKey;
public bool Required; public bool Required;
public bool AllowEmptyEntries;
public SerializeAttribute(bool serialize = true, bool required = false) public SerializeAttribute(bool serialize = true, bool required = false, bool allowEmptyEntries = false)
{ {
Serialize = serialize; Serialize = serialize;
Required = required; Required = required;
AllowEmptyEntries = allowEmptyEntries;
} }
internal Func<MiniYaml, object> GetLoader(Type type) internal Func<MiniYaml, object> GetLoader(Type type)