Make Lint Happy

1 files changed, 44 insertions, 68 deletions

diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index bea7d122f..9bbf9826b 100644
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -234,12 +234,9 @@ int LuaItemStack::l_to_table(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	LuaItemStack *o = checkobject(L, 1);
 	const ItemStack &item = o->m_stack;
-	if(item.empty())
-	{
+	if (item.empty()) {
 		lua_pushnil(L);
-	}
-	else
-	{
+	} else {
 		lua_newtable(L);
 		lua_pushstring(L, item.name.c_str());
 		lua_setfield(L, -2, "name");
@@ -314,8 +311,7 @@ int LuaItemStack::l_get_definition(lua_State *L)
 	lua_getfield(L, -1, "registered_items");
 	luaL_checktype(L, -1, LUA_TTABLE);
 	lua_getfield(L, -1, item.name.c_str());
-	if(lua_isnil(L, -1))
-	{
+	if (lua_isnil(L, -1)) {
 		lua_pop(L, 1);
 		lua_getfield(L, -1, "unknown");
 	}
@@ -330,8 +326,7 @@ int LuaItemStack::l_get_tool_capabilities(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	LuaItemStack *o = checkobject(L, 1);
 	ItemStack &item = o->m_stack;
-	const ToolCapabilities &prop =
-		item.getToolCapabilities(getGameDef(L)->idef());
+	const ToolCapabilities &prop = item.getToolCapabilities(getGameDef(L)->idef());
 	push_tool_capabilities(L, prop);
 	return 1;
 }
@@ -375,8 +370,8 @@ int LuaItemStack::l_item_fits(lua_State *L)
 	ItemStack newitem = read_item(L, 2, getGameDef(L)->idef());
 	ItemStack restitem;
 	bool fits = item.itemFits(newitem, &restitem, getGameDef(L)->idef());
-	lua_pushboolean(L, fits);  // first return value
-	create(L, restitem);       // second return value
+	lua_pushboolean(L, fits); // first return value
+	create(L, restitem);	  // second return value
 	return 2;
 }
 
@@ -387,7 +382,7 @@ int LuaItemStack::l_take_item(lua_State *L)
 	LuaItemStack *o = checkobject(L, 1);
 	ItemStack &item = o->m_stack;
 	u32 takecount = 1;
-	if(!lua_isnone(L, 2))
+	if (!lua_isnone(L, 2))
 		takecount = luaL_checkinteger(L, 2);
 	ItemStack taken = item.takeItem(takecount);
 	create(L, taken);
@@ -401,23 +396,22 @@ int LuaItemStack::l_peek_item(lua_State *L)
 	LuaItemStack *o = checkobject(L, 1);
 	ItemStack &item = o->m_stack;
 	u32 peekcount = 1;
-	if(!lua_isnone(L, 2))
+	if (!lua_isnone(L, 2))
 		peekcount = lua_tointeger(L, 2);
 	ItemStack peekaboo = item.peekItem(peekcount);
 	create(L, peekaboo);
 	return 1;
 }
 
-LuaItemStack::LuaItemStack(const ItemStack &item):
-	m_stack(item)
+LuaItemStack::LuaItemStack(const ItemStack &item) : m_stack(item)
 {
 }
 
-const ItemStack& LuaItemStack::getItem() const
+const ItemStack &LuaItemStack::getItem() const
 {
 	return m_stack;
 }
-ItemStack& LuaItemStack::getItem()
+ItemStack &LuaItemStack::getItem()
 {
 	return m_stack;
 }
@@ -476,44 +470,32 @@ void LuaItemStack::Register(lua_State *L)
 	lua_pushcfunction(L, mt_tostring);
 	lua_settable(L, metatable);
 
-	lua_pop(L, 1);  // drop metatable
+	lua_pop(L, 1); // drop metatable
 
-	luaL_openlib(L, 0, methods, 0);  // fill methodtable
-	lua_pop(L, 1);  // drop methodtable
+	luaL_openlib(L, 0, methods, 0); // fill methodtable
+	lua_pop(L, 1);			// drop methodtable
 
 	// Can be created from Lua (ItemStack(itemstack or itemstring or table or nil))
 	lua_register(L, className, create_object);
 }
 
 const char LuaItemStack::className[] = "ItemStack";
-const luaL_Reg LuaItemStack::methods[] = {
-	luamethod(LuaItemStack, is_empty),
-	luamethod(LuaItemStack, get_name),
-	luamethod(LuaItemStack, set_name),
-	luamethod(LuaItemStack, get_count),
-	luamethod(LuaItemStack, set_count),
-	luamethod(LuaItemStack, get_wear),
-	luamethod(LuaItemStack, set_wear),
-	luamethod(LuaItemStack, get_meta),
-	luamethod(LuaItemStack, get_metadata),
-	luamethod(LuaItemStack, set_metadata),
-	luamethod(LuaItemStack, get_description),
-	luamethod(LuaItemStack, clear),
-	luamethod(LuaItemStack, replace),
-	luamethod(LuaItemStack, to_string),
-	luamethod(LuaItemStack, to_table),
-	luamethod(LuaItemStack, get_stack_max),
-	luamethod(LuaItemStack, get_free_space),
-	luamethod(LuaItemStack, is_known),
-	luamethod(LuaItemStack, get_definition),
-	luamethod(LuaItemStack, get_tool_capabilities),
-	luamethod(LuaItemStack, add_wear),
-	luamethod(LuaItemStack, add_item),
-	luamethod(LuaItemStack, item_fits),
-	luamethod(LuaItemStack, take_item),
-	luamethod(LuaItemStack, peek_item),
-	{0,0}
-};
+const luaL_Reg LuaItemStack::methods[] = {luamethod(LuaItemStack, is_empty),
+		luamethod(LuaItemStack, get_name), luamethod(LuaItemStack, set_name),
+		luamethod(LuaItemStack, get_count), luamethod(LuaItemStack, set_count),
+		luamethod(LuaItemStack, get_wear), luamethod(LuaItemStack, set_wear),
+		luamethod(LuaItemStack, get_meta), luamethod(LuaItemStack, get_metadata),
+		luamethod(LuaItemStack, set_metadata),
+		luamethod(LuaItemStack, get_description), luamethod(LuaItemStack, clear),
+		luamethod(LuaItemStack, replace), luamethod(LuaItemStack, to_string),
+		luamethod(LuaItemStack, to_table), luamethod(LuaItemStack, get_stack_max),
+		luamethod(LuaItemStack, get_free_space),
+		luamethod(LuaItemStack, is_known),
+		luamethod(LuaItemStack, get_definition),
+		luamethod(LuaItemStack, get_tool_capabilities),
+		luamethod(LuaItemStack, add_wear), luamethod(LuaItemStack, add_item),
+		luamethod(LuaItemStack, item_fits), luamethod(LuaItemStack, take_item),
+		luamethod(LuaItemStack, peek_item), {0, 0}};
 
 /*
 	ItemDefinition
@@ -527,15 +509,13 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 	int table = 1;
 
 	// Get the writable item and node definition managers from the server
-	IWritableItemDefManager *idef =
-			getGameDef(L)->getWritableItemDefManager();
-	NodeDefManager *ndef =
-			getGameDef(L)->getWritableNodeDefManager();
+	IWritableItemDefManager *idef = getGameDef(L)->getWritableItemDefManager();
+	NodeDefManager *ndef = getGameDef(L)->getWritableNodeDefManager();
 
 	// Check if name is defined
 	std::string name;
 	lua_getfield(L, table, "name");
-	if(lua_isstring(L, -1)){
+	if (lua_isstring(L, -1)) {
 		name = readParam<std::string>(L, -1);
 	} else {
 		throw LuaError("register_item_raw: name is not defined or not a string");
@@ -552,8 +532,8 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 
 	// Default to having client-side placement prediction for nodes
 	// ("" in item definition sets it off)
-	if(def.node_placement_prediction == "__default"){
-		if(def.type == ITEM_NODE)
+	if (def.node_placement_prediction == "__default") {
+		if (def.type == ITEM_NODE)
 			def.node_placement_prediction = name;
 		else
 			def.node_placement_prediction = "";
@@ -573,13 +553,12 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 		content_t id = ndef->set(f.name, f);
 
 		if (id > MAX_REGISTERED_CONTENT) {
-			throw LuaError("Number of registerable nodes ("
-					+ itos(MAX_REGISTERED_CONTENT+1)
-					+ ") exceeded (" + name + ")");
+			throw LuaError("Number of registerable nodes (" +
+					itos(MAX_REGISTERED_CONTENT + 1) +
+					") exceeded (" + name + ")");
 		}
-		
 	}
-	
+
 	return 0; /* number of results */
 }
 
