Move external entity state from Entity to Map

2 files changed, 6 insertions, 6 deletions

diff --git a/src/view/MapView.cpp b/src/view/MapView.cpp
index dbce5e4..4a6e552 100644
--- a/src/view/MapView.cpp
+++ b/src/view/MapView.cpp
@@ -76,11 +76,11 @@ MapView::~MapView() {
 	clearEntities();
 }
 
-void MapView::updateEntities(const std::deque<Model::Entity> &entities) {
+void MapView::updateEntities(const std::vector<std::unique_ptr<Model::Entity>> &entities) {
 	SpriteCache *spriteCache = window->getSpriteCache();
 
 	for (auto &entity : entities) {
-		const std::string &name = entity.getName();
+		const std::string &name = entity->getName();
 
 		if (!entitySprites[name])
 			entitySprites[name] = SDL_CreateTextureFromSurface(window->getRenderer(), spriteCache->get("entity", name));
@@ -137,8 +137,8 @@ void MapView::render(const Model::Map *map, Model::Position center, uint64_t tim
 	}
 
 	for (auto &entity : map->getEntities()) {
-		Model::Position pos = entity.getPosition(time);
-		Model::Direction dir = entity.getDirection();
+		Model::Position pos = map->getEntityPosition(entity.get(), time);
+		Model::Direction dir = entity->getDirection();
 
 		SDL_Rect src = {
 			.x = getTileSize()*dir,
@@ -154,7 +154,7 @@ void MapView::render(const Model::Map *map, Model::Position center, uint64_t tim
 			.h = tilePixels,
 		};
 
-		SDL_RenderCopy(window->getRenderer(), entitySprites[entity.getName()], &src, &dst);
+		SDL_RenderCopy(window->getRenderer(), entitySprites[entity->getName()], &src, &dst);
 	}
 }
 
diff --git a/src/view/MapView.hpp b/src/view/MapView.hpp
index f101c24..e813950 100644
--- a/src/view/MapView.hpp
+++ b/src/view/MapView.hpp
@@ -53,7 +53,7 @@ public:
 	MapView(const std::shared_ptr<Window> &window0, const std::vector<std::string> &tileset);
 	~MapView();
 
-	void updateEntities(const std::deque<Model::Entity> &entities);
+	void updateEntities(const std::vector<std::unique_ptr<Model::Entity>> &entities);
 	void clearEntities();
 
 	void clear();