X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fscript%2Fcpp_api%2Fs_entity.cpp;h=4c1e296d4925e63fa2aba18af9a0ac99fc24737f;hb=772944daf69ab463568fbbf35a9011e4c8e6c44a;hp=2a5a6066d559eed04bec914d84be9444a35f2174;hpb=1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124;p=dragonfireclient.git

diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp
index 2a5a6066d..4c1e296d4 100644
--- a/src/script/cpp_api/s_entity.cpp
+++ b/src/script/cpp_api/s_entity.cpp
@@ -18,14 +18,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "cpp_api/s_entity.h"
+#include "cpp_api/s_internal.h"
 #include "log.h"
 #include "object_properties.h"
 #include "common/c_converter.h"
 #include "common/c_content.h"
-
-extern "C" {
-#include "lauxlib.h"
-}
+#include "server.h"
 
 bool ScriptApiEntity::luaentity_Add(u16 id, const char *name)
 {
@@ -34,15 +32,15 @@ bool ScriptApiEntity::luaentity_Add(u16 id, const char *name)
 	verbosestream<<"scriptapi_luaentity_add: id="<<id<<" name=\""
 			<<name<<"\""<<std::endl;
 
-	// Get minetest.registered_entities[name]
-	lua_getglobal(L, "minetest");
+	// Get core.registered_entities[name]
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "registered_entities");
 	luaL_checktype(L, -1, LUA_TTABLE);
 	lua_pushstring(L, name);
 	lua_gettable(L, -2);
 	// Should be a table, which we will use as a prototype
 	//luaL_checktype(L, -1, LUA_TTABLE);
-	if(lua_type(L, -1) != LUA_TTABLE){
+	if (lua_type(L, -1) != LUA_TTABLE){
 		errorstream<<"LuaEntity name \""<<name<<"\" not defined"<<std::endl;
 		return false;
 	}
@@ -59,14 +57,14 @@ bool ScriptApiEntity::luaentity_Add(u16 id, const char *name)
 
 	// Add object reference
 	// This should be userdata with metatable ObjectRef
-	objectrefGet(id);
+	push_objectRef(L, id);
 	luaL_checktype(L, -1, LUA_TUSERDATA);
-	if(!luaL_checkudata(L, -1, "ObjectRef"))
+	if (!luaL_checkudata(L, -1, "ObjectRef"))
 		luaL_typerror(L, -1, "ObjectRef");
 	lua_setfield(L, -2, "object");
 
-	// minetest.luaentities[id] = object
-	lua_getglobal(L, "minetest");
+	// core.luaentities[id] = object
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "luaentities");
 	luaL_checktype(L, -1, LUA_TTABLE);
 	lua_pushnumber(L, id); // Push id
@@ -81,35 +79,38 @@ void ScriptApiEntity::luaentity_Activate(u16 id,
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	verbosestream<<"scriptapi_luaentity_activate: id="<<id<<std::endl;
+	verbosestream << "scriptapi_luaentity_activate: id=" << id << std::endl;
 
-	// Get minetest.luaentities[id]
-	luaentity_get(L,id);
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	// Get core.luaentities[id]
+	luaentity_get(L, id);
 	int object = lua_gettop(L);
 
 	// Get on_activate function
-	lua_pushvalue(L, object);
 	lua_getfield(L, -1, "on_activate");
-	if(!lua_isnil(L, -1)){
+	if (!lua_isnil(L, -1)) {
 		luaL_checktype(L, -1, LUA_TFUNCTION);
 		lua_pushvalue(L, object); // self
 		lua_pushlstring(L, staticdata.c_str(), staticdata.size());
 		lua_pushinteger(L, dtime_s);
-		// Call with 3 arguments, 0 results
-		if(lua_pcall(L, 3, 0, 0))
-			scriptError("error running function on_activate: %s\n",
-					lua_tostring(L, -1));
+
+		setOriginFromTable(object);
+		PCALL_RES(lua_pcall(L, 3, 0, error_handler));
+	} else {
+		lua_pop(L, 1);
 	}
+	lua_pop(L, 2); // Pop object and error handler
 }
 
 void ScriptApiEntity::luaentity_Remove(u16 id)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	verbosestream<<"scriptapi_luaentity_rm: id="<<id<<std::endl;
+	verbosestream << "scriptapi_luaentity_rm: id=" << id << std::endl;
 
-	// Get minetest.luaentities table
-	lua_getglobal(L, "minetest");
+	// Get core.luaentities table
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "luaentities");
 	luaL_checktype(L, -1, LUA_TTABLE);
 	int objectstable = lua_gettop(L);
@@ -119,7 +120,7 @@ void ScriptApiEntity::luaentity_Remove(u16 id)
 	lua_pushnil(L);
 	lua_settable(L, objectstable);
 
-	lua_pop(L, 2); // pop luaentities, minetest
+	lua_pop(L, 2); // pop luaentities, core
 }
 
 std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
@@ -128,25 +129,30 @@ std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
 
 	//infostream<<"scriptapi_luaentity_get_staticdata: id="<<id<<std::endl;
 
-	// Get minetest.luaentities[id]
-	luaentity_get(L,id);
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	// Get core.luaentities[id]
+	luaentity_get(L, id);
 	int object = lua_gettop(L);
 
 	// Get get_staticdata function
-	lua_pushvalue(L, object);
 	lua_getfield(L, -1, "get_staticdata");
-	if(lua_isnil(L, -1))
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 2); // Pop entity and  get_staticdata
 		return "";
