X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fscript%2Fcpp_api%2Fs_item.cpp;h=24955cefcb161ed7568480312fa9eb7d5469f9bf;hb=dd5a732fa90550066bb96305b64b6648903cc822;hp=49729e57baebf087d17c4b818677e636e20b9461;hpb=371b39a09a0bf248d674fae718f5ff369e895b66;p=dragonfireclient.git

diff --git a/src/script/cpp_api/s_item.cpp b/src/script/cpp_api/s_item.cpp
index 49729e57b..24955cefc 100644
--- a/src/script/cpp_api/s_item.cpp
+++ b/src/script/cpp_api/s_item.cpp
@@ -34,21 +34,24 @@ bool ScriptApiItem::item_OnDrop(ItemStack &item,
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	lua_pushcfunction(L, script_error_handler);
-	int errorhandler = lua_gettop(L);
+	int error_handler = PUSH_ERROR_HANDLER(L);
 
 	// Push callback function on stack
-	if(!getItemCallback(item.name.c_str(), "on_drop"))
+	if (!getItemCallback(item.name.c_str(), "on_drop"))
 		return false;
 
 	// Call function
 	LuaItemStack::create(L, item);
-	objectrefGetOrCreate(dropper);
+	objectrefGetOrCreate(L, dropper);
 	pushFloatPos(L, pos);
-	if(lua_pcall(L, 3, 1, errorhandler))
-		scriptError();
-	if(!lua_isnil(L, -1))
-		item = read_item(L,-1, getServer());
+	PCALL_RES(lua_pcall(L, 3, 1, error_handler));
+	if (!lua_isnil(L, -1)) {
+		try {
+			item = read_item(L, -1, getServer()->idef());
+		} catch (LuaError &e) {
+			throw LuaError(std::string(e.what()) + ". item=" + item.name);
+		}
+	}
 	lua_pop(L, 2);  // Pop item and error handler
 	return true;
 }
@@ -58,21 +61,29 @@ bool ScriptApiItem::item_OnPlace(ItemStack &item,
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	lua_pushcfunction(L, script_error_handler);
-	int errorhandler = lua_gettop(L);
+	int error_handler = PUSH_ERROR_HANDLER(L);
 
 	// Push callback function on stack
-	if(!getItemCallback(item.name.c_str(), "on_place"))
+	if (!getItemCallback(item.name.c_str(), "on_place"))
 		return false;
 
 	// Call function
 	LuaItemStack::create(L, item);
-	objectrefGetOrCreate(placer);
+
+	if (!placer)
+		lua_pushnil(L);
+	else
+		objectrefGetOrCreate(L, placer);
+
 	pushPointedThing(pointed);
-	if(lua_pcall(L, 3, 1, errorhandler))
-		scriptError();
-	if(!lua_isnil(L, -1))
-		item = read_item(L,-1, getServer());
+	PCALL_RES(lua_pcall(L, 3, 1, error_handler));
+	if (!lua_isnil(L, -1)) {
+		try {
+			item = read_item(L, -1, getServer()->idef());
+		} catch (LuaError &e) {
+			throw LuaError(std::string(e.what()) + ". item=" + item.name);
+		}
+	}
 	lua_pop(L, 2);  // Pop item and error handler
 	return true;
 }
@@ -82,21 +93,49 @@ bool ScriptApiItem::item_OnUse(ItemStack &item,
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	lua_pushcfunction(L, script_error_handler);
-	int errorhandler = lua_gettop(L);
+	int error_handler = PUSH_ERROR_HANDLER(L);
 
 	// Push callback function on stack
-	if(!getItemCallback(item.name.c_str(), "on_use"))
+	if (!getItemCallback(item.name.c_str(), "on_use"))
 		return false;
 
 	// Call function
 	LuaItemStack::create(L, item);
-	objectrefGetOrCreate(user);
+	objectrefGetOrCreate(L, user);
+	pushPointedThing(pointed);
+	PCALL_RES(lua_pcall(L, 3, 1, error_handler));
+	if(!lua_isnil(L, -1)) {
+		try {
+			item = read_item(L, -1, getServer()->idef());
+		} catch (LuaError &e) {
+			throw LuaError(std::string(e.what()) + ". item=" + item.name);
+		}
+	}
+	lua_pop(L, 2);  // Pop item and error handler
+	return true;
+}
+
+bool ScriptApiItem::item_OnSecondaryUse(ItemStack &item,
+		ServerActiveObject *user, const PointedThing &pointed)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	if (!getItemCallback(item.name.c_str(), "on_secondary_use"))
+		return false;
+
+	LuaItemStack::create(L, item);
+	objectrefGetOrCreate(L, user);
 	pushPointedThing(pointed);
