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

tpt.element also converts numbers to names

Browse Source
This commit is contained in:
jacob1 2012-08-21 19:08:20 -04:00 committed by jacksonmj
parent 40d9f48b72
commit 2932b04e0e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/luaconsole.c
View File

@ -887,10 +887,19 @@ int luatpt_test(lua_State* l)
int luatpt_getelement(lua_State *l) int luatpt_getelement(lua_State *l)
{ {
int t; int t;
char * name = luaL_optstring(l, 1, "dust"); char* name;
if(lua_isnumber(l, 1)){
t = luaL_optint(l, 1, 1);
if (t<0 || t>=PT_NUM)
return luaL_error(l, "Unrecognised element number '%d'", t);
name = ptypes[t&0xFF].name;
lua_pushstring(l, name);
} else {
name = (char*)luaL_optstring(l, 1, "dust");
if (!console_parse_type(name, &t, NULL)) if (!console_parse_type(name, &t, NULL))
return luaL_error(l, "Unrecognised element '%s'", name); return luaL_error(l, "Unrecognised element '%s'", name);
lua_pushinteger(l, t); lua_pushinteger(l, t);
}
return 1; return 1;
} }
int luatpt_element_func(lua_State *l) int luatpt_element_func(lua_State *l)