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

Add ability to load and save HashSets.

Browse Source
This commit is contained in:
RoosterDragon
2015-08-26 20:05:29 +01:00
parent 410b97823a
commit 5a177a889c
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/FieldLoader.cs
View File

@@ -429,6 +429,18 @@ namespace OpenRA
ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i); ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
return ret; return ret;
} }
else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(HashSet<>))
{
var set = Activator.CreateInstance(fieldType);
if (value == null)
return set;
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
var addMethod = fieldType.GetMethod("Add", fieldType.GetGenericArguments());
for (var i = 0; i < parts.Length; i++)
addMethod.Invoke(set, new[] { GetValue(fieldName, fieldType.GetGenericArguments()[0], parts[i].Trim(), field) });
return set;
}
else if (fieldType == typeof(Size)) else if (fieldType == typeof(Size))
{ {
if (value != null) if (value != null)

8
OpenRA.Game/FieldSaver.cs
View File

@@ -91,8 +91,12 @@ namespace OpenRA
if (t.IsArray && t.GetArrayRank() == 1) if (t.IsArray && t.GetArrayRank() == 1)
{ {
var elems = ((Array)v).OfType<object>(); return ((Array)v).Cast<object>().JoinWith(", ");
return elems.JoinWith(", "); }
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(HashSet<>))
{
return ((System.Collections.IEnumerable)v).Cast<object>().JoinWith(", ");
} }
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>)) if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))