-
+	}
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
-	// Call with 1 arguments, 1 results
-	if(lua_pcall(L, 1, 1, 0))
-		scriptError("error running function get_staticdata: %s\n",
-				lua_tostring(L, -1));
 
-	size_t len=0;
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 1, 1, error_handler));
+
+	lua_remove(L, object);
+	lua_remove(L, error_handler);
+
+	size_t len = 0;
 	const char *s = lua_tolstring(L, -1, &len);
+	lua_pop(L, 1); // Pop static data
 	return std::string(s, len);
 }
 
@@ -157,9 +163,8 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id,
 
 	//infostream<<"scriptapi_luaentity_get_properties: id="<<id<<std::endl;
 
-	// Get minetest.luaentities[id]
-	luaentity_get(L,id);
-	//int object = lua_gettop(L);
+	// Get core.luaentities[id]
+	luaentity_get(L, id);
 
 	// Set default values that differ from ObjectProperties defaults
 	prop->hp_max = 10;
@@ -169,11 +174,12 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id,
 	prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
 
 	getboolfield(L, -1, "physical", prop->physical);
+	getboolfield(L, -1, "collide_with_objects", prop->collideWithObjects);
 
 	getfloatfield(L, -1, "weight", prop->weight);
 
 	lua_getfield(L, -1, "collisionbox");
-	if(lua_istable(L, -1))
+	if (lua_istable(L, -1))
 		prop->collisionbox = read_aabb3f(L, -1, 1.0);
 	lua_pop(L, 1);
 
@@ -182,11 +188,11 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id,
 	getstringfield(L, -1, "mesh", prop->mesh);
 
 	// Deprecated: read object properties directly
-	read_object_properties(L, -1, prop);
+	read_object_properties(L, -1, prop, getServer()->idef());
 
 	// Read initial_properties
 	lua_getfield(L, -1, "initial_properties");
-	read_object_properties(L, -1, prop);
+	read_object_properties(L, -1, prop, getServer()->idef());
 	lua_pop(L, 1);
 }
 
@@ -196,49 +202,64 @@ void ScriptApiEntity::luaentity_Step(u16 id, float dtime)
 
 	//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
 
-	// Get minetest.luaentities[id]
-	luaentity_get(L,id);
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	// Get core.luaentities[id]
+	luaentity_get(L, id);
 	int object = lua_gettop(L);
 	// State: object is at top of stack
 	// Get step function
 	lua_getfield(L, -1, "on_step");
-	if(lua_isnil(L, -1))
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 2); // Pop on_step and entity
 		return;
+	}
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
 	lua_pushnumber(L, dtime); // dtime
-	// Call with 2 arguments, 0 results
-	if(lua_pcall(L, 2, 0, 0))
-		scriptError("error running function 'on_step': %s\n", lua_tostring(L, -1));
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 2, 0, error_handler));
+
+	lua_pop(L, 2); // Pop object and error handler
 }
 
 // Calls entity:on_punch(ObjectRef puncher, time_from_last_punch,
-//                       tool_capabilities, direction)
-void ScriptApiEntity::luaentity_Punch(u16 id,
+//                       tool_capabilities, direction, damage)
+bool ScriptApiEntity::luaentity_Punch(u16 id,
 		ServerActiveObject *puncher, float time_from_last_punch,
-		const ToolCapabilities *toolcap, v3f dir)
+		const ToolCapabilities *toolcap, v3f dir, s16 damage)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
 	//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
 
-	// Get minetest.luaentities[id]
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	// Get core.luaentities[id]
 	luaentity_get(L,id);
 	int object = lua_gettop(L);
 	// State: object is at top of stack
 	// Get function
 	lua_getfield(L, -1, "on_punch");
-	if(lua_isnil(L, -1))
-		return;
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 2); // Pop on_punch and entity
+		return false;
+	}
 	luaL_checktype(L, -1, LUA_TFUNCTION);
-	lua_pushvalue(L, object); // self
-	objectrefGetOrCreate(puncher); // Clicker reference
+	lua_pushvalue(L, object);  // self
+	objectrefGetOrCreate(L, puncher);  // Clicker reference
 	lua_pushnumber(L, time_from_last_punch);
 	push_tool_capabilities(L, *toolcap);
 	push_v3f(L, dir);
-	// Call with 5 arguments, 0 results
-	if(lua_pcall(L, 5, 0, 0))
-		scriptError("error running function 'on_punch': %s\n", lua_tostring(L, -1));
+	lua_pushnumber(L, damage);
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 6, 1, error_handler));
+
+	bool retval = lua_toboolean(L, -1);
+	lua_pop(L, 2); // Pop object and error handler
+	return retval;
 }
 
 // Calls entity:on_rightclick(ObjectRef clicker)
@@ -249,19 +270,25 @@ void ScriptApiEntity::luaentity_Rightclick(u16 id,
 
 	//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
 
-	// Get minetest.luaentities[id]
-	luaentity_get(L,id);
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	// Get core.luaentities[id]
+	luaentity_get(L, id);
 	int object = lua_gettop(L);
 	// State: object is at top of stack
 	// Get function
 	lua_getfield(L, -1, "on_rightclick");
-	if(lua_isnil(L, -1))
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 2); // Pop on_rightclick and entity
 		return;
+	}
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
-	objectrefGetOrCreate(clicker); // Clicker reference
-	// Call with 2 arguments, 0 results
-	if(lua_pcall(L, 2, 0, 0))
-		scriptError("error running function 'on_rightclick': %s\n", lua_tostring(L, -1));
+	objectrefGetOrCreate(L, clicker); // Clicker reference
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 2, 0, error_handler));
+
+	lua_pop(L, 2); // Pop object and error handler
 }