add 'args' parameter to hud.show_overlay

This commit is contained in:
MihailRis
2024-11-20 11:10:05 +03:00
parent 02578a6276
commit e842b217da
4 changed files with 20 additions and 9 deletions
+10 -5
View File
@@ -233,7 +233,7 @@ void Hud::processInput(bool visible) {
showOverlay(
assets->get<UiDocument>("core:console"),
false,
std::string("console")
dv::list({std::string("console")})
);
}
if (!Window::isFocused() && !pause && !isInventoryOpen()) {
@@ -470,7 +470,7 @@ void Hud::showExchangeSlot() {
}
void Hud::showOverlay(
UiDocument* doc, bool playerInventory, const dv::value& arg
UiDocument* doc, bool playerInventory, const dv::value& args
) {
if (isInventoryOpen()) {
closeInventory();
@@ -483,7 +483,7 @@ void Hud::showOverlay(
inventoryOpen = true;
}
add(HudElement(hud_element_mode::inventory_bound, doc, secondUI, false),
arg);
args);
}
void Hud::openPermanent(UiDocument* doc) {
@@ -515,13 +515,18 @@ void Hud::closeInventory() {
cleanup();
}
void Hud::add(const HudElement& element, const dv::value& arg) {
void Hud::add(const HudElement& element, const dv::value& argsArray) {
gui->add(element.getNode());
auto document = element.getDocument();
if (document) {
auto invview = std::dynamic_pointer_cast<InventoryView>(element.getNode());
auto inventory = invview ? invview->getInventory() : nullptr;
std::vector<dv::value> args {arg};
std::vector<dv::value> args;
if (argsArray != nullptr) {
for (const auto& arg : argsArray) {
args.push_back(arg);
}
}
args.emplace_back(inventory ? inventory.get()->getId() : 0);
for (int i = 0; i < 3; i++) {
args.emplace_back(static_cast<integer_t>(blockPos[i]));
+4 -2
View File
@@ -98,7 +98,8 @@ static int l_show_overlay(lua::State* L) {
if (layout == nullptr) {
throw std::runtime_error("there is no ui layout " + util::quote(name));
}
hud->showOverlay(layout, playerInventory);
auto args = lua::tovalue(L, 3);
hud->showOverlay(layout, playerInventory, std::move(args));
return 0;
}
@@ -188,4 +189,5 @@ const luaL_Reg hudlib[] = {
{"_is_content_access", lua::wrap<l_is_content_access>},
{"_set_content_access", lua::wrap<l_set_content_access>},
{"_set_debug_cheats", lua::wrap<l_set_debug_cheats>},
{NULL, NULL}};
{NULL, NULL}
};