diff options
| -rw-r--r-- | .clang-format | 3 | ||||
| -rw-r--r-- | src/script/lua_api/l_localplayer.cpp | 19 | ||||
| -rw-r--r-- | src/wieldmesh.h | 2 | ||||
| -rw-r--r-- | util/travis/clang-format-whitelist.txt | 1 |
4 files changed, 19 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format index 05a6b3385..d2e2f2940 100644 --- 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 87190cb39..8aac5355c 100644 --- 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 dee18ca23..d3946b4e0 100644 --- 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 1f8c10ebb..acb6d51e4 100644 --- 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 |