feat: more optional refs

Author: daniebker

include/entity_manager.hpp

@@ -28,7 +28,8 @@ class EntityManager {
   void clear_except_player();
   std::optional<std::reference_wrapper<Entity>> get_blocking_entity_at(
       Vector2D position);
-  Entity* get_non_blocking_entity_at(Vector2D position);
+  std::optional<std::reference_wrapper<Entity>> get_non_blocking_entity_at(
+      Vector2D position);
   Entity* get_closest_living_monster(Vector2D position, float range) const;
   std::vector<Entity*> get_entities_at(Vector2D position);
   void place_entities(

src/entity_manager.cpp

@@ -124,14 +124,15 @@ EntityManager::get_blocking_entity_at(Vector2D position) {
   return std::nullopt;
 }
 
-Entity* EntityManager::get_non_blocking_entity_at(Vector2D position) {
+std::optional<std::reference_wrapper<Entity>>
+EntityManager::get_non_blocking_entity_at(Vector2D position) {
   for (const auto& entity : entities_) {
     if (!entity->is_blocking() &&
         entity->get_transform_component().get_position() == position) {
-      return entity;
+      return std::reference_wrapper<Entity>(*entity);
     }
   }
-  return nullptr;
+  return std::nullopt;
 }
 
 void EntityManager::remove(Entity* entity) {

src/events/command.cpp

@@ -12,13 +12,15 @@
 namespace cpprl {
 
 StateResult PickupCommand::execute() {
-  Entity* item = world_.get_entities().get_non_blocking_entity_at(
-      entity_->get_transform_component().get_position());
-  if (item) {
+  std::optional<std::reference_wrapper<Entity>> optional_item_ref =
+      world_.get_entities().get_non_blocking_entity_at(
+          entity_->get_transform_component().get_position());
+  if (optional_item_ref.has_value()) {
+    Entity& item = optional_item_ref.value().get();
     world_.get_message_log().add_message(
-        "You pick up the " + item->get_name() + ".", WHITE);
-    entity_->get_container().add(item);
-    world_.get_entities().remove(item);
+        "You pick up the " + item.get_name() + ".", WHITE);
+    entity_->get_container().add(&item);
+    world_.get_entities().remove(&item);
   } else {
     return NoOp{"There is nothing here to pick up."};
   }