minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Fix direction property of HUD

mutilcraft-mt53
rubenwardy 2015-01-07 19:08:51 +00:00 committed by sfan5
parent ef140eb7b0
commit 2504da28af
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,7 +442,7 @@ int ObjectRef::l_set_eye_offset(lua_State *L)
// Do it // Do it
v3f offset_first = v3f(0, 0, 0); v3f offset_first = v3f(0, 0, 0);
v3f offset_third = v3f(0, 0, 0); v3f offset_third = v3f(0, 0, 0);
if(!lua_isnil(L, 2)) if(!lua_isnil(L, 2))
offset_first = read_v3f(L, 2); offset_first = read_v3f(L, 2);
if(!lua_isnil(L, 3)) if(!lua_isnil(L, 3))
@ -914,7 +914,11 @@ int ObjectRef::l_hud_add(lua_State *L)
elem->text = getstringfield_default(L, 2, "text", ""); elem->text = getstringfield_default(L, 2, "text", "");
elem->number = getintfield_default(L, 2, "number", 0); elem->number = getintfield_default(L, 2, "number", 0);
elem->item = getintfield_default(L, 2, "item", 0); elem->item = getintfield_default(L, 2, "item", 0);
elem->dir = getintfield_default(L, 2, "dir", 0); elem->dir = getintfield_default(L, 2, "direction", 0);
// Deprecated, only for compatibility's sake
if (elem->dir == 0)
elem->dir = getintfield_default(L, 2, "dir", 0);
lua_getfield(L, 2, "alignment"); lua_getfield(L, 2, "alignment");
elem->align = lua_istable(L, -1) ? read_v2f(L, -1) : v2f(); elem->align = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
@ -1075,6 +1079,10 @@ int ObjectRef::l_hud_get(lua_State *L)
lua_pushnumber(L, e->item); lua_pushnumber(L, e->item);
lua_setfield(L, -2, "item"); lua_setfield(L, -2, "item");
lua_pushnumber(L, e->dir);
lua_setfield(L, -2, "direction");
// Deprecated, only for compatibility's sake
lua_pushnumber(L, e->dir); lua_pushnumber(L, e->dir);
lua_setfield(L, -2, "dir"); lua_setfield(L, -2, "dir");
@ -1095,7 +1103,7 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
u32 flags = 0; u32 flags = 0;
u32 mask = 0; u32 mask = 0;
bool flag; bool flag;
const EnumString *esp = es_HudBuiltinElement; const EnumString *esp = es_HudBuiltinElement;
for (int i = 0; esp[i].str; i++) { for (int i = 0; esp[i].str; i++) {
if (getboolfield(L, 2, esp[i].str, flag)) { if (getboolfield(L, 2, esp[i].str, flag)) {