Clang-format styles fixes since previous commit

diff --git a/.clang-format b/.clang-format
index 05a6b3385725603a0508671f4405cb2a8687d6b2..d2e2f2940f1a1bdce76b4eafd7c05b3f1e65b065 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -2,6 +2,7 @@ BasedOnStyle: LLVM
 IndentWidth: 8
 UseTab: Always
 BreakBeforeBraces: Custom
+Standard: Cpp03
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -16,6 +17,8 @@ AllowShortIfStatementsOnASingleLine: false
 IndentCaseLabels: false
 AccessModifierOffset: -8
 ColumnLimit: 90
+AllowShortFunctionsOnASingleLine: Inline
+SortIncludes: false
 IncludeCategories:
   - Regex:           '^".*'
     Priority:        2

diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 87190cb393e3f79ef479722284ac9e4334413902..8aac5355cba089df0e50895044fbcee92a6e3edd 100644 (file)
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -21,7 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "l_internal.h"
 #include "script/common/c_converter.h"
 
-LuaLocalPlayer::LuaLocalPlayer(LocalPlayer *m) { m_localplayer = m; }
+LuaLocalPlayer::LuaLocalPlayer(LocalPlayer *m)
+{
+       m_localplayer = m;
+}
 
 void LuaLocalPlayer::create(lua_State *L, LocalPlayer *m)
 {
@@ -332,7 +335,10 @@ LuaLocalPlayer *LuaLocalPlayer::checkobject(lua_State *L, int narg)
        return *(LuaLocalPlayer **)ud;
 }
 
-LocalPlayer *LuaLocalPlayer::getobject(LuaLocalPlayer *ref) { return ref->m_localplayer; }
+LocalPlayer *LuaLocalPlayer::getobject(LuaLocalPlayer *ref)
+{
+       return ref->m_localplayer;
+}
 
 LocalPlayer *LuaLocalPlayer::getobject(lua_State *L, int narg)
 {
@@ -376,8 +382,10 @@ void LuaLocalPlayer::Register(lua_State *L)
 }
 
 const char LuaLocalPlayer::className[] = "LocalPlayer";
-const luaL_reg LuaLocalPlayer::methods[] = {luamethod(LuaLocalPlayer, get_velocity),
-               luamethod(LuaLocalPlayer, get_hp), luamethod(LuaLocalPlayer, get_name),
+const luaL_reg LuaLocalPlayer::methods[] = {
+               luamethod(LuaLocalPlayer, get_velocity),
+               luamethod(LuaLocalPlayer, get_hp),
+               luamethod(LuaLocalPlayer, get_name),
                luamethod(LuaLocalPlayer, is_teleported),
                luamethod(LuaLocalPlayer, is_attached),
                luamethod(LuaLocalPlayer, is_touching_ground),
@@ -404,4 +412,5 @@ const luaL_reg LuaLocalPlayer::methods[] = {luamethod(LuaLocalPlayer, get_veloci
                luamethod(LuaLocalPlayer, get_movement_speed),
                luamethod(LuaLocalPlayer, get_movement),
 
-               {0, 0}};
+               {0, 0}
+};

diff --git a/src/wieldmesh.h b/src/wieldmesh.h
index dee18ca230c78a42ca0e7b5f59fe07b0f216640d..d3946b4e09f0f3420799aa1d312e8cfd46f3b0de 100644 (file)
--- a/src/wieldmesh.h
+++ b/src/wieldmesh.h
@@ -36,7 +36,7 @@ struct ItemMesh
         * If the boolean is true, the color is fixed, else
         * palettes can modify it.
         */
-       std::vector<std::pair<bool, video::SColor>> buffer_colors;
+       std::vector<std::pair<bool, video::SColor> > buffer_colors;
 
        ItemMesh() : mesh(NULL), buffer_colors() {}
 };

diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 1f8c10ebb730a2ec46dbaae5be00642a93153ea6..acb6d51e4284cbefa0d07d4bd6c8452464da85a4 100644 (file)
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -284,6 +284,7 @@ src/script/lua_api/l_item.cpp
 src/script/lua_api/l_item.h
 src/script/lua_api/l_itemstackmeta.cpp
 src/script/lua_api/l_itemstackmeta.h
+src/script/lua_api/l_localplayer.cpp
 src/script/lua_api/l_mainmenu.cpp
 src/script/lua_api/l_mainmenu.h
 src/script/lua_api/l_mapgen.cpp