minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check minetest.hud_change() parameters on conversion (Fix #1714)

This commit is contained in:
kwolekr 2014-10-30 00:11:46 -04:00
parent 6c9bbb0360
commit 03f3f958ed
1 changed files with 7 additions and 7 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

@ -970,14 +970,14 @@ int ObjectRef::l_hud_change(lua_State *L)
if (player == NULL) if (player == NULL)
return 0; return 0;
u32 id = !lua_isnil(L, 2) ? lua_tonumber(L, 2) : -1; u32 id = lua_isnumber(L, 2) ? lua_tonumber(L, 2) : -1;
HudElement *e = player->getHud(id); HudElement *e = player->getHud(id);
if (!e) if (!e)
return 0; return 0;
HudElementStat stat = HUD_STAT_NUMBER; HudElementStat stat = HUD_STAT_NUMBER;
if (!lua_isnil(L, 3)) { if (lua_isstring(L, 3)) {
int statint; int statint;
std::string statstr = lua_tostring(L, 3); std::string statstr = lua_tostring(L, 3);
stat = string_to_enum(es_HudElementStat, statint, statstr) ? stat = string_to_enum(es_HudElementStat, statint, statstr) ?
@ -991,7 +991,7 @@ int ObjectRef::l_hud_change(lua_State *L)
value = &e->pos; value = &e->pos;
break; break;
case HUD_STAT_NAME: case HUD_STAT_NAME:
e->name = lua_tostring(L, 4); e->name = luaL_checkstring(L, 4);
value = &e->name; value = &e->name;
break; break;
case HUD_STAT_SCALE: case HUD_STAT_SCALE:
@ -999,19 +999,19 @@ int ObjectRef::l_hud_change(lua_State *L)
value = &e->scale; value = &e->scale;
break; break;
case HUD_STAT_TEXT: case HUD_STAT_TEXT:
e->text = lua_tostring(L, 4); e->text = luaL_checkstring(L, 4);
value = &e->text; value = &e->text;
break; break;
case HUD_STAT_NUMBER: case HUD_STAT_NUMBER:
e->number = lua_tonumber(L, 4); e->number = luaL_checknumber(L, 4);
value = &e->number; value = &e->number;
break; break;
case HUD_STAT_ITEM: case HUD_STAT_ITEM:
e->item = lua_tonumber(L, 4); e->item = luaL_checknumber(L, 4);
value = &e->item; value = &e->item;
break; break;
case HUD_STAT_DIR: case HUD_STAT_DIR:
e->dir = lua_tonumber(L, 4); e->dir = luaL_checknumber(L, 4);
value = &e->dir; value = &e->dir;
break; break;
case HUD_STAT_ALIGN: case HUD_STAT_ALIGN: