Merge branch 'master' into master

1 files changed, 7 insertions, 11 deletions

diff --git a/src/script/cpp_api/s_node.h b/src/script/cpp_api/s_node.h
index 81b44f0f0..8f4e41479 100644
--- a/src/script/cpp_api/s_node.h
+++ b/src/script/cpp_api/s_node.h
@@ -27,27 +27,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct MapNode;
 class ServerActiveObject;
 
-class ScriptApiNode
-		: virtual public ScriptApiBase,
-		  public ScriptApiNodemeta
+class ScriptApiNode : virtual public ScriptApiBase, public ScriptApiNodemeta
 {
 public:
 	ScriptApiNode() = default;
 	virtual ~ScriptApiNode() = default;
 
-	bool node_on_punch(v3s16 p, MapNode node,
-			ServerActiveObject *puncher, const PointedThing &pointed);
-	bool node_on_dig(v3s16 p, MapNode node,
-			ServerActiveObject *digger);
+	bool node_on_punch(v3s16 p, MapNode node, ServerActiveObject *puncher,
+			const PointedThing &pointed);
+	bool node_on_dig(v3s16 p, MapNode node, ServerActiveObject *digger);
 	void node_on_construct(v3s16 p, MapNode node);
 	void node_on_destruct(v3s16 p, MapNode node);
 	bool node_on_flood(v3s16 p, MapNode node, MapNode newnode);
 	void node_after_destruct(v3s16 p, MapNode node);
 	bool node_on_timer(v3s16 p, MapNode node, f32 dtime);
-	void node_on_receive_fields(v3s16 p,
-			const std::string &formname,
-			const StringMap &fields,
-			ServerActiveObject *sender);
+	void node_on_receive_fields(v3s16 p, const std::string &formname,
+			const StringMap &fields, ServerActiveObject *sender);
+
 public:
 	static struct EnumString es_DrawType[];
 	static struct EnumString es_ContentParamType[];