improve: check parent on decay

opentibiabr · Sep 17, 2023 · aef87fc · aef87fc
1 parent db3a913
commit aef87fc
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/src/items/containers/container.cpp b/src/items/containers/container.cpp
@@ -57,7 +57,7 @@ std::shared_ptr<Container> Container::create(std::shared_ptr<Tile> tile) {
 Container::~Container() {
 	if (getID() == ITEM_BROWSEFIELD) {
 		for (std::shared_ptr<Item> item : itemlist) {
-			item->setParent(parent);
+			item->setParent(m_parent);
 		}
 	}
 }

diff --git a/src/items/containers/depot/depotchest.cpp b/src/items/containers/depot/depotchest.cpp
@@ -68,7 +68,7 @@ void DepotChest::postRemoveNotification(std::shared_ptr<Thing> thing, std::share
 }
 
 std::shared_ptr<Cylinder> DepotChest::getParent() {
-	auto parentLocked = parent.lock();
+	auto parentLocked = m_parent.lock();
 	if (parentLocked && parentLocked->getParent()) {
 		return parentLocked->getParent()->getParent();
 	}

diff --git a/src/items/containers/depot/depotchest.hpp b/src/items/containers/depot/depotchest.hpp
@@ -40,7 +40,7 @@ class DepotChest final : public Container {
 
 	std::shared_ptr<Cylinder> getParent() override;
 	std::shared_ptr<Cylinder> getRealParent() override {
-		return parent.lock();
+		return m_parent.lock();
 	}
 
 private:

diff --git a/src/items/containers/depot/depotlocker.cpp b/src/items/containers/depot/depotlocker.cpp
@@ -29,14 +29,14 @@ ReturnValue DepotLocker::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint3
 }
 
 void DepotLocker::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) {
-	auto parentLocked = parent.lock();
+	auto parentLocked = m_parent.lock();
 	if (parentLocked) {
 		parentLocked->postAddNotification(thing, oldParent, index, LINK_PARENT);
 	}
 }
 
 void DepotLocker::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) {
-	auto parentLocked = parent.lock();
+	auto parentLocked = m_parent.lock();
 	if (parentLocked) {
 		parentLocked->postRemoveNotification(thing, newParent, index, LINK_PARENT);
 	}

diff --git a/src/items/containers/inbox/inbox.cpp b/src/items/containers/inbox/inbox.cpp
@@ -67,7 +67,7 @@ void Inbox::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr
 }
 
 std::shared_ptr<Cylinder> Inbox::getParent() {
-	auto parentLocked = parent.lock();
+	auto parentLocked = m_parent.lock();
 	if (parentLocked) {
 		return parentLocked->getParent();
 	}

diff --git a/src/items/containers/inbox/inbox.hpp b/src/items/containers/inbox/inbox.hpp
@@ -39,7 +39,7 @@ class Inbox final : public Container {
 
 	std::shared_ptr<Cylinder> getParent() override;
 	std::shared_ptr<Cylinder> getRealParent() override {
-		return parent.lock();
+		return m_parent.lock();
 	}
 
 private:

diff --git a/src/items/containers/rewards/reward.cpp b/src/items/containers/rewards/reward.cpp
@@ -54,5 +54,5 @@ void Reward::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_pt
 }
 
 std::shared_ptr<Cylinder> Reward::getParent() {
-	return parent.lock();
+	return m_parent.lock();
 }
diff --git a/src/items/containers/rewards/reward.hpp b/src/items/containers/rewards/reward.hpp
@@ -32,6 +32,6 @@ class Reward : public Container {
 
 	std::shared_ptr<Cylinder> getParent() final;
 	std::shared_ptr<Cylinder> getRealParent() final {
-		return parent.lock();
+		return m_parent.lock();
 	}
 };
diff --git a/src/items/containers/rewards/rewardchest.cpp b/src/items/containers/rewards/rewardchest.cpp
@@ -27,14 +27,14 @@ ReturnValue RewardChest::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint3
 }
 
 void RewardChest::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) {
-	auto parentLocked = parent.lock();
+	auto parentLocked = m_parent.lock();
 	if (parentLocked) {
 		parentLocked->postAddNotification(thing, oldParent, index, LINK_PARENT);
 	}
 }
 
 void RewardChest::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) {
-	auto parentLocked = parent.lock();
+	auto parentLocked = m_parent.lock();
 	if (parentLocked) {
 		parentLocked->postRemoveNotification(thing, newParent, index, LINK_PARENT);
 	}

diff --git a/src/items/item.hpp b/src/items/item.hpp
@@ -564,18 +564,22 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject {
 	bool hasMarketAttributes() const;
 
 	std::shared_ptr<Cylinder> getParent() override {
-		return parent.lock();
+		return m_parent.lock();
 	}
 	void setParent(std::weak_ptr<Cylinder> cylinder) override {
-		parent = cylinder;
+		m_parent = cylinder;
 	}
 	void resetParent() {
-		parent.reset();
+		m_parent.reset();
 	}
 	std::shared_ptr<Cylinder> getTopParent();
 	std::shared_ptr<Tile> getTile() override;
 	bool isRemoved() override {
-		return parent.expired() || getParent()->isRemoved();
+		auto parent = getParent();
+		if (parent) {
+			return parent->isRemoved();
+		}
+		return true;
 	}
 
 	bool isInsideDepot(bool includeInbox = false);
@@ -676,7 +680,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject {
 	void checkDecayMapItemOnMove();
 
 protected:
-	std::weak_ptr<Cylinder> parent;
+	std::weak_ptr<Cylinder> m_parent;
 
 	uint16_t id; // the same id as in ItemType
 	uint8_t count = 1; // number of stacked items