From 49b7055cb3f676c19dc5edd07fe72e2f5e2414a1 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 2 Jan 2012 12:48:25 +0200 Subject: Make add_entity return a reference to added entity (or nil) --- src/scriptapi.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 4dcb66c77..6b850b19a 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -2352,8 +2352,13 @@ private: const char *name = luaL_checkstring(L, 3); // Do it ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, ""); - env->addActiveObject(obj); - return 0; + int objectid = env->addActiveObject(obj); + // 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) -- cgit v1.2.3