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

allow using element names as argument 2 to tpt.set_property again

Browse Source
This commit is contained in:
jacob1 2019-02-23 18:05:11 -05:00
parent 768202ca9b
commit 1536736b33
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lua/LegacyLuaAPI.cpp
View File

@ -687,7 +687,7 @@ int luatpt_set_property(lua_State* l)
return luaL_error(l, "Unrecognised element '%s'", name); return luaL_error(l, "Unrecognised element '%s'", name);
} }
} }
if (lua_isnumber(l, 2) || format == CommandInterface::FormatElement) if (lua_isnumber(l, 2))
{ {
if (format == CommandInterface::FormatFloat) if (format == CommandInterface::FormatFloat)
f = luaL_optnumber(l, 2, 0); f = luaL_optnumber(l, 2, 0);
@ -697,12 +697,15 @@ int luatpt_set_property(lua_State* l)
if (!strcmp(prop, "type") && (t<0 || t>=PT_NUM || !luacon_sim->elements[t].Enabled)) if (!strcmp(prop, "type") && (t<0 || t>=PT_NUM || !luacon_sim->elements[t].Enabled))
return luaL_error(l, "Unrecognised element number '%d'", t); return luaL_error(l, "Unrecognised element number '%d'", t);
} }
else else if (lua_isstring(l, 2))
{ {
name = luaL_checklstring(l, 2, NULL); name = luaL_checklstring(l, 2, NULL);
if ((t = luacon_sim->GetParticleType(ByteString(name)))==-1) if ((t = luacon_sim->GetParticleType(ByteString(name)))==-1)
return luaL_error(l, "Unrecognised element '%s'", name); return luaL_error(l, "Unrecognised element '%s'", name);
} }
else
luaL_error(l, "Expected number or element name as argument 2");
if (!lua_isnumber(l, 3) || acount >= 6) if (!lua_isnumber(l, 3) || acount >= 6)
{ {
// Got a region // Got a region