1 files changed, 35 insertions, 12 deletions

@@ -81,7 +81,11 @@ void tick(Game& game, bool onlyDark = false)
 
 bool movePlayer(Game& game, int x, int y)
 {
-  if (game.map.inBounds(x, y) && game.map.at(x,y).tile == Tile::Floor)
+  if (x >= game.curBoundX &&
+      y >= game.curBoundY &&
+      x < game.curBoundX + game.curZoom * ZOOM_X_FACTOR &&
+      y < game.curBoundY + game.curZoom * ZOOM_Y_FACTOR &&
+      game.map.at(x,y).tile == Tile::Floor)
   {
     if (game.map.at(game.player_x, game.player_y).tile == Tile::Floor)
     {
@@ -366,11 +370,36 @@ void setZoom(Game& game, size_t zoom)
     growMap(game, zoom);
   }
 
-  // TODO: don't think this works well with rapid zoom changes
-  game.zoomProgress += (zoom - game.curZoom) * TILE_WIDTH;
-  //game.oldZoom = game.curZoom;
+  std::tie(
+    game.lastZoomLeft,
+    game.lastZoomTop,
+    game.lastZoomWidth,
+    game.lastZoomHeight) =
+      Renderer::calculateZoomRect(game);
+
+  game.zoomProgress = 0;
+  game.zoomLength =
+    std::abs(static_cast<long>(zoom - game.curZoom)) * TILE_WIDTH;
   game.curZoom = zoom;
   game.zooming = true;
+
+  game.curBoundX = game.player_x - zoom * ZOOM_X_FACTOR / 2;
+  if (game.curBoundX < game.map.getLeft())
+  {
+    game.curBoundX = game.map.getLeft();
+  } else if (game.curBoundX + zoom * ZOOM_X_FACTOR >= game.map.getRight())
+  {
+    game.curBoundX = game.map.getRight() - zoom * ZOOM_X_FACTOR;
+  }
+
+  game.curBoundY = game.player_y - zoom * ZOOM_Y_FACTOR / 2;
+  if (game.curBoundY < game.map.getTop())
+  {
+    game.curBoundY = game.map.getTop();
+  } else if (game.curBoundY + zoom * ZOOM_Y_FACTOR >= game.map.getBottom())
+  {
+    game.curBoundY = game.map.getBottom() - zoom * ZOOM_Y_FACTOR;
+  }
 }
 
 int main(int, char**)
@@ -691,15 +720,9 @@ int main(int, char**)
       {
         if (game.zooming)
         {
-          if (game.zoomProgress > 0)
-          {
-            game.zoomProgress--;
-          } else if (game.zoomProgress < 0)
-          {
-            game.zoomProgress++;
-          }
+          game.zoomProgress++;
 
-          if (game.zoomProgress == 0)
+          if (game.zoomProgress == game.zoomLength)
           {
             game.zooming = false;
           }