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

Fix hud_change stat argument retrieval

Browse Source
This commit is contained in:
kwolekr 2013-04-21 12:55:46 -04:00
parent 03868ff8e1
commit 14ba94ad6a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/scriptapi_object.cpp
View File

@ -788,15 +788,17 @@ 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];
@ -832,7 +834,7 @@ int ObjectRef::l_hud_change(lua_State *L)
e->dir = lua_tonumber(L, 4); e->dir = lua_tonumber(L, 4);
value = &e->dir; value = &e->dir;
} }
get_server(L)->hudChange(player, id, stat, value); get_server(L)->hudChange(player, id, stat, value);
lua_pushboolean(L, true); lua_pushboolean(L, true);