From 657f3ea479ec9a1e7703140d0655fd7283a784e0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 24 Sep 2014 03:38:46 +0200
Subject: Directly use MapView contructor

---
 src/control/MapContext.hpp | 4 ----
 src/control/RPGEdit.cpp    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp
index 0612dd3..37a38ea 100644
--- a/src/control/MapContext.hpp
+++ b/src/control/MapContext.hpp
@@ -58,10 +58,6 @@ public:
 	Model::Position getViewPosition(uint64_t time) {
 		return map->getPlayerEntity()->getPosition(time);
 	}
-
-	std::shared_ptr<View::MapView> initView(const std::shared_ptr<View::Window> &window) {
-		return std::make_shared<View::MapView>(window, map);
-	}
 };
 
 }
diff --git a/src/control/RPGEdit.cpp b/src/control/RPGEdit.cpp
index e8d71a6..31998b2 100644
--- a/src/control/RPGEdit.cpp
+++ b/src/control/RPGEdit.cpp
@@ -107,7 +107,7 @@ void RPGEdit::run() {
 	ctx = std::make_shared<MapContext>(&eventBus, &inputHandler, map);
 
 	window = std::make_shared<View::Window>();
-	mapView = ctx->initView(window);
+	mapView = std::make_shared<View::MapView>(window, map);
 
 	eventThread = std::thread([this] { eventLoop(); });
 
-- 
cgit v1.2.3