ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LuaInterface: fix regression of optional parameter binding. (gui.text, for example)

This commit is contained in:
gochaism 2014-05-02 01:54:05 +00:00
parent 07e2c9758f
commit 00a1f8a3ba
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LuaInterface/LuaInterface/CheckType.cs
View File

@ -108,7 +108,7 @@ namespace LuaInterface
if (LuaDLL.lua_isboolean(luaState, stackPos)) if (LuaDLL.lua_isboolean(luaState, stackPos))
return extractValues[runtimeHandleValue]; return extractValues[runtimeHandleValue];
} }
else if (paramType == typeof(string)) else if (paramType == typeof(string) || paramType == typeof (char []))
{ {
if (LuaDLL.lua_isstring(luaState, stackPos)) if (LuaDLL.lua_isstring(luaState, stackPos))
return extractValues[runtimeHandleValue]; return extractValues[runtimeHandleValue];

2
LuaInterface/LuaInterface/Metatables.cs
View File

@ -821,7 +821,7 @@ namespace LuaInterface
{ {
paramList.Add (null); paramList.Add (null);
outList.Add (paramList.LastIndexOf (null)); outList.Add (paramList.LastIndexOf (null));
} else if (_IsTypeCorrect (luaState, currentLuaParam, currentNetParam, out extractValue)) { // Type checking } else if (currentLuaParam <= nLuaParams && _IsTypeCorrect (luaState, currentLuaParam, currentNetParam, out extractValue)) { // Type checking
var value = extractValue (luaState, currentLuaParam); var value = extractValue (luaState, currentLuaParam);
paramList.Add (value); paramList.Add (value);
int index = paramList.LastIndexOf (value); int index = paramList.LastIndexOf (value);

BIN
output/dll/LuaInterface.dll
View File

Binary file not shown.