-	if(lua_pcall(L, 3, 1, errorhandler))
-		scriptError();
-	if(!lua_isnil(L, -1))
-		item = read_item(L,-1, getServer());
+	PCALL_RES(lua_pcall(L, 3, 1, error_handler));
+	if (!lua_isnil(L, -1)) {
+		try {
+			item = read_item(L, -1, getServer()->idef());
+		} catch (LuaError &e) {
+			throw LuaError(std::string(e.what()) + ". item=" + item.name);
+		}
+	}
 	lua_pop(L, 2);  // Pop item and error handler
 	return true;
 }
@@ -106,25 +145,29 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user,
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	lua_pushcfunction(L, script_error_handler);
-	int errorhandler = lua_gettop(L);
+	int error_handler = PUSH_ERROR_HANDLER(L);
 
-	lua_getglobal(L, "minetest");
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "on_craft");
 	LuaItemStack::create(L, item);
-	objectrefGetOrCreate(user);
-	
-	//Push inventory list
+	objectrefGetOrCreate(L, user);
+
+	// Push inventory list
 	std::vector<ItemStack> items;
-	for(u32 i=0; i<old_craft_grid->getSize(); i++)
+	for (u32 i = 0; i < old_craft_grid->getSize(); i++) {
 		items.push_back(old_craft_grid->getItem(i));
+	}
 	push_items(L, items);
 
 	InvRef::create(L, craft_inv);
-	if(lua_pcall(L, 4, 1, errorhandler))
-		scriptError();
-	if(!lua_isnil(L, -1))
-		item = read_item(L,-1, getServer());
+	PCALL_RES(lua_pcall(L, 4, 1, error_handler));
+	if (!lua_isnil(L, -1)) {
+		try {
+			item = read_item(L, -1, getServer()->idef());
+		} catch (LuaError &e) {
+			throw LuaError(std::string(e.what()) + ". item=" + item.name);
+		}
+	}
 	lua_pop(L, 2);  // Pop item and error handler
 	return true;
 }
@@ -133,65 +176,77 @@ bool ScriptApiItem::item_CraftPredict(ItemStack &item, ServerActiveObject *user,
 		const InventoryList *old_craft_grid, const InventoryLocation &craft_inv)
 {
 	SCRIPTAPI_PRECHECKHEADER
+	sanity_check(old_craft_grid);
+	int error_handler = PUSH_ERROR_HANDLER(L);
 
-	lua_pushcfunction(L, script_error_handler);
-	int errorhandler = lua_gettop(L);
-
-	lua_getglobal(L, "minetest");
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "craft_predict");
 	LuaItemStack::create(L, item);
-	objectrefGetOrCreate(user);
+	objectrefGetOrCreate(L, user);
 
 	//Push inventory list
 	std::vector<ItemStack> items;
-	for(u32 i=0; i<old_craft_grid->getSize(); i++)
+	for (u32 i = 0; i < old_craft_grid->getSize(); i++) {
 		items.push_back(old_craft_grid->getItem(i));
+	}
 	push_items(L, items);
 
 	InvRef::create(L, craft_inv);
