From c53a0ba5f6f71da384a45a07685f8e25c3f91a29 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 23 Sep 2020 16:06:27 +0100 Subject: Unify block entity pickup conversion - Removed normal BlockHandler knowledge of block entities during conversion + Added cBlockEntity::ConvertToPickups that handles it --- src/BlockEntities/BlockEntityWithItems.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/BlockEntities/BlockEntityWithItems.cpp') diff --git a/src/BlockEntities/BlockEntityWithItems.cpp b/src/BlockEntities/BlockEntityWithItems.cpp index 9821bd539..5a52b9767 100644 --- a/src/BlockEntities/BlockEntityWithItems.cpp +++ b/src/BlockEntities/BlockEntityWithItems.cpp @@ -26,6 +26,17 @@ cBlockEntityWithItems::cBlockEntityWithItems( +cItems cBlockEntityWithItems::ConvertToPickups() const +{ + cItems Pickups; + Pickups.AddItemGrid(m_Contents); + return Pickups; +} + + + + + void cBlockEntityWithItems::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); -- cgit v1.2.3