mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Disable inventory if player's inventory formspec is blank (#11827)
This commit is contained in:
parent
84efe279bb
commit
fcf86ded8f
@ -6690,6 +6690,7 @@ object you are working with still exists.
|
||||
* `set_inventory_formspec(formspec)`
|
||||
* Redefine player's inventory form
|
||||
* Should usually be called in `on_joinplayer`
|
||||
* If `formspec` is `""`, the player's inventory is disabled.
|
||||
* `get_inventory_formspec()`: returns a formspec string
|
||||
* `set_formspec_prepend(formspec)`:
|
||||
* the formspec string will be added to every formspec shown to the user,
|
||||
|
@ -2060,15 +2060,22 @@ void Game::openInventory()
|
||||
InventoryLocation inventoryloc;
|
||||
inventoryloc.setCurrentPlayer();
|
||||
|
||||
if (!client->modsLoaded()
|
||||
|| !client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
|
||||
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);
|
||||
if (client->modsLoaded() && client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
|
||||
delete fs_src;
|
||||
return;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user