Merge remote-tracking branch 'upstream/master'

2021-11-08 23:47:49 +03:00
parent 3ec7adc30c 20a6ffee07
commit 760b4a16a6
54 changed files with 359 additions and 272 deletions
@@ -162,11 +162,11 @@ void FixTitleGameZoom(int zoom_adjust)
 	/* Adjust the zoom in/out.
 	 * Can't simply add, since operator+ is not defined on the ZoomLevel type. */
 	vp->zoom = _gui_zoom;
-	while (zoom_adjust < 0 && vp->zoom != ZOOM_LVL_MIN) {
+	while (zoom_adjust < 0 && vp->zoom != _settings_client.gui.zoom_min) {
 		vp->zoom--;
 		zoom_adjust++;
 	}
-	while (zoom_adjust > 0 && vp->zoom != ZOOM_LVL_MAX) {
+	while (zoom_adjust > 0 && vp->zoom != _settings_client.gui.zoom_max) {
 		vp->zoom++;
 		zoom_adjust--;
 	}