Merge branch 'main' into lua_audio

src/logic/scripting/lua/libgui.cpp

@@ -171,7 +171,7 @@ static int l_gui_getattr(lua_State* L) {
     if (attr == "color") {
         return lua::pushcolor_arr(L, node->getColor());
     } else if (attr == "pos") {
-        return lua::pushvec2_arr(L, node->getCoord());
+        return lua::pushvec2_arr(L, node->getPos());
     } else if (attr == "size") {
         return lua::pushvec2_arr(L, node->getSize());
     } else if (attr == "hoverColor") {
@@ -210,7 +210,7 @@ static int l_gui_setattr(lua_State* L) {
 
     auto node = getDocumentNode(L, docname, element);
     if (attr == "pos") {
-        node->setCoord(lua::tovec2(L, 4));
+        node->setPos(lua::tovec2(L, 4));
     } else if (attr == "size") {
         node->setSize(lua::tovec2(L, 4));
     } else if (attr == "color") {

src/logic/scripting/lua/libhud.cpp

@@ -65,6 +65,19 @@ static int l_hud_open_block(lua_State* L) {
     return 2;
 }
 
+static int l_hud_show_overlay(lua_State* L) {
+    const char* name = lua_tostring(L, 1);
+    bool playerInventory = lua_toboolean(L, 2);
+
+    auto assets = scripting::engine->getAssets();
+    auto layout = assets->getLayout(name);
+    if (layout == nullptr) {
+        luaL_error(L, "there is no ui layout '%s'", name);
+    }
+    scripting::hud->showOverlay(layout, playerInventory);
+    return 0;
+}
+
 static UiDocument* require_layout(lua_State* L, const char* name) {
     auto assets = scripting::engine->getAssets();
     auto layout = assets->getLayout(name);
@@ -91,6 +104,7 @@ const luaL_Reg hudlib [] = {
     {"close_inventory", lua_wrap_errors<l_hud_close_inventory>},
     {"open_block", lua_wrap_errors<l_hud_open_block>},
     {"open_permanent", lua_wrap_errors<l_hud_open_permanent>},
+    {"show_overlay", lua_wrap_errors<l_hud_show_overlay>},
     {"close", lua_wrap_errors<l_hud_close>},
     {NULL, NULL}
 };