Merge branch 'master' into master

1 files changed, 14 insertions, 14 deletions

diff --git a/src/script/cpp_api/s_item.h b/src/script/cpp_api/s_item.h
index 25a3501f9..530f14bbc 100644
--- a/src/script/cpp_api/s_item.h
+++ b/src/script/cpp_api/s_item.h
@@ -31,32 +31,32 @@ class ModApiItemMod;
 class InventoryList;
 struct InventoryLocation;
 
-class ScriptApiItem
-: virtual public ScriptApiBase
+class ScriptApiItem : virtual public ScriptApiBase
 {
 public:
-	bool item_OnDrop(ItemStack &item,
-			ServerActiveObject *dropper, v3f pos);
-	bool item_OnPlace(ItemStack &item,
-			ServerActiveObject *placer, const PointedThing &pointed);
-	bool item_OnUse(ItemStack &item,
-			ServerActiveObject *user, const PointedThing &pointed);
-	bool item_OnSecondaryUse(ItemStack &item,
-			ServerActiveObject *user, const PointedThing &pointed);
+	bool item_OnDrop(ItemStack &item, ServerActiveObject *dropper, v3f pos);
+	bool item_OnPlace(ItemStack &item, ServerActiveObject *placer,
+			const PointedThing &pointed);
+	bool item_OnUse(ItemStack &item, ServerActiveObject *user,
+			const PointedThing &pointed);
+	bool item_OnSecondaryUse(ItemStack &item, ServerActiveObject *user,
+			const PointedThing &pointed);
 	bool item_OnCraft(ItemStack &item, ServerActiveObject *user,
-			const InventoryList *old_craft_grid, const InventoryLocation &craft_inv);
+			const InventoryList *old_craft_grid,
+			const InventoryLocation &craft_inv);
 	bool item_CraftPredict(ItemStack &item, ServerActiveObject *user,
-			const InventoryList *old_craft_grid, const InventoryLocation &craft_inv);
+			const InventoryList *old_craft_grid,
+			const InventoryLocation &craft_inv);
 
 protected:
 	friend class LuaItemStack;
 	friend class ModApiItemMod;
 
-	bool getItemCallback(const char *name, const char *callbackname, const v3s16 *p = nullptr);
+	bool getItemCallback(const char *name, const char *callbackname,
+			const v3s16 *p = nullptr);
 	/*!
 	 * Pushes a `pointed_thing` tabe to the stack.
 	 * \param hitpoint If true, the exact pointing location is also pushed
 	 */
 	void pushPointedThing(const PointedThing &pointed, bool hitpoint = false);
-
 };