minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-07-04 17:00:23 +02:00
Code Issues Releases Wiki Activity

SAPI: Accept either ARGB8 table or ColorString to specify colors

Browse Source
This commit is contained in:
kwolekr
2015-05-16 12:26:57 -04:00
parent 8f9af57314
commit fb36c471d7
5 changed files with 77 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1222,8 +1222,7 @@ int ObjectRef::l_set_sky(lua_State *L)
return 0;
video::SColor bgcolor(255,255,255,255);
if (!lua_isnil(L, 2))
bgcolor = readARGB8(L, 2);
read_color(L, 2, &bgcolor);
std::string type = luaL_checkstring(L, 3);
@ -1283,11 +1282,13 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
if (playersao == NULL)
return 0;
video::SColor color = playersao->getNametagColor();
lua_getfield(L, 2, "color");
if (!lua_isnil(L, -1))
color = readARGB8(L, -1);
playersao->setNametagColor(color);
if (!lua_isnil(L, -1)) {
video::SColor color = playersao->getNametagColor();
if (!read_color(L, -1, &color))
return 0;
playersao->setNametagColor(color);
}
lua_pushboolean(L, true);
return 1;