BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Make add_entity return a reference to added entity (or nil)

Browse Source
This commit is contained in:
Perttu Ahola 2012-01-02 12:48:25 +02:00
parent cb88f7b6d4
commit 49b7055cb3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/mods/default/init.lua
View File

@ -152,7 +152,7 @@
-- ^ Returns nil for unloaded area -- ^ Returns nil for unloaded area
-- - get_node_light(pos, timeofday) -> 0...15 or nil -- - get_node_light(pos, timeofday) -> 0...15 or nil
-- ^ timeofday: nil = current time, 0 = night, 0.5 = day -- ^ timeofday: nil = current time, 0 = night, 0.5 = day
-- - add_entity(pos, name) -- - add_entity(pos, name): Returns ObjectRef or nil if failed
-- - add_item(pos, itemstring) -- - add_item(pos, itemstring)
-- - add_rat(pos) -- - add_rat(pos)
-- - add_firefly(pos) -- - add_firefly(pos)

9
src/scriptapi.cpp
View File

@ -2352,8 +2352,13 @@ private:
const char *name = luaL_checkstring(L, 3); const char *name = luaL_checkstring(L, 3);
// Do it // Do it
ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, ""); ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, "");
env->addActiveObject(obj); int objectid = env->addActiveObject(obj);
return 0; // If failed to add, return nothing (reads as nil)
if(objectid == 0)
return 0;
// Return ObjectRef
objectref_get_or_create(L, obj);
return 1;
} }
// EnvRef:add_item(pos, inventorystring) // EnvRef:add_item(pos, inventorystring)