1 files changed, 9 insertions, 4 deletions

@@ -358,7 +358,14 @@ bool processKeys(Game& game, const Input& keystate)
     game.playerAnim.setAnimation("walk");
     game.playerAnim.setDirection(dir);
 
-    return movePlayer(game, px, py);
+    bool succeeds = movePlayer(game, px, py);
+    if (!succeeds && px != game.player_x) {
+      succeeds = movePlayer(game, px, game.player_y);
+    }
+    if (!succeeds && py != game.player_y) {
+      succeeds = movePlayer(game, game.player_x, py);
+    }
+    return succeeds;
   } else {
     return false;
   }
@@ -748,9 +755,7 @@ int main(int, char**)
 
       if (game.queueDash && !game.moving) {
         game.queueDash = false;
-        if (state[SDL_SCANCODE_SPACE]) {
-          performDash(game, rng);
-        }
+        performDash(game, rng);
       }
 
       if (keystate.left || keystate.right || keystate.up || keystate.down)