mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Clang-format styles fixes since previous commit
This commit is contained in:
parent
0419552c92
commit
b4106ca58f
@ -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
|
||||
|
@ -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}
|
||||
};
|
||||
|
@ -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() {}
|
||||
};
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user