Merge branch 'master' into master

1 files changed, 14 insertions, 8 deletions

diff --git a/src/script/cpp_api/s_inventory.h b/src/script/cpp_api/s_inventory.h
index c6476190e..e79b3d18b 100644
--- a/src/script/cpp_api/s_inventory.h
+++ b/src/script/cpp_api/s_inventory.h
@@ -24,29 +24,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct MoveAction;
 struct ItemStack;
 
-class ScriptApiDetached : virtual public ScriptApiBase
+class ScriptApiDetached
+		: virtual public ScriptApiBase
 {
 public:
 	/* Detached inventory callbacks */
 	// Return number of accepted items to be moved
 	int detached_inventory_AllowMove(
-			const MoveAction &ma, int count, ServerActiveObject *player);
+			const MoveAction &ma, int count,
+			ServerActiveObject *player);
 	// Return number of accepted items to be put
-	int detached_inventory_AllowPut(const MoveAction &ma, const ItemStack &stack,
+	int detached_inventory_AllowPut(
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Return number of accepted items to be taken
-	int detached_inventory_AllowTake(const MoveAction &ma, const ItemStack &stack,
+	int detached_inventory_AllowTake(
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Report moved items
 	void detached_inventory_OnMove(
-			const MoveAction &ma, int count, ServerActiveObject *player);
+			const MoveAction &ma, int count,
+			ServerActiveObject *player);
 	// Report put items
-	void detached_inventory_OnPut(const MoveAction &ma, const ItemStack &stack,
+	void detached_inventory_OnPut(
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Report taken items
-	void detached_inventory_OnTake(const MoveAction &ma, const ItemStack &stack,
+	void detached_inventory_OnTake(
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
-
 private:
 	bool getDetachedInventoryCallback(
 			const std::string &name, const char *callbackname);