From d77f3b3fdeb0da2a69547594b5a75570a54b02d1 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Wed, 9 May 2018 22:24:36 +0200 Subject: [PATCH] Player hand list: require init by mods Mods will now have to initialize the list/slot in order to define the default player hand. They may use the inventory callbacks to prevent abuse of this list. --- doc/lua_api.txt | 4 +++- src/player.cpp | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 8ae4ddb03..e144a2c8f 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2257,8 +2257,10 @@ Player Inventory lists * `main`: list containing the default inventory * `craft`: list containing the craft input -* `craftpreview`: list containing the craft output +* `craftpreview`: list containing the craft prediction +* `craftresult`: list containing the crafted output * `hand`: list containing an override for the empty hand + * Is not created automatically, use `InvRef:set_size` diff --git a/src/player.cpp b/src/player.cpp index b700053e8..ccc753834 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -36,7 +36,6 @@ Player::Player(const char *name, IItemDefManager *idef): inventory.clear(); inventory.addList("main", PLAYER_INVENTORY_SIZE); - inventory.addList("hand", 1); InventoryList *craft = inventory.addList("craft", 9); craft->setWidth(3); inventory.addList("craftpreview", 1); -- 2.25.1