diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2019-09-21 11:44:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-21 11:44:24 +0200 |
| commit | 5fa614d97e13af64be490336392abe2a54fdcbc1 (patch) | |
| tree | 32a0856d971d850081c1a7e748ab3f96a103ea19 /src/serverobject.cpp | |
| parent | 47da640d7763ee1e00badb7476ac5afc4f864367 (diff) | |
| download | minetest-5fa614d97e13af64be490336392abe2a54fdcbc1.tar.gz minetest-5fa614d97e13af64be490336392abe2a54fdcbc1.tar.bz2 minetest-5fa614d97e13af64be490336392abe2a54fdcbc1.zip | |
Wieldhand: Specify which ItemStack to use (#8961)
Makes 'get_wield_item' to return the "main" ItemStack
Diffstat (limited to 'src/serverobject.cpp')
| -rw-r--r-- | src/serverobject.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/serverobject.cpp b/src/serverobject.cpp index 4eebc0da4..1ed33f66b 100644 --- a/src/serverobject.cpp +++ b/src/serverobject.cpp @@ -68,25 +68,16 @@ float ServerActiveObject::getMinimumSavedMovement() return 2.0*BS; } -ItemStack ServerActiveObject::getWieldedItem() const +ItemStack ServerActiveObject::getWieldedItem(ItemStack *selected, ItemStack *hand) const { - const Inventory *inv = getInventory(); - if(inv) - { - const InventoryList *list = inv->getList(getWieldList()); - if(list && (getWieldIndex() < (s32)list->getSize())) - return list->getItem(getWieldIndex()); - } + *selected = ItemStack(); + if (hand) + *hand = ItemStack(); + return ItemStack(); } bool ServerActiveObject::setWieldedItem(const ItemStack &item) { - if(Inventory *inv = getInventory()) { - if (InventoryList *list = inv->getList(getWieldList())) { - list->changeItem(getWieldIndex(), item); - return true; - } - } return false; } |