1 files changed, 11 insertions, 3 deletions

@@ -523,8 +523,10 @@ void Game::setZoom(size_t zoom)
     return;
   }
 
-  zoomProgress = 0;
-  zoomLength = std::abs(static_cast<long>(zoom - curZoom)) * TILE_WIDTH;
+  /*zoomProgress = 0;
+  zoomLength = std::abs(static_cast<long>(zoom - curZoom)) * TILE_WIDTH;*/
+  zoomProgress.start(62 * std::abs(static_cast<long>(zoom - curZoom)) * TILE_WIDTH);
+  oldZoom = curZoom;
   curZoom = zoom;
   zooming = true;
   loadMap();
@@ -824,7 +826,7 @@ void Game::update(size_t frameTime) {
     recalculateRender();
   }
 
-  zoomTimer.accumulate(frameTime);
+  /*zoomTimer.accumulate(frameTime);
   while (zoomTimer.step())
   {
     if (zooming)
@@ -836,6 +838,12 @@ void Game::update(size_t frameTime) {
         zooming = false;
       }
     }
+  }*/
+  if (zooming) {
+    zoomProgress.tick(frameTime);
+    if (zoomProgress.isComplete()) {
+      zooming = false;
+    }
   }
 
   playerAnim.update(frameTime);