pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-fix hud_change stat argument retrieval 

Conflicts:
	src/script/lua_api/l_object.cpp
master
kwolekr 2013-04-21 12:55:46 -04:00 committed by Kahrl
parent 9e6bdc377f
commit fb6a789991
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -877,16 +877,18 @@ int ObjectRef::l_hud_change(lua_State *L)
if (player == NULL) if (player == NULL)
return 0; return 0;
u32 id = -1; u32 id = !lua_isnil(L, 2) ? lua_tonumber(L, 2) : -1;
if (!lua_isnil(L, 2))
id = lua_tonumber(L, 2);
HudElementStat stat = (HudElementStat)getenumfield(L, 3, "stat",
es_HudElementStat, HUD_STAT_NUMBER);
if (id >= player->hud.size()) if (id >= player->hud.size())
return 0; return 0;
HudElementStat stat = HUD_STAT_NUMBER;
if (!lua_isnil(L, 3)) {
int statint;
std::string statstr = lua_tostring(L, 3);
stat = string_to_enum(es_HudElementStat, statint, statstr) ?
(HudElementStat)statint : HUD_STAT_NUMBER;
}
void *value = NULL; void *value = NULL;
HudElement *e = player->hud[id]; HudElement *e = player->hud[id];
if (!e) if (!e)