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

Disable inventory if player's inventory formspec is blank (#11827)

Browse Source
This commit is contained in:
ROllerozxa 2021-12-13 17:43:29 +01:00 committed by GitHub
parent 84efe279bb
commit fcf86ded8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/lua_api.txt
View File

@ -6690,6 +6690,7 @@ object you are working with still exists.
* `set_inventory_formspec(formspec)` * `set_inventory_formspec(formspec)`
* Redefine player's inventory form * Redefine player's inventory form
* Should usually be called in `on_joinplayer` * Should usually be called in `on_joinplayer`
* If `formspec` is `""`, the player's inventory is disabled.
* `get_inventory_formspec()`: returns a formspec string * `get_inventory_formspec()`: returns a formspec string
* `set_formspec_prepend(formspec)`: * `set_formspec_prepend(formspec)`:
* the formspec string will be added to every formspec shown to the user, * the formspec string will be added to every formspec shown to the user,

23
src/client/game.cpp
View File

@ -2060,15 +2060,22 @@ void Game::openInventory()
InventoryLocation inventoryloc; InventoryLocation inventoryloc;
inventoryloc.setCurrentPlayer(); inventoryloc.setCurrentPlayer();
if (!client->modsLoaded() if (client->modsLoaded() && client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
|| !client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) { delete fs_src;
TextDest *txt_dst = new TextDestPlayerInventory(client); return;
auto *&formspec = m_game_ui->updateFormspec("");
GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
formspec->setFormSpec(fs_src->getForm(), inventoryloc);
} }
if (fs_src->getForm().empty()) {
delete fs_src;
return;
}
TextDest *txt_dst = new TextDestPlayerInventory(client);
auto *&formspec = m_game_ui->updateFormspec("");
GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
formspec->setFormSpec(fs_src->getForm(), inventoryloc);
} }