Revert "Make Lint Happy"

This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.

1 files changed, 43 insertions, 41 deletions

diff --git a/src/script/cpp_api/s_inventory.cpp b/src/script/cpp_api/s_inventory.cpp
index e4d3f990d..e9c09f72e 100644
--- a/src/script/cpp_api/s_inventory.cpp
+++ b/src/script/cpp_api/s_inventory.cpp
@@ -26,7 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 // Return number of accepted items to be moved
 int ScriptApiDetached::detached_inventory_AllowMove(
-		const MoveAction &ma, int count, ServerActiveObject *player)
+		const MoveAction &ma, int count,
+		ServerActiveObject *player)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -40,15 +41,14 @@ int ScriptApiDetached::detached_inventory_AllowMove(
 	// inv
 	InvRef::create(L, ma.from_inv);
 	lua_pushstring(L, ma.from_list.c_str()); // from_list
-	lua_pushinteger(L, ma.from_i + 1);	 // from_index
-	lua_pushstring(L, ma.to_list.c_str());	 // to_list
-	lua_pushinteger(L, ma.to_i + 1);	 // to_index
-	lua_pushinteger(L, count);		 // count
-	objectrefGetOrCreate(L, player);	 // player
+	lua_pushinteger(L, ma.from_i + 1);       // from_index
+	lua_pushstring(L, ma.to_list.c_str());   // to_list
+	lua_pushinteger(L, ma.to_i + 1);         // to_index
+	lua_pushinteger(L, count);               // count
+	objectrefGetOrCreate(L, player);         // player
 	PCALL_RES(lua_pcall(L, 7, 1, error_handler));
-	if (!lua_isnumber(L, -1))
-		throw LuaError("allow_move should return a number. name=" +
-				ma.from_inv.name);
+	if(!lua_isnumber(L, -1))
+		throw LuaError("allow_move should return a number. name=" + ma.from_inv.name);
 	int ret = luaL_checkinteger(L, -1);
 	lua_pop(L, 2); // Pop integer and error handler
 	return ret;
@@ -56,7 +56,8 @@ int ScriptApiDetached::detached_inventory_AllowMove(
 
 // Return number of accepted items to be put
 int ScriptApiDetached::detached_inventory_AllowPut(
-		const MoveAction &ma, const ItemStack &stack, ServerActiveObject *player)
+		const MoveAction &ma, const ItemStack &stack,
+		ServerActiveObject *player)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -67,15 +68,14 @@ int ScriptApiDetached::detached_inventory_AllowPut(
 		return stack.count; // All will be accepted
 
 	// Call function(inv, listname, index, stack, player)
-	InvRef::create(L, ma.to_inv);	       // inv
+	InvRef::create(L, ma.to_inv);          // inv
 	lua_pushstring(L, ma.to_list.c_str()); // listname
 	lua_pushinteger(L, ma.to_i + 1);       // index
-	LuaItemStack::create(L, stack);	       // stack
-	objectrefGetOrCreate(L, player);       // player
+	LuaItemStack::create(L, stack);      // stack
+	objectrefGetOrCreate(L, player);     // player
 	PCALL_RES(lua_pcall(L, 5, 1, error_handler));
 	if (!lua_isnumber(L, -1))
-		throw LuaError("allow_put should return a number. name=" +
-				ma.to_inv.name);
+		throw LuaError("allow_put should return a number. name=" + ma.to_inv.name);
 	int ret = luaL_checkinteger(L, -1);
 	lua_pop(L, 2); // Pop integer and error handler
 	return ret;
@@ -83,7 +83,8 @@ int ScriptApiDetached::detached_inventory_AllowPut(
 
 // Return number of accepted items to be taken
 int ScriptApiDetached::detached_inventory_AllowTake(
-		const MoveAction &ma, const ItemStack &stack, ServerActiveObject *player)
+		const MoveAction &ma, const ItemStack &stack,
+		ServerActiveObject *player)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -94,15 +95,14 @@ int ScriptApiDetached::detached_inventory_AllowTake(
 		return stack.count; // All will be accepted
 
 	// Call function(inv, listname, index, stack, player)
-	InvRef::create(L, ma.from_inv);		 // inv
+	InvRef::create(L, ma.from_inv);          // inv
 	lua_pushstring(L, ma.from_list.c_str()); // listname
-	lua_pushinteger(L, ma.from_i + 1);	 // index
-	LuaItemStack::create(L, stack);		 // stack
-	objectrefGetOrCreate(L, player);	 // player
+	lua_pushinteger(L, ma.from_i + 1);       // index
+	LuaItemStack::create(L, stack);      // stack
+	objectrefGetOrCreate(L, player);     // player
 	PCALL_RES(lua_pcall(L, 5, 1, error_handler));
 	if (!lua_isnumber(L, -1))
-		throw LuaError("allow_take should return a number. name=" +
-				ma.from_inv.name);
+		throw LuaError("allow_take should return a number. name=" + ma.from_inv.name);
 	int ret = luaL_checkinteger(L, -1);
 	lua_pop(L, 2); // Pop integer and error handler
 	return ret;
@@ -110,7 +110,8 @@ int ScriptApiDetached::detached_inventory_AllowTake(
 
 // Report moved items
 void ScriptApiDetached::detached_inventory_OnMove(
-		const MoveAction &ma, int count, ServerActiveObject *player)
+		const MoveAction &ma, int count,
+		ServerActiveObject *player)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -124,18 +125,19 @@ void ScriptApiDetached::detached_inventory_OnMove(
 	// inv
 	InvRef::create(L, ma.from_inv);
 	lua_pushstring(L, ma.from_list.c_str()); // from_list
-	lua_pushinteger(L, ma.from_i + 1);	 // from_index
-	lua_pushstring(L, ma.to_list.c_str());	 // to_list
-	lua_pushinteger(L, ma.to_i + 1);	 // to_index
-	lua_pushinteger(L, count);		 // count
-	objectrefGetOrCreate(L, player);	 // player
+	lua_pushinteger(L, ma.from_i + 1);       // from_index
+	lua_pushstring(L, ma.to_list.c_str());   // to_list
+	lua_pushinteger(L, ma.to_i + 1);         // to_index
+	lua_pushinteger(L, count);               // count
+	objectrefGetOrCreate(L, player);         // player
 	PCALL_RES(lua_pcall(L, 7, 0, error_handler));
-	lua_pop(L, 1); // Pop error handler
+	lua_pop(L, 1);  // Pop error handler
 }
 
 // Report put items
 void ScriptApiDetached::detached_inventory_OnPut(
-		const MoveAction &ma, const ItemStack &stack, ServerActiveObject *player)
+		const MoveAction &ma, const ItemStack &stack,
+		ServerActiveObject *player)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -150,15 +152,16 @@ void ScriptApiDetached::detached_inventory_OnPut(
 	InvRef::create(L, ma.to_inv);
 	lua_pushstring(L, ma.to_list.c_str()); // listname
 	lua_pushinteger(L, ma.to_i + 1);       // index
-	LuaItemStack::create(L, stack);	       // stack
+	LuaItemStack::create(L, stack);        // stack
 	objectrefGetOrCreate(L, player);       // player
 	PCALL_RES(lua_pcall(L, 5, 0, error_handler));
-	lua_pop(L, 1); // Pop error handler
+	lua_pop(L, 1);  // Pop error handler
 }
 
 // Report taken items
 void ScriptApiDetached::detached_inventory_OnTake(
-		const MoveAction &ma, const ItemStack &stack, ServerActiveObject *player)
+		const MoveAction &ma, const ItemStack &stack,
+		ServerActiveObject *player)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -172,11 +175,11 @@ void ScriptApiDetached::detached_inventory_OnTake(
 	// inv
 	InvRef::create(L, ma.from_inv);
 	lua_pushstring(L, ma.from_list.c_str()); // listname
-	lua_pushinteger(L, ma.from_i + 1);	 // index
-	LuaItemStack::create(L, stack);		 // stack
-	objectrefGetOrCreate(L, player);	 // player
+	lua_pushinteger(L, ma.from_i + 1);       // index
+	LuaItemStack::create(L, stack);          // stack
+	objectrefGetOrCreate(L, player);         // player
 	PCALL_RES(lua_pcall(L, 5, 0, error_handler));
-	lua_pop(L, 1); // Pop error handler
+	lua_pop(L, 1);  // Pop error handler
 }
 
 // Retrieves core.detached_inventories[name][callbackname]
@@ -196,8 +199,7 @@ bool ScriptApiDetached::getDetachedInventoryCallback(
 	lua_remove(L, -2);
 	// Should be a table
 	if (lua_type(L, -1) != LUA_TTABLE) {
-		errorstream << "Detached inventory \"" << name << "\" not defined"
-			    << std::endl;
+		errorstream<<"Detached inventory \""<<name<<"\" not defined"<<std::endl;
 		lua_pop(L, 1);
 		return false;
 	}
@@ -216,8 +218,8 @@ bool ScriptApiDetached::getDetachedInventoryCallback(
 		return false;
 	}
 
-	errorstream << "Detached inventory \"" << name << "\" callback \"" << callbackname
-		    << "\" is not a function" << std::endl;
+	errorstream << "Detached inventory \"" << name << "\" callback \""
+		<< callbackname << "\" is not a function" << std::endl;
 	lua_pop(L, 1);
 	return false;
 }