From c3e32345e53650a1c231f4e1a41d40c97955b893 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 26 Sep 2014 00:58:27 +0200 Subject: Collision rework --- src/control/MapContext.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/control/MapContext.cpp') diff --git a/src/control/MapContext.cpp b/src/control/MapContext.cpp index aa246a9..f5d4c05 100644 --- a/src/control/MapContext.cpp +++ b/src/control/MapContext.cpp @@ -62,32 +62,32 @@ void MapContext::movePlayer(Model::Direction dir, uint64_t time) { void MapContext::movePlayerContinue(uint64_t time) { if (inputHandler->isKeyPressed(SDL_SCANCODE_UP)) - movePlayer(Model::NORTH, time); + movePlayer(Model::Direction::NORTH, time); else if (inputHandler->isKeyPressed(SDL_SCANCODE_RIGHT)) - movePlayer(Model::EAST, time); + movePlayer(Model::Direction::EAST, time); else if (inputHandler->isKeyPressed(SDL_SCANCODE_DOWN)) - movePlayer(Model::SOUTH, time); + movePlayer(Model::Direction::SOUTH, time); else if (inputHandler->isKeyPressed(SDL_SCANCODE_LEFT)) - movePlayer(Model::WEST, time); + movePlayer(Model::Direction::WEST, time); } void MapContext::keyPressed(uint16_t key, uint64_t time) { switch (key) { case SDL_SCANCODE_UP: - movePlayer(Model::NORTH, time); + movePlayer(Model::Direction::NORTH, time); break; case SDL_SCANCODE_RIGHT: - movePlayer(Model::EAST, time); + movePlayer(Model::Direction::EAST, time); break; case SDL_SCANCODE_DOWN: - movePlayer(Model::SOUTH, time); + movePlayer(Model::Direction::SOUTH, time); break; case SDL_SCANCODE_LEFT: - movePlayer(Model::WEST, time); + movePlayer(Model::Direction::WEST, time); } } -- cgit v1.2.3