matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log error messages for update functions

Browse Source
This commit is contained in:
jacob1 2013-01-16 11:42:06 -05:00
parent b3a2ab735b
commit e9b86365c8
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@
*.la *.la
*~ *~
*.pref *.pref
*.lua
stdout.txt stdout.txt
stderr.txt stderr.txt
build/* build/*

13
src/cat/LegacyLuaAPI.cpp
View File

@ -628,7 +628,7 @@ int luatpt_getelement(lua_State *l)
int luacon_elementReplacement(UPDATE_FUNC_ARGS) int luacon_elementReplacement(UPDATE_FUNC_ARGS)
{ {
int retval = 0; int retval = 0, callret;
if(lua_el_func[parts[i].type]){ if(lua_el_func[parts[i].type]){
lua_rawgeti(luacon_ci->l, LUA_REGISTRYINDEX, lua_el_func[parts[i].type]); lua_rawgeti(luacon_ci->l, LUA_REGISTRYINDEX, lua_el_func[parts[i].type]);
lua_pushinteger(luacon_ci->l, i); lua_pushinteger(luacon_ci->l, i);
@ -636,7 +636,9 @@ int luacon_elementReplacement(UPDATE_FUNC_ARGS)
lua_pushinteger(luacon_ci->l, y); lua_pushinteger(luacon_ci->l, y);
lua_pushinteger(luacon_ci->l, surround_space); lua_pushinteger(luacon_ci->l, surround_space);
lua_pushinteger(luacon_ci->l, nt); lua_pushinteger(luacon_ci->l, nt);
lua_pcall(luacon_ci->l, 5, 1, 0); callret = lua_pcall(luacon_ci->l, 5, 1, 0);
if (callret)
luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
if(lua_isboolean(luacon_ci->l, -1)){ if(lua_isboolean(luacon_ci->l, -1)){
retval = lua_toboolean(luacon_ci->l, -1); retval = lua_toboolean(luacon_ci->l, -1);
} }
@ -675,13 +677,15 @@ int luatpt_element_func(lua_State *l)
int luacon_graphicsReplacement(GRAPHICS_FUNC_ARGS) int luacon_graphicsReplacement(GRAPHICS_FUNC_ARGS)
{ {
int cache = 0; int cache = 0, callret;
lua_rawgeti(luacon_ci->l, LUA_REGISTRYINDEX, lua_gr_func[cpart->type]); lua_rawgeti(luacon_ci->l, LUA_REGISTRYINDEX, lua_gr_func[cpart->type]);
lua_pushinteger(luacon_ci->l, 0); lua_pushinteger(luacon_ci->l, 0);
lua_pushinteger(luacon_ci->l, *colr); lua_pushinteger(luacon_ci->l, *colr);
lua_pushinteger(luacon_ci->l, *colg); lua_pushinteger(luacon_ci->l, *colg);
lua_pushinteger(luacon_ci->l, *colb); lua_pushinteger(luacon_ci->l, *colb);
lua_pcall(luacon_ci->l, 4, 10, 0); callret = lua_pcall(luacon_ci->l, 4, 10, 0);
if (callret)
luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
cache = luaL_optint(luacon_ci->l, -10, 0); cache = luaL_optint(luacon_ci->l, -10, 0);
*pixel_mode = luaL_optint(luacon_ci->l, -9, *pixel_mode); *pixel_mode = luaL_optint(luacon_ci->l, -9, *pixel_mode);
@ -694,6 +698,7 @@ int luacon_graphicsReplacement(GRAPHICS_FUNC_ARGS)
*fireg = luaL_optint(luacon_ci->l, -2, *fireg); *fireg = luaL_optint(luacon_ci->l, -2, *fireg);
*fireb = luaL_optint(luacon_ci->l, -1, *fireb); *fireb = luaL_optint(luacon_ci->l, -1, *fireb);
lua_pop(luacon_ci->l, 10); lua_pop(luacon_ci->l, 10);
return cache; return cache;
} }