-	if(lua_pcall(L, 4, 1, errorhandler))
-		scriptError();
-	if(!lua_isnil(L, -1))
-		item = read_item(L,-1, getServer());
+	PCALL_RES(lua_pcall(L, 4, 1, error_handler));
+	if (!lua_isnil(L, -1)) {
+		try {
+			item = read_item(L, -1, getServer()->idef());
+		} catch (LuaError &e) {
+			throw LuaError(std::string(e.what()) + ". item=" + item.name);
+		}
+	}
 	lua_pop(L, 2);  // Pop item and error handler
 	return true;
 }
 
-// Retrieves minetest.registered_items[name][callbackname]
+// Retrieves core.registered_items[name][callbackname]
 // If that is nil or on error, return false and stack is unchanged
 // If that is a function, returns true and pushes the
 // function onto the stack
-// If minetest.registered_items[name] doesn't exist, minetest.nodedef_default
+// If core.registered_items[name] doesn't exist, core.nodedef_default
 // is tried instead so unknown items can still be manipulated to some degree
-bool ScriptApiItem::getItemCallback(const char *name, const char *callbackname)
+bool ScriptApiItem::getItemCallback(const char *name, const char *callbackname,
+		const v3s16 *p)
 {
 	lua_State* L = getStack();
 
-	lua_getglobal(L, "minetest");
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "registered_items");
-	lua_remove(L, -2); // Remove minetest
+	lua_remove(L, -2); // Remove core
 	luaL_checktype(L, -1, LUA_TTABLE);
 	lua_getfield(L, -1, name);
 	lua_remove(L, -2); // Remove registered_items
 	// Should be a table
-	if(lua_type(L, -1) != LUA_TTABLE)
-	{
+	if (lua_type(L, -1) != LUA_TTABLE) {
 		// Report error and clean up
-		errorstream << "Item \"" << name << "\" not defined" << std::endl;
+		errorstream << "Item \"" << name << "\" not defined";
+		if (p)
+			errorstream << " at position " << PP(*p);
+		errorstream << std::endl;
 		lua_pop(L, 1);
 
-		// Try minetest.nodedef_default instead
-		lua_getglobal(L, "minetest");
+		// Try core.nodedef_default instead
+		lua_getglobal(L, "core");
 		lua_getfield(L, -1, "nodedef_default");
 		lua_remove(L, -2);
 		luaL_checktype(L, -1, LUA_TTABLE);
 	}
+
+	setOriginFromTable(-1);
+
 	lua_getfield(L, -1, callbackname);
 	lua_remove(L, -2); // Remove item def
 	// Should be a function or nil
 	if (lua_type(L, -1) == LUA_TFUNCTION) {
 		return true;
-	} else if (!lua_isnil(L, -1)) {
+	}
+
+	if (!lua_isnil(L, -1)) {
 		errorstream << "Item \"" << name << "\" callback \""
 			<< callbackname << "\" is not a function" << std::endl;
 	}
@@ -199,32 +254,10 @@ bool ScriptApiItem::getItemCallback(const char *name, const char *callbackname)
 	return false;
 }
 
-void ScriptApiItem::pushPointedThing(const PointedThing& pointed)
+void ScriptApiItem::pushPointedThing(const PointedThing &pointed, bool hitpoint)
 {
 	lua_State* L = getStack();
 
-	lua_newtable(L);
-	if(pointed.type == POINTEDTHING_NODE)
-	{
-		lua_pushstring(L, "node");
-		lua_setfield(L, -2, "type");
-		push_v3s16(L, pointed.node_undersurface);
-		lua_setfield(L, -2, "under");
-		push_v3s16(L, pointed.node_abovesurface);
-		lua_setfield(L, -2, "above");
-	}
-	else if(pointed.type == POINTEDTHING_OBJECT)
-	{
-		lua_pushstring(L, "object");
-		lua_setfield(L, -2, "type");
-		objectrefGet(pointed.object_id);
-		lua_setfield(L, -2, "ref");
-	}
-	else
-	{
-		lua_pushstring(L, "nothing");
-		lua_setfield(L, -2, "type");
-	}
+	push_pointed_thing(L, pointed, false, hitpoint);
 }
 
-