summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-09-23 02:11:11 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-09-23 02:11:11 +0200
commitd41e2dae45e08059e23041f0146b91add0c2cace (patch)
tree780888633b8a051be868df29fd29c369605ee5e4 /src/control
parent0c3dbabb920f2957ca8c36194ebdeec9f80fefe7 (diff)
downloadrpgedit-d41e2dae45e08059e23041f0146b91add0c2cace.tar
rpgedit-d41e2dae45e08059e23041f0146b91add0c2cace.zip
Add transitions for entity movement
Diffstat (limited to 'src/control')
-rw-r--r--src/control/MapContext.cpp30
-rw-r--r--src/control/MapContext.hpp20
2 files changed, 31 insertions, 19 deletions
diff --git a/src/control/MapContext.cpp b/src/control/MapContext.cpp
index 5fda337..f4dd31e 100644
--- a/src/control/MapContext.cpp
+++ b/src/control/MapContext.cpp
@@ -45,6 +45,36 @@ MapContext::MapContext(ImageLoader *imageLoader0, const std::shared_ptr<const Mo
entities[entity->getName()] = imageLoader->get("entity/" + entity->getName());
}
+void MapContext::advance(InputHandler *inputHandler, uint32_t ticks) {
+ uint64_t totalTicksOld = totalTicks;
+ totalTicks += ticks;
+
+ unsigned advance = totalTicks - totalTicksOld;
+
+ while (advance) {
+ advance = map->getPlayerEntity().advance(advance);
+
+ if (map->getPlayerEntity().hasTransition())
+ break;
+
+ if (inputHandler->isKeyPressed(SDL_SCANCODE_UP)) {
+ map->getPlayerEntity().move(Model::NORTH, 250);
+ }
+ else if (inputHandler->isKeyPressed(SDL_SCANCODE_RIGHT)) {
+ map->getPlayerEntity().move(Model::EAST, 250);
+ }
+ else if (inputHandler->isKeyPressed(SDL_SCANCODE_DOWN)) {
+ map->getPlayerEntity().move(Model::SOUTH, 250);
+ }
+ else if (inputHandler->isKeyPressed(SDL_SCANCODE_LEFT)) {
+ map->getPlayerEntity().move(Model::WEST, 250);
+ }
+ else {
+ break;
+ }
+ }
+}
+
}
}
diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp
index 4cbf38a..504afc2 100644
--- a/src/control/MapContext.hpp
+++ b/src/control/MapContext.hpp
@@ -53,25 +53,7 @@ private:
public:
MapContext(ImageLoader *imageLoader0, const std::shared_ptr<const Model::Map> &map0);
- void advance(InputHandler *inputHandler, uint32_t ticks) {
- uint64_t totalTicksOld = totalTicks;
- totalTicks += ticks;
-
- uint64_t advanced = totalTicks/100 - totalTicksOld/100;
-
- if (inputHandler->isKeyPressed(SDL_SCANCODE_UP)) {
- map->getPlayerEntity().move(Model::NORTH, advanced);
- }
- else if (inputHandler->isKeyPressed(SDL_SCANCODE_RIGHT)) {
- map->getPlayerEntity().move(Model::EAST, advanced);
- }
- else if (inputHandler->isKeyPressed(SDL_SCANCODE_DOWN)) {
- map->getPlayerEntity().move(Model::SOUTH, advanced);
- }
- else if (inputHandler->isKeyPressed(SDL_SCANCODE_LEFT)) {
- map->getPlayerEntity().move(Model::WEST, advanced);
- }
- }
+ void advance(InputHandler *inputHandler, unsigned ticks);
std::shared_ptr<View::MapView> initView(const std::shared_ptr<View::Window> &window) {
return std::make_shared<View::MapView>(window, map, tiles, entities);