Merge branch 'master' into master

1 files changed, 34 insertions, 20 deletions

diff --git a/src/tool.h b/src/tool.h
index dae5f13e7..59dd501f5 100644
--- a/src/tool.h
+++ b/src/tool.h
@@ -50,6 +50,7 @@ struct ToolGroupCap
 	void fromJson(const Json::Value &json);
 };
 
+
 typedef std::unordered_map<std::string, struct ToolGroupCap> ToolGCMap;
 typedef std::unordered_map<std::string, s16> DamageGroup;
 
@@ -61,15 +62,19 @@ struct ToolCapabilities
 	DamageGroup damageGroups;
 	int punch_attack_uses;
 
-	ToolCapabilities(float full_punch_interval_ = 1.4f, int max_drop_level_ = 1,
+	ToolCapabilities(
+			float full_punch_interval_ = 1.4f,
+			int max_drop_level_ = 1,
 			const ToolGCMap &groupcaps_ = ToolGCMap(),
 			const DamageGroup &damageGroups_ = DamageGroup(),
-			int punch_attack_uses_ = 0) :
-			full_punch_interval(full_punch_interval_),
-			max_drop_level(max_drop_level_), groupcaps(groupcaps_),
-			damageGroups(damageGroups_), punch_attack_uses(punch_attack_uses_)
-	{
-	}
+			int punch_attack_uses_ = 0
+	):
+		full_punch_interval(full_punch_interval_),
+		max_drop_level(max_drop_level_),
+		groupcaps(groupcaps_),
+		damageGroups(damageGroups_),
+		punch_attack_uses(punch_attack_uses_)
+	{}
 
 	void serialize(std::ostream &os, u16 version) const;
 	void deSerialize(std::istream &is);
@@ -87,27 +92,33 @@ struct DigParams
 	std::string main_group;
 
 	DigParams(bool a_diggable = false, float a_time = 0.0f, u16 a_wear = 0,
-			const std::string &a_main_group = "") :
-			diggable(a_diggable),
-			time(a_time), wear(a_wear), main_group(a_main_group)
-	{
-	}
+			const std::string &a_main_group = ""):
+		diggable(a_diggable),
+		time(a_time),
+		wear(a_wear),
+		main_group(a_main_group)
+	{}
 };
 
-DigParams getDigParams(const ItemGroupList &groups, const ToolCapabilities *tp);
+DigParams getDigParams(const ItemGroupList &groups,
+		const ToolCapabilities *tp);
 
 struct HitParams
 {
 	s16 hp;
 	u16 wear;
 
-	HitParams(s16 hp_ = 0, u16 wear_ = 0) : hp(hp_), wear(wear_) {}
+	HitParams(s16 hp_ = 0, u16 wear_ = 0):
+		hp(hp_),
+		wear(wear_)
+	{}
 };
 
-HitParams getHitParams(const ItemGroupList &armor_groups, const ToolCapabilities *tp,
-		float time_from_last_punch);
+HitParams getHitParams(const ItemGroupList &armor_groups,
+		const ToolCapabilities *tp, float time_from_last_punch);
 
-HitParams getHitParams(const ItemGroupList &armor_groups, const ToolCapabilities *tp);
+HitParams getHitParams(const ItemGroupList &armor_groups,
+		const ToolCapabilities *tp);
 
 struct PunchDamageResult
 {
@@ -120,8 +131,11 @@ struct PunchDamageResult
 
 struct ItemStack;
 
-PunchDamageResult getPunchDamage(const ItemGroupList &armor_groups,
-		const ToolCapabilities *toolcap, const ItemStack *punchitem,
-		float time_from_last_punch);
+PunchDamageResult getPunchDamage(
+		const ItemGroupList &armor_groups,
+		const ToolCapabilities *toolcap,
+		const ItemStack *punchitem,
+		float time_from_last_punch
+);
 
 f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand);