Rename EnvRef:add_luaentity to EnvRef:add_entity

diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua
index 1bd1eba4a7e73f4e4afe008b84b869e50296d5c7..e2d267d4e04b238865f3a64e2f8d7704add39145 100644 (file)
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
@@ -148,7 +148,7 @@
 --   ^ Returns nil for unloaded area
 -- - get_node_light(pos, timeofday) -> 0...15 or nil
 --   ^ timeofday: nil = current time, 0 = night, 0.5 = day
--- - add_luaentity(pos, name)
+-- - add_entity(pos, name)
 -- - add_item(pos, itemstring)
 -- - add_rat(pos)
 -- - add_firefly(pos)
@@ -1335,7 +1335,7 @@ function nodeupdate_single(p)
                n_bottom = minetest.env:get_node(p_bottom)
                if n_bottom.name == "air" then
                        minetest.env:remove_node(p)
-                       minetest.env:add_luaentity(p, "default:falling_"..n.name)
+                       minetest.env:add_entity(p, "default:falling_"..n.name)
                        nodeupdate(p)
                end
        end
@@ -1491,7 +1491,7 @@ minetest.register_on_chat_message(function(name, message)
                        print("Unable to spawn entity, player is nil")
                        return true -- Handled chat message
                end
-               minetest.env:add_luaentity(player:getpos(), entityname)
+               minetest.env:add_entity(player:getpos(), entityname)
                minetest.chat_send_player(name, '"'..entityname
                                ..'" spawned.');
                return true -- Handled chat message

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 9b37c53b4cb1aad5a9000c02602ef73e112701d8..a88d6be5ab66f59694910626d90836ac71070ad6 100644 (file)
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -2430,11 +2430,11 @@ private:
                }
        }
 
-       // EnvRef:add_luaentity(pos, entityname)
+       // EnvRef:add_entity(pos, entityname)
        // pos = {x=num, y=num, z=num}
-       static int l_add_luaentity(lua_State *L)
+       static int l_add_entity(lua_State *L)
        {
-               //infostream<<"EnvRef::l_add_luaentity()"<<std::endl;
+               //infostream<<"EnvRef::l_add_entity()"<<std::endl;
                EnvRef *o = checkobject(L, 1);
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
@@ -2600,7 +2600,7 @@ const luaL_reg EnvRef::methods[] = {
        method(EnvRef, get_node),
        method(EnvRef, get_node_or_nil),
        method(EnvRef, get_node_light),
-       method(EnvRef, add_luaentity),
+       method(EnvRef, add_entity),
        method(EnvRef, add_item),
        method(EnvRef, add_rat),
        method(EnvRef, add_firefly),