From 4065556d4a75e9ea0c7ae922d611a6711f8f188a Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 15 Sep 2024 07:50:11 -0500
Subject: [PATCH] Switched map loops to weakptrs

---
 src/dawn/component/display/Camera.cpp   |  1 -
 src/dawn/scene/SceneItem.cpp            |  2 --
 src/dawnrpg/component/entity/Entity.cpp | 21 ++++++++++++++++-----
 src/dawnrpg/component/entity/Entity.hpp | 16 +++++++++++++++-
 src/dawnrpg/component/world/Map.cpp     |  8 ++++++--
 src/dawnrpg/component/world/Map.hpp     |  9 ++++++++-
 6 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/dawn/component/display/Camera.cpp b/src/dawn/component/display/Camera.cpp
index 2c25ff00..49a370c3 100644
--- a/src/dawn/component/display/Camera.cpp
+++ b/src/dawn/component/display/Camera.cpp
@@ -18,7 +18,6 @@ void Camera::onInit() {
 }
 
 void Camera::onDispose() {
-  std::cout << "Camera Disposing" << std::endl;
   renderTarget = nullptr;
 }
 
diff --git a/src/dawn/scene/SceneItem.cpp b/src/dawn/scene/SceneItem.cpp
index 14ac6c3b..1deb6612 100644
--- a/src/dawn/scene/SceneItem.cpp
+++ b/src/dawn/scene/SceneItem.cpp
@@ -15,7 +15,6 @@ SceneItem::SceneItem(const std::weak_ptr<Scene> scene) :
   SceneItemTransform(),
   SceneItemComponents()
 {
-  std::cout << "Scene Item Initializing" << std::endl;
   SCENE_ITEMS_ACTIVE++;
 }
 
@@ -41,6 +40,5 @@ void SceneItem::remove() {
 }
 
 SceneItem::~SceneItem() {
-  std::cout << "Scene Item Disposing" << std::endl;
   SCENE_ITEMS_ACTIVE--;
 }
\ No newline at end of file
diff --git a/src/dawnrpg/component/entity/Entity.cpp b/src/dawnrpg/component/entity/Entity.cpp
index 2fbfcbf5..5238392e 100644
--- a/src/dawnrpg/component/entity/Entity.cpp
+++ b/src/dawnrpg/component/entity/Entity.cpp
@@ -21,7 +21,7 @@ const glm::vec3 EntityTilePosition::toWorldSpace() {
 }
 
 void Entity::onInit() {
-  assertNotNull(this->map, "Entity map cannot be null.");
+  assertNotNull(this->getMap(), "Entity map cannot be null.");
 
   // Listen for turn time
   listeners.push_back(getScene()->onUnpausedUpdate.listen([this](float_t delta){
@@ -53,12 +53,22 @@ void Entity::onInit() {
   }));
 
   // Notify map.
-  this->map->entityNotifyInit(this->getItem());
+  getMap()->entityNotifyInit(this->getItem());
 }
 
 void Entity::onDispose() {
-  this->map->entityNotifyDispose(this->getItem());
-  this->map = nullptr;
+  auto map = this->map.lock();
+  if(map) map->entityNotifyDispose(this->getItem());
+}
+
+std::shared_ptr<Map> Entity::getMap() {
+  auto map = this->map.lock();
+  assertNotNull(map, "Map cannot be null?");
+  return map;
+}
+
+std::shared_ptr<World> Entity::getWorld() {
+  return this->getMap()->getWorld();
 }
 
 struct EntityStepResult Entity::move(
@@ -74,6 +84,7 @@ struct EntityStepResult Entity::move(
     return result;
   }
 
+  auto map = this->getMap();
   struct EntityTilePosition newPosition = this->tilePosition;
   switch(direction) {
     case EntityDirection::Up:
@@ -93,7 +104,7 @@ struct EntityStepResult Entity::move(
   }
 
   // Check for entity in way.
-  auto entityInWay = this->map->getEntityAt(newPosition);
+  auto entityInWay = map->getEntityAt(newPosition);
   if(entityInWay) {
     result.type = EntityStepResultType::EntityInWay;
     result.entityInWay = entityInWay;
diff --git a/src/dawnrpg/component/entity/Entity.hpp b/src/dawnrpg/component/entity/Entity.hpp
index b68102d2..07826bbf 100644
--- a/src/dawnrpg/component/entity/Entity.hpp
+++ b/src/dawnrpg/component/entity/Entity.hpp
@@ -47,8 +47,8 @@ namespace Dawn {
       struct EntityTilePosition tilePosition;
 
     public:
+      std::weak_ptr<Map> map;
       enum EntityID id = EntityID::Null;
-      std::shared_ptr<Map> map;
       
       Event<> eventStepStart;
       Event<> eventStepEnd;
@@ -58,6 +58,20 @@ namespace Dawn {
       void onInit() override;
       void onDispose() override;
 
+      /**
+       * Gets the map that the entity is on.
+       * 
+       * @return The map that the entity is on.
+       */
+      std::shared_ptr<Map> getMap();
+
+      /**
+       * Gets the world that the entity is on.
+       * 
+       * @return The world that the entity is on.
+       */
+      std::shared_ptr<World> getWorld();
+
       /**
        * Moves the entity in the given direction.
        * 
diff --git a/src/dawnrpg/component/world/Map.cpp b/src/dawnrpg/component/world/Map.cpp
index ee496fea..87176cb4 100644
--- a/src/dawnrpg/component/world/Map.cpp
+++ b/src/dawnrpg/component/world/Map.cpp
@@ -29,11 +29,15 @@ void Map::entityNotifyDispose(std::shared_ptr<SceneItem> item) {
 }
 
 void Map::onInit() {
-  assertNotNull(this->world, "Map must have a world.");
 }
 
 void Map::onDispose() {
-  this->world = nullptr;
+}
+
+std::shared_ptr<World> Map::getWorld() {
+  auto world = this->world.lock();
+  assertNotNull(world, "World cannot be null?");
+  return world;
 }
 
 std::shared_ptr<Entity> Map::getEntity(const EntityID id) {
diff --git a/src/dawnrpg/component/world/Map.hpp b/src/dawnrpg/component/world/Map.hpp
index 34e37286..7479d028 100644
--- a/src/dawnrpg/component/world/Map.hpp
+++ b/src/dawnrpg/component/world/Map.hpp
@@ -28,11 +28,18 @@ namespace Dawn {
       void entityNotifyDispose(std::shared_ptr<SceneItem> entity);
 
     public:
-      std::shared_ptr<World> world;
+      std::weak_ptr<World> world;
 
       void onInit() override;
       void onDispose() override;
 
+      /**
+       * Gets the world that this map belongs to.
+       * 
+       * @return The world that this map belongs to.
+       */
+      std::shared_ptr<World> getWorld();
+
       /**
        * Gets the entity with the given ID.
        *