diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-09-24 03:38:46 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-09-24 03:38:46 +0200 |
commit | 657f3ea479ec9a1e7703140d0655fd7283a784e0 (patch) | |
tree | 15f778df6a539a7dce59e8c07374ca23a109f82b /src/control | |
parent | 3c995acde81feae6c46a14fe7abbc6d2b434422b (diff) | |
download | rpgedit-657f3ea479ec9a1e7703140d0655fd7283a784e0.tar rpgedit-657f3ea479ec9a1e7703140d0655fd7283a784e0.zip |
Directly use MapView contructor
Diffstat (limited to 'src/control')
-rw-r--r-- | src/control/MapContext.hpp | 4 | ||||
-rw-r--r-- | src/control/RPGEdit.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
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(); }); |