From 07a66dc3dc48197236c3bdb8240b271db465d60f Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Tue, 28 Aug 2012 16:12:30 +0100 Subject: tpt.element also converts numbers to names diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp index 9d563a8..4561d5d 100644 --- a/src/cat/LuaScriptInterface.cpp +++ b/src/cat/LuaScriptInterface.cpp @@ -936,10 +936,20 @@ int luatpt_test(lua_State* l) int luatpt_getelement(lua_State *l) { int t; - char * name = (char*)luaL_optstring(l, 1, "dust"); - if ((t = luacon_ci->GetParticleType(name))==-1) - return luaL_error(l,"Unrecognised element '%s'", name); - lua_pushinteger(l, t); + 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); + lua_pushstring(l, luacon_sim->elements[t].Name); + } + else + { + char* name = (char*)luaL_optstring(l, 1, "dust"); + if ((t = luacon_ci->GetParticleType(name))==-1) + return luaL_error(l, "Unrecognised element '%s'", name); + lua_pushinteger(l, t); + } return 1; } -- cgit v0.9.2-21-gd62e