@@ -589,13 +568,11 @@ int ModApiItemMod::l_unregister_item_raw(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	std::string name = luaL_checkstring(L, 1);
 
-	IWritableItemDefManager *idef =
-			getGameDef(L)->getWritableItemDefManager();
+	IWritableItemDefManager *idef = getGameDef(L)->getWritableItemDefManager();
 
 	// Unregister the node
 	if (idef->get(name).type == ITEM_NODE) {
-		NodeDefManager *ndef =
-			getGameDef(L)->getWritableNodeDefManager();
+		NodeDefManager *ndef = getGameDef(L)->getWritableNodeDefManager();
 		ndef->removeNode(name);
 	}
 
@@ -612,8 +589,7 @@ int ModApiItemMod::l_register_alias_raw(lua_State *L)
 	std::string convert_to = luaL_checkstring(L, 2);
 
 	// Get the writable item definition manager from the server
-	IWritableItemDefManager *idef =
-			getGameDef(L)->getWritableItemDefManager();
+	IWritableItemDefManager *idef = getGameDef(L)->getWritableItemDefManager();
 
 	idef->registerAlias(name, convert_to);
 
@@ -636,8 +612,8 @@ int ModApiItemMod::l_get_content_id(lua_State *L)
 	content_t content_id;
 	if (alias_name != name) {
 		if (!ndef->getId(alias_name, content_id))
-			throw LuaError("Unknown node: " + alias_name +
-					" (from alias " + name + ")");
+			throw LuaError("Unknown node: " + alias_name + " (from alias " +
+					name + ")");
 	} else if (!ndef->getId(name, content_id)) {
 		throw LuaError("Unknown node: " + name);
 	}