From fe0c3b733abf6eac5f4b5bc18f24f8a5cda1bfc4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 22 Sep 2014 21:54:01 +0200
Subject: Render entities

---
 src/control/MapContext.hpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/control/MapContext.hpp')

diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp
index 703a582..a98d818 100644
--- a/src/control/MapContext.hpp
+++ b/src/control/MapContext.hpp
@@ -26,10 +26,11 @@
 
 #pragma once
 
-#include "TileLoader.hpp"
+#include "ImageLoader.hpp"
 #include "../model/Map.hpp"
 #include "../view/MapView.hpp"
 
+#include <map>
 #include <memory>
 
 
@@ -39,16 +40,18 @@ namespace Control {
 
 class MapContext {
 private:
-	TileLoader *const tileLoader;
+	ImageLoader *const imageLoader;
 
 	std::shared_ptr<const Model::Map> map;
+
 	std::vector<SDL_Surface *> tiles;
+	std::map<std::string, SDL_Surface *> entities;
 
 public:
-	MapContext(TileLoader *tileLoader0, const std::shared_ptr<const Model::Map> &map0);
+	MapContext(ImageLoader *imageLoader0, const std::shared_ptr<const Model::Map> &map0);
 
 	std::shared_ptr<View::MapView> initView(const std::shared_ptr<View::Window> &window) {
-		return std::make_shared<View::MapView>(window, map, tiles);
+		return std::make_shared<View::MapView>(window, map, tiles, entities);
 	}
 };
 
-- 
cgit v1.2.3