Merge branch 'master' into master

1 files changed, 13 insertions, 11 deletions

diff --git a/src/script/cpp_api/s_entity.h b/src/script/cpp_api/s_entity.h
index 93960ed03..b5f7a6586 100644
--- a/src/script/cpp_api/s_entity.h
+++ b/src/script/cpp_api/s_entity.h
@@ -26,26 +26,28 @@ struct ObjectProperties;
 struct ToolCapabilities;
 struct collisionMoveResult;
 
-class ScriptApiEntity : virtual public ScriptApiBase
+class ScriptApiEntity
+		: virtual public ScriptApiBase
 {
 public:
 	bool luaentity_Add(u16 id, const char *name);
-	void luaentity_Activate(u16 id, const std::string &staticdata, u32 dtime_s);
+	void luaentity_Activate(u16 id,
+			const std::string &staticdata, u32 dtime_s);
 	void luaentity_Remove(u16 id);
 	std::string luaentity_GetStaticdata(u16 id);
-	void luaentity_GetProperties(
-			u16 id, ServerActiveObject *self, ObjectProperties *prop);
-	void luaentity_Step(u16 id, float dtime, const collisionMoveResult *moveresult);
-	bool luaentity_Punch(u16 id, ServerActiveObject *puncher,
-			float time_from_last_punch, const ToolCapabilities *toolcap,
-			v3f dir, s16 damage);
+	void luaentity_GetProperties(u16 id,
+			ServerActiveObject *self, ObjectProperties *prop);
+	void luaentity_Step(u16 id, float dtime,
+		const collisionMoveResult *moveresult);
+	bool luaentity_Punch(u16 id,
+			ServerActiveObject *puncher, float time_from_last_punch,
+			const ToolCapabilities *toolcap, v3f dir, s16 damage);
 	bool luaentity_on_death(u16 id, ServerActiveObject *killer);
 	void luaentity_Rightclick(u16 id, ServerActiveObject *clicker);
 	void luaentity_on_attach_child(u16 id, ServerActiveObject *child);
 	void luaentity_on_detach_child(u16 id, ServerActiveObject *child);
 	void luaentity_on_detach(u16 id, ServerActiveObject *parent);
-
 private:
-	bool luaentity_run_simple_callback(
-			u16 id, ServerActiveObject *sao, const char *field);
+	bool luaentity_run_simple_callback(u16 id, ServerActiveObject *sao,
+		const char *field);
 };