From 5b67c8ce684884f0b703e29c2c9416dab914fb5a Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 15 Mar 2014 14:20:40 -0400 Subject: [PATCH] elem.property and elem.element can read Identifiers --- src/lua/LuaScriptInterface.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/lua/LuaScriptInterface.cpp b/src/lua/LuaScriptInterface.cpp index 455c4427ee..be31049bac 100644 --- a/src/lua/LuaScriptInterface.cpp +++ b/src/lua/LuaScriptInterface.cpp @@ -214,12 +214,14 @@ LuaScriptInterface::LuaScriptInterface(GameController * c, GameModel * m): lua_setfield(l, tptProperties, "mousex"); lua_pushinteger(l, 0); lua_setfield(l, tptProperties, "mousey"); - lua_pushstring(l, ""); + lua_pushstring(l, "DEFAULT_PT_DUST"); lua_setfield(l, tptProperties, "selectedl"); - lua_pushstring(l, ""); + lua_pushstring(l, "DEFAULT_PT_NONE"); lua_setfield(l, tptProperties, "selectedr"); - lua_pushstring(l, ""); + lua_pushstring(l, "DEFAULT_PT_NONE"); lua_setfield(l, tptProperties, "selecteda"); + lua_pushstring(l, "DEFAULT_PT_NONE"); + lua_setfield(l, tptProperties, "selectedreplace"); lua_newtable(l); tptPropertiesVersion = lua_gettop(l); @@ -2176,6 +2178,8 @@ int LuaScriptInterface::elements_element(lua_State * l) } lua_setfield(l, -2, (*iter).Name.c_str()); } + lua_pushstring(l, luacon_sim->elements[id].Identifier); + lua_setfield(l, -2, "Identifier"); return 1; } } @@ -2345,6 +2349,11 @@ int LuaScriptInterface::elements_property(lua_State * l) } return 1; } + else if(propertyName == "Identifier") + { + lua_pushstring(l, luacon_sim->elements[id].Identifier); + return 1; + } else return luaL_error(l, "Invalid element property"); }