Add name field to registered entities

diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua
index ac3ef1b8f666f89a6136a7e26a332303664cf5fa..073483d4e76d8d09b4c43e851ed0103f1dc6ab58 100644 (file)
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
@@ -239,6 +239,7 @@
 --
 -- Registered entities:
 -- - Functions receive a "luaentity" as self:
+--   - It has the member .name, which is the registered name ("mod:thing")
 --   - It has the member .object, which is an ObjectRef pointing to the object
 --   - The original prototype stuff is visible directly via a metatable
 -- - Callbacks:

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 401de8adeb477f25b0323d7e07b0a213adef0111..dbbaf3dc9493477a49d427621d8547abaf6f36ba 100644 (file)
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -2652,6 +2652,10 @@ static int l_register_entity(lua_State *L)
        
        // Get registered object to top of stack
        lua_pushvalue(L, 2);
+
+       // Set name field
+       lua_pushvalue(L, 1);
+       lua_setfield(L, -2, "name");
        
        // Set __index to point to itself
        lua_pushvalue(L, -1);