oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Rename hud_elem_type to type (#14065)

Browse source
This commit is contained in:
cx384 2023-12-29 21:51:02 +01:00 • committed by GitHub
parent bc336480e6
commit 467d3a8c62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/script/common/c_content.cpp
View file

@ -1959,8 +1959,28 @@ void push_objectRef(lua_State *L, const u16 id)
void read_hud_element(lua_State *L, HudElement *elem)
{
elem->type = (HudElementType)getenumfield(L, 2, "hud_elem_type",
es_HudElementType, HUD_ELEM_TEXT);
std::string type_string;
bool has_type = getstringfield(L, 2, "type", type_string);
// Handle deprecated hud_elem_type
std::string deprecated_type_string;
if (getstringfield(L, 2, "hud_elem_type", deprecated_type_string)) {
if (has_type && deprecated_type_string != type_string) {
log_deprecated(L, "Ambiguous HUD element fields \"type\" and \"hud_elem_type\", "
"\"type\" will be used.", 1, true);
} else {
has_type = true;
type_string = deprecated_type_string;
log_deprecated(L, "Deprecated \"hud_elem_type\" field, use \"type\" instead.",
1, true);
}
}
int type_enum;
if (has_type && string_to_enum(es_HudElementType, type_enum, type_string))
elem->type = static_cast<HudElementType>(type_enum);
else
elem->type = HUD_ELEM_TEXT;
lua_getfield(L, 2, "position");
elem->pos = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();