diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-09-25 23:33:50 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-09-25 23:33:50 +0200 |
| commit | 8b4ca336ce68cc17573115dd07eb1bfc6521b298 (patch) | |
| tree | b0a6a457986da0a744c1394cc3788443a50ecaa8 /src/control | |
| parent | d82f3b7665435abefe84c8dbc16483acd235b478 (diff) | |
| download | rpgedit-8b4ca336ce68cc17573115dd07eb1bfc6521b298.tar rpgedit-8b4ca336ce68cc17573115dd07eb1bfc6521b298.zip | |
Differentiate between int and float positions
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/MapContext.cpp | 2 | ||||
| -rw-r--r-- | src/control/MapContext.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<View::MapView>(new View::MapView(window, map.getTileset())); - playerEntity = map.addEntity("square", Model::Position{8, 8}); + playerEntity = map.addEntity("square", Model::Position<int>{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<float> getViewPosition(uint64_t time) { return map.getEntityPosition(playerEntity, time); } |