From 00a1f8a3baccee86cd28d6dd15ca47d204bc658c Mon Sep 17 00:00:00 2001 From: gochaism Date: Fri, 2 May 2014 01:54:05 +0000 Subject: [PATCH] LuaInterface: fix regression of optional parameter binding. (gui.text, for example) --- LuaInterface/LuaInterface/CheckType.cs | 2 +- LuaInterface/LuaInterface/Metatables.cs | 2 +- output/dll/LuaInterface.dll | Bin 61952 -> 61952 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LuaInterface/LuaInterface/CheckType.cs b/LuaInterface/LuaInterface/CheckType.cs index 52ccc29d14..64db388115 100644 --- a/LuaInterface/LuaInterface/CheckType.cs +++ b/LuaInterface/LuaInterface/CheckType.cs @@ -108,7 +108,7 @@ namespace LuaInterface if (LuaDLL.lua_isboolean(luaState, stackPos)) return extractValues[runtimeHandleValue]; } - else if (paramType == typeof(string)) + else if (paramType == typeof(string) || paramType == typeof (char [])) { if (LuaDLL.lua_isstring(luaState, stackPos)) return extractValues[runtimeHandleValue]; diff --git a/LuaInterface/LuaInterface/Metatables.cs b/LuaInterface/LuaInterface/Metatables.cs index 1d02e10cfc..3a543d861c 100644 --- a/LuaInterface/LuaInterface/Metatables.cs +++ b/LuaInterface/LuaInterface/Metatables.cs @@ -821,7 +821,7 @@ namespace LuaInterface { paramList.Add (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); paramList.Add (value); int index = paramList.LastIndexOf (value); diff --git a/output/dll/LuaInterface.dll b/output/dll/LuaInterface.dll index c099565797a8617f7a3b77ed1fdfda92c3eb26dc..72c55b614d0f095171bb6a6549daa1cb50eb936e 100644 GIT binary patch delta 905 zcmX}rYe-Z<6ae6J?%k_f*yOHDS*xIk`lHPx3$dlJG*Vn}^CDrkX4-1LdaY7EcQ4|L z47yA{`XLdvpd}%UKO!Ow{MQ2s39Mg%WTvE%5K%$rx|as-%=ykeGt7@Op(Q!AB;Vl+nWkc66woJu z0+;#$LLmT|zg*20UMZmr+j&!Y34Y?U#gcDI z!6u20f z$UcnOQg8f>WL124Kr{Yz!v}jnsleR-YE#bRsHtVUrc|P%$EeicyWJ&MW3H(`BtJF= zO-9AJx&@UX?345H% zR;1%;lQhprZ(v0_w|AP?@v_vxof+T;H_ds_O|uF^G^fBjmI3=fqSy(uVwtDo?z2o| zJ#2v8W;z>U_t+SFz{2dANFCzHyv!0Z`i|NOvOIil*e}vY7V~1eirjz0ztJ;!VFc^@ z9+!yNk6tEAiL$6%@uQ2nojN75vBlU-O>9{OC{gp(#f6_w^uoJE;c2a+=<}gQzWMc{ z{h`_A#-cu?~>!nU!FdS>)L92wza delta 888 zcmX}rYe-Z<6ae6J?)ADBcGFeLXRIt~&|+E}W+IdiGB7bWv2E2Jwk?~F9;;}n`_NpU zgzK0>rayWZg+?$!LIeiAAfzV*^=E%9)uyF|KZQEiy)-aq=9@WlXMUXP4v6l6IM^dT z?mOx0PsRtndlmB0bqFS)rbCz&eJL@K`w$|@&ms_#Sc+g^W=z8w=0R8dASElUh`In0 z6!ieKxdBA>bSaCM3Q1;cVD*+V{K)1kJB2aiSa}~Yg-ulz@TID02`zlQ<~5>^*{wQ0 zW^G0uYikj+8w~(@CxD;Ex>TB*8ZX)#Y!2nJVtQU(GOd-HVD>yf6s_qGlpidh@fCZ1 zwiXk3X6>z5SD;l%_rSQeS}I3lTS!wRGp?-37Z=>X#VUk$WzQQoBSc75sP`!9gwI-s zRE@^}x-1>X0af3$9_a+GTv0MT@LOvTYf#q}(kjV{#V(cMF$U3wEvlkPcD$`BnN*8! zRi%>ZaaC0Y=^SqJhCaHNbODd3DkM3uN7Z3c6V9lzkeV^zJrz25hIk3Lbcf_1wW2|l zo79fSR1J_^Xje5#@?eXqJETtRS(6tysSEwx+~~>E#+1rIVSnl*#Tj89feFiSUGLhSP9!h3u3&WUt&OUzLaC5&612A>WiA z@xp5iBg5QEbpeEdHJ5!IvGPNspYo$JOaA=S$LE#|cRJs7%zt>njbBP--W{~!4$7sH zUaMl|ToZLaRj>aCK$)q)^m0~uA3oQdH#xMce<1>H zv%3p6mLcevyy#qS%?+a*fgZz07TqZAhAhbBiN8$hlsT4iG;52H#iExF(ap;L^Dvu7 KFE61lL-P;PQQjZ`