Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modify trans lua value to fontdefinition error

This commit is contained in:
htl 2015-01-07 15:18:56 +08:00
parent f69f2359c8
commit 3d2aa30aa7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp
View File

@ -824,7 +824,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , c
lua_pushstring(L, "fontName"); lua_pushstring(L, "fontName");
lua_gettable(L,lo); lua_gettable(L,lo);
outValue->_fontName = tolua_tocppstring(L,lo,defautlFontName); outValue->_fontName = tolua_tocppstring(L, lua_gettop(L), defautlFontName);
lua_pop(L,1); lua_pop(L,1);
lua_pushstring(L, "fontSize"); lua_pushstring(L, "fontSize");
@ -846,7 +846,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , c
lua_gettable(L,lo); lua_gettable(L,lo);
if (!lua_isnil(L,-1)) if (!lua_isnil(L,-1))
{ {
luaval_to_color3b(L, -1, &outValue->_fontFillColor); luaval_to_color3b(L, lua_gettop(L), &outValue->_fontFillColor);
} }
lua_pop(L,1); lua_pop(L,1);
@ -854,7 +854,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , c
lua_gettable(L,lo); lua_gettable(L,lo);
if (!lua_isnil(L,-1)) if (!lua_isnil(L,-1))
{ {
luaval_to_size(L, -1, &outValue->_dimensions); luaval_to_size(L, lua_gettop(L), &outValue->_dimensions);
} }
lua_pop(L,1); lua_pop(L,1);
@ -875,7 +875,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , c
lua_gettable(L,lo); lua_gettable(L,lo);
if (!lua_isnil(L,-1)) if (!lua_isnil(L,-1))
{ {
luaval_to_size(L, -1, &outValue->_shadow._shadowOffset); luaval_to_size(L, lua_gettop(L), &outValue->_shadow._shadowOffset);
} }
lua_pop(L,1); lua_pop(L,1);
@ -912,7 +912,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , c
lua_gettable(L,lo); lua_gettable(L,lo);
if (!lua_isnil(L,-1)) if (!lua_isnil(L,-1))
{ {
luaval_to_color3b(L, -1, &outValue->_stroke._strokeColor); luaval_to_color3b(L, lua_gettop(L), &outValue->_stroke._strokeColor);
} }
lua_pop(L,1); lua_pop(L,1);