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

Support non-int Enum types in the Lua API.

Browse Source
This commit is contained in:
Paul Chote
2018-11-04 10:55:28 +00:00
committed by reaperrr
parent d653614e75
commit 2064dc7c30
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Scripting/ScriptTypes.cs
View File

@@ -79,6 +79,18 @@ namespace OpenRA.Scripting
return true; return true;
} }
if (value is LuaNumber && t.IsAssignableFrom(typeof(short)))
{
clrObject = (short)value.ToNumber().Value;
return true;
}
if (value is LuaNumber && t.IsAssignableFrom(typeof(byte)))
{
clrObject = (byte)value.ToNumber().Value;
return true;
}
if (value is LuaString && t.IsAssignableFrom(typeof(string))) if (value is LuaString && t.IsAssignableFrom(typeof(string)))
{ {
clrObject = value.ToString(); clrObject = value.ToString();

3
OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs
View File

@@ -9,6 +9,7 @@
*/ */
#endregion #endregion
using System;
using System.Linq; using System.Linq;
using Eluant; using Eluant;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
@@ -43,7 +44,7 @@ namespace OpenRA.Mods.Common.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; var valueType = innerType.IsEnum ? Enum.GetUnderlyingType(innerType) : 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;