Merge pull request #1 from EliasFleckenstein03/master

update

1 files changed, 113 insertions, 13 deletions

diff --git a/src/script/lua_api/l_clientobject.cpp b/src/script/lua_api/l_clientobject.cpp
index 521aba023..c093e754e 100644
--- a/src/script/lua_api/l_clientobject.cpp
+++ b/src/script/lua_api/l_clientobject.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_clientobject.h"
 #include "l_internal.h"
 #include "common/c_converter.h"
+#include "common/c_content.h"
 #include "client/client.h"
 #include "object_properties.h"
 #include "util/pointedthing.h"
@@ -47,6 +48,8 @@ ClientActiveObject *ClientObjectRef::get_cao(ClientObjectRef *ref)
 GenericCAO *ClientObjectRef::get_generic_cao(ClientObjectRef *ref, lua_State *L)
 {
 	ClientActiveObject *obj = get_cao(ref);
+	if (!obj)
+		return nullptr;
 	ClientEnvironment &env = getClient(L)->getEnv();
 	GenericCAO *gcao = env.getGenericCAO(obj->getId());
 	return gcao;
@@ -56,6 +59,8 @@ int ClientObjectRef::l_get_pos(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	ClientActiveObject *cao = get_cao(ref);
+	if (!cao)
+		return 0;
 	push_v3f(L, cao->getPosition() / BS);
 	return 1;
 }
@@ -64,6 +69,8 @@ int ClientObjectRef::l_get_velocity(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	push_v3f(L, gcao->getVelocity() / BS);
 	return 1;
 }
@@ -72,6 +79,8 @@ int ClientObjectRef::l_get_acceleration(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	push_v3f(L, gcao->getAcceleration() / BS);
 	return 1;
 }
@@ -80,6 +89,8 @@ int ClientObjectRef::l_get_rotation(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	push_v3f(L, gcao->getRotation());
 	return 1;
 }
@@ -88,6 +99,8 @@ int ClientObjectRef::l_is_player(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	lua_pushboolean(L, gcao->isPlayer());
 	return 1;
 }
@@ -96,6 +109,8 @@ int ClientObjectRef::l_is_local_player(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	lua_pushboolean(L, gcao->isLocalPlayer());
 	return 1;
 }
@@ -104,6 +119,8 @@ int ClientObjectRef::l_get_name(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	lua_pushstring(L, gcao->getName().c_str());
 	return 1;
 }
@@ -112,14 +129,23 @@ int ClientObjectRef::l_get_attach(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
-	create(L, gcao->getParent());
+	if (!gcao)
+		return 0;
+	ClientActiveObject *parent = gcao->getParent();
+	if (!parent)
+		return 0;
+	push_objectRef(L, parent->getId());
 	return 1;
 }
 
 int ClientObjectRef::l_get_nametag(lua_State *L)
 {
+	log_deprecated(L, "Deprecated call to get_nametag, use get_properties().nametag "
+			  "instead");
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	ObjectProperties *props = gcao->getProperties();
 	lua_pushstring(L, props->nametag.c_str());
 	return 1;
@@ -127,8 +153,12 @@ int ClientObjectRef::l_get_nametag(lua_State *L)
 
 int ClientObjectRef::l_get_item_textures(lua_State *L)
 {
+	log_deprecated(L, "Deprecated call to get_item_textures, use "
+			  "get_properties().textures instead");
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	ObjectProperties *props = gcao->getProperties();
 	lua_newtable(L);
 
@@ -138,20 +168,49 @@ int ClientObjectRef::l_get_item_textures(lua_State *L)
 	return 1;
 }
 
-int ClientObjectRef::l_get_hp(lua_State *L)
+int ClientObjectRef::l_get_max_hp(lua_State *L)
 {
+	log_deprecated(L, "Deprecated call to get_max_hp, use get_properties().hp_max "
+			  "instead");
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
-	lua_pushnumber(L, gcao->getHp());
+	if (!gcao)
+		return 0;
+	ObjectProperties *props = gcao->getProperties();
+	lua_pushnumber(L, props->hp_max);
 	return 1;
 }
 
-int ClientObjectRef::l_get_max_hp(lua_State *L)
+int ClientObjectRef::l_get_properties(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
-	ObjectProperties *props = gcao->getProperties();
-	lua_pushnumber(L, props->hp_max);
+	if (!gcao)
+		return 0;
+	ObjectProperties *prop = gcao->getProperties();
+	push_object_properties(L, prop);
+	return 1;
+}
+
+int ClientObjectRef::l_set_properties(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
+	ObjectProperties prop = *gcao->getProperties();
+	read_object_properties(L, 2, nullptr, &prop, getClient(L)->idef());
+	gcao->setProperties(prop);
+	return 1;
+}
+
+int ClientObjectRef::l_get_hp(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
+	lua_pushnumber(L, gcao->getHp());
 	return 1;
 }
 
@@ -159,6 +218,8 @@ int ClientObjectRef::l_punch(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	PointedThing pointed(gcao->getId(), v3f(0, 0, 0), v3s16(0, 0, 0), 0);
 	getClient(L)->interact(INTERACT_START_DIGGING, pointed);
 	return 0;
@@ -168,23 +229,53 @@ int ClientObjectRef::l_rightclick(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	PointedThing pointed(gcao->getId(), v3f(0, 0, 0), v3s16(0, 0, 0), 0);
 	getClient(L)->interact(INTERACT_PLACE, pointed);
 	return 0;
 }
 
+int ClientObjectRef::l_remove(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	ClientActiveObject *cao = get_cao(ref);
+	if (!cao)
+		return 0;
+	getClient(L)->getEnv().removeActiveObject(cao->getId());
+
+	return 0;
+}
+
+int ClientObjectRef::l_set_nametag_images(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
+	gcao->nametag_images.clear();
+	if (lua_istable(L, 2)) {
+		lua_pushnil(L);
+		while (lua_next(L, 2) != 0) {
+			gcao->nametag_images.push_back(lua_tostring(L, -1));
+			lua_pop(L, 1);
+		}
+	}
+	gcao->updateNametag();
+
+	return 0;
+}
+
 ClientObjectRef::ClientObjectRef(ClientActiveObject *object) : m_object(object)
 {
 }
 
 void ClientObjectRef::create(lua_State *L, ClientActiveObject *object)
 {
-	if (object) {
-		ClientObjectRef *o = new ClientObjectRef(object);
-		*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
-		luaL_getmetatable(L, className);
-		lua_setmetatable(L, -2);
-	}
+	ClientObjectRef *o = new ClientObjectRef(object);
+	*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+	luaL_getmetatable(L, className);
+	lua_setmetatable(L, -2);
 }
 
 void ClientObjectRef::create(lua_State *L, s16 id)
@@ -192,6 +283,12 @@ void ClientObjectRef::create(lua_State *L, s16 id)
 	create(L, ((ClientEnvironment *)getEnv(L))->getActiveObject(id));
 }
 
+void ClientObjectRef::set_null(lua_State *L)
+{
+	ClientObjectRef *obj = checkobject(L, -1);
+	obj->m_object = nullptr;
+}
+
 int ClientObjectRef::gc_object(lua_State *L)
 {
 	ClientObjectRef *obj = *(ClientObjectRef **)(lua_touserdata(L, 1));
@@ -236,6 +333,9 @@ luaL_Reg ClientObjectRef::methods[] = {luamethod(ClientObjectRef, get_pos),
 		luamethod(ClientObjectRef, get_attach),
 		luamethod(ClientObjectRef, get_nametag),
 		luamethod(ClientObjectRef, get_item_textures),
+		luamethod(ClientObjectRef, get_properties),
+		luamethod(ClientObjectRef, set_properties),
 		luamethod(ClientObjectRef, get_hp),
 		luamethod(ClientObjectRef, get_max_hp), luamethod(ClientObjectRef, punch),
-		luamethod(ClientObjectRef, rightclick), {0, 0}};
+		luamethod(ClientObjectRef, rightclick),
+		luamethod(ClientObjectRef, set_nametag_images), {0, 0}};