Use clamp in SetZoomFactor

Author: Flamefire

libs/s25main/world/GameWorldView.cpp

@@ -88,14 +88,9 @@ void GameWorldView::SetNextZoomFactor()
     CalcFxLx();
 }
 
-void GameWorldView::SetZoomFactor(float zoomFactor, bool smoothTransition /* = true*/)
+float GameWorldView::SetZoomFactor(float zoomFactor, bool smoothTransition /* = true*/)
 {
-    if(zoomFactor < ZOOM_FACTORS.front())
-        targetZoomFactor_ = ZOOM_FACTORS.front();
-    else if(zoomFactor > ZOOM_FACTORS.back())
-        targetZoomFactor_ = ZOOM_FACTORS.back();
-    else
-        targetZoomFactor_ = zoomFactor;
+    targetZoomFactor_ = std::clamp(zoomFactor, ZOOM_FACTORS.front(), ZOOM_FACTORS.back());
     if(targetZoomFactor_ > 1 - ZOOM_WHEEL_INCREMENT && targetZoomFactor_ < 1 + ZOOM_WHEEL_INCREMENT)
         targetZoomFactor_ = 1.f; // Snap to 100%
     if(!smoothTransition)
@@ -104,6 +99,7 @@ void GameWorldView::SetZoomFactor(float zoomFactor, bool smoothTransition /* = t
         updateEffectiveZoomFactor();
         CalcFxLx();
     }
+    return targetZoomFactor_;
 }
 
 float GameWorldView::GetCurrentTargetZoomFactor() const

libs/s25main/world/GameWorldView.h

@@ -78,7 +78,9 @@ class GameWorldView
     Position GetPos() const { return origin_; }
     Extent GetSize() const { return size_; }
 
-    void SetZoomFactor(float zoomFactor, bool smoothTransition = true);
+    /// Set target zoom factor and start zooming if smoothTransition is true
+    /// Returns actual zoom factor used, potentially clamped
+    float SetZoomFactor(float zoomFactor, bool smoothTransition = true);
     float GetCurrentTargetZoomFactor() const;
     void SetNextZoomFactor();