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

Allow integers to bridge to enums.

Browse Source
This commit is contained in:
Paul Chote
2014-10-25 16:47:38 +13:00
parent 69b561b12c
commit 8e4765ca46
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs
View File

@@ -39,11 +39,12 @@ namespace OpenRA.Scripting
var genericType = initType.GetInterfaces() var genericType = initType.GetInterfaces()
.First(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IActorInit<>)); .First(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IActorInit<>));
var innerType = genericType.GetGenericArguments().First(); var innerType = genericType.GetGenericArguments().First();
var valueType = innerType.IsEnum ? typeof(int) : innerType;
// Try and coerce the table value to the required type // Try and coerce the table value to the required type
object value; object value;
if (!kv.Value.TryGetClrValue(innerType, out value)) if (!kv.Value.TryGetClrValue(valueType, out value))
throw new LuaException("Invalid data type for '{0}' (expected '{1}')".F(typeName, innerType.Name)); throw new LuaException("Invalid data type for '{0}' (expected '{1}')".F(typeName, valueType.Name));
// Construct the ActorInit. Phew! // Construct the ActorInit. Phew!
var test = initType.GetConstructor(new[] { innerType }).Invoke(new[] { value }); var test = initType.GetConstructor(new[] { innerType }).Invoke(new[] { value });