Skip to content
Permalink
Browse files
Re-fix hud_change stat argument retrieval
Conflicts:
	src/script/lua_api/l_object.cpp
  • Loading branch information
kwolekr authored and kahrl committed Sep 26, 2013
1 parent 9e6bdc3 commit fb6a789991ba633a330bacaf0e915019a01b602f
Showing 1 changed file with 9 additions and 7 deletions.
@@ -877,16 +877,18 @@ int ObjectRef::l_hud_change(lua_State *L)
if (player == NULL)
return 0;

u32 id = -1;
if (!lua_isnil(L, 2))
id = lua_tonumber(L, 2);

HudElementStat stat = (HudElementStat)getenumfield(L, 3, "stat",
es_HudElementStat, HUD_STAT_NUMBER);

u32 id = !lua_isnil(L, 2) ? lua_tonumber(L, 2) : -1;
if (id >= player->hud.size())
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;
HudElement *e = player->hud[id];
if (!e)

0 comments on commit fb6a789

Please sign in to comment.