BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add push_ARGB8 to script/common/c_converter

Browse Source
This commit is contained in:
TeTpaAka 2015-05-15 22:16:39 +02:00 committed by kwolekr
parent 18c2f16c13
commit 19cbb6b37b
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/script/common/c_converter.cpp
View File

@ -39,6 +39,19 @@ extern "C" {
#define CHECK_POS_TAB(index) CHECK_TYPE(index, "position", LUA_TTABLE)
void push_ARGB8(lua_State *L, video::SColor color)
{
lua_newtable(L);
lua_pushnumber(L, color.getAlpha());
lua_setfield(L, -2, "a");
lua_pushnumber(L, color.getRed());
lua_setfield(L, -2, "r");
lua_pushnumber(L, color.getGreen());
lua_setfield(L, -2, "g");
lua_pushnumber(L, color.getBlue());
lua_setfield(L, -2, "b");
}
void push_v3f(lua_State *L, v3f p)
{
lua_newtable(L);

1
src/script/common/c_converter.h
View File

@ -95,6 +95,7 @@ size_t read_stringlist (lua_State *L, int index,
std::vector<std::string> *result);
void push_v3s16 (lua_State *L, v3s16 p);
void push_ARGB8 (lua_State *L, video::SColor color);
void pushFloatPos (lua_State *L, v3f p);
void push_v3f (lua_State *L, v3f p);
void push_v2f (lua_State *L, v2f p);

10
src/script/lua_api/l_object.cpp
View File

@ -1305,15 +1305,7 @@ int ObjectRef::l_get_nametag_attributes(lua_State *L)
video::SColor color = playersao->getNametagColor();
lua_newtable(L);
lua_newtable(L);
lua_pushnumber(L, color.getAlpha());
lua_setfield(L, -2, "a");
lua_pushnumber(L, color.getRed());
lua_setfield(L, -2, "r");
lua_pushnumber(L, color.getGreen());
lua_setfield(L, -2, "g");
lua_pushnumber(L, color.getBlue());
lua_setfield(L, -2, "b");
push_ARGB8(L, color);
lua_setfield(L, -2, "color");
return 1;