From 8b4ca336ce68cc17573115dd07eb1bfc6521b298 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 25 Sep 2014 23:33:50 +0200 Subject: Differentiate between int and float positions --- src/control/MapContext.cpp | 2 +- src/control/MapContext.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/control') diff --git a/src/control/MapContext.cpp b/src/control/MapContext.cpp index 8900298..aa246a9 100644 --- a/src/control/MapContext.cpp +++ b/src/control/MapContext.cpp @@ -35,7 +35,7 @@ MapContext::MapContext(EventBus *eventBus0, InputHandler *inputHandler0, const s : eventBus(eventBus0), inputHandler(inputHandler0), map(map0) { view = std::unique_ptr(new View::MapView(window, map.getTileset())); - playerEntity = map.addEntity("square", Model::Position{8, 8}); + playerEntity = map.addEntity("square", Model::Position{8, 8}); view->updateEntities(map.getEntities()); diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp index d9c34f3..05ed991 100644 --- a/src/control/MapContext.hpp +++ b/src/control/MapContext.hpp @@ -53,7 +53,7 @@ private: void movePlayerContinue(uint64_t time); void keyPressed(uint16_t key, uint64_t time); - Model::Position getViewPosition(uint64_t time) { + Model::Position getViewPosition(uint64_t time) { return map.getEntityPosition(playerEntity, time); } -- cgit v1.2.3