From 4af99b75cf3ae43c365a4c1e90e85f8ec764cf62 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 7 Apr 2017 23:22:00 +0200 Subject: Pass clang-format on 14 trivial header files fixes Also remove them from whitelist --- src/script/cpp_api/s_client.h | 4 ++-- src/script/cpp_api/s_player.h | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'src/script/cpp_api') diff --git a/src/script/cpp_api/s_client.h b/src/script/cpp_api/s_client.h index 2369efe3e..9afc66d61 100644 --- a/src/script/cpp_api/s_client.h +++ b/src/script/cpp_api/s_client.h @@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #define S_CLIENT_H_ #include "cpp_api/s_base.h" -#include "util/string.h" #include "mapnode.h" +#include "util/string.h" #ifdef _CRT_MSVCP_CURRENT #include @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class ClientEnvironment; -class ScriptApiClient: virtual public ScriptApiBase +class ScriptApiClient : virtual public ScriptApiBase { public: // Calls on_shutdown handlers diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h index 86ee1b024..9b4611f9e 100644 --- a/src/script/cpp_api/s_player.h +++ b/src/script/cpp_api/s_player.h @@ -26,8 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., struct ToolCapabilities; -class ScriptApiPlayer - : virtual public ScriptApiBase +class ScriptApiPlayer : virtual public ScriptApiBase { public: virtual ~ScriptApiPlayer(); @@ -36,17 +35,16 @@ public: void on_dieplayer(ServerActiveObject *player); bool on_respawnplayer(ServerActiveObject *player); bool on_prejoinplayer(const std::string &name, const std::string &ip, - std::string *reason); + std::string *reason); void on_joinplayer(ServerActiveObject *player); void on_leaveplayer(ServerActiveObject *player, bool timeout); void on_cheat(ServerActiveObject *player, const std::string &cheat_type); - bool on_punchplayer(ServerActiveObject *player, - ServerActiveObject *hitter, float time_from_last_punch, - const ToolCapabilities *toolcap, v3f dir, s16 damage); + bool on_punchplayer(ServerActiveObject *player, ServerActiveObject *hitter, + float time_from_last_punch, const ToolCapabilities *toolcap, + v3f dir, s16 damage); s16 on_player_hpchange(ServerActiveObject *player, s16 hp_change); void on_playerReceiveFields(ServerActiveObject *player, - const std::string &formname, const StringMap &fields); + const std::string &formname, const StringMap &fields); }; - #endif /* S_PLAYER_H_ */ -- cgit v1.2.3