# HG changeset patch # User truelight # Date 1181563176 0 # Node ID 011888c570df54368d98ea8a6b8a49486d41f118 # Parent 439563b70fd3e35863ddfd58dcc778ab438b577f (svn r10093) -Revert: removed 16x zoom-out as it is broken beyond repair diff -r 439563b70fd3 -r 011888c570df src/sound.cpp --- a/src/sound.cpp Mon Jun 11 11:50:49 2007 +0000 +++ b/src/sound.cpp Mon Jun 11 11:59:36 2007 +0000 @@ -152,7 +152,7 @@ } -static const byte _vol_factor_by_zoom[] = {255, 190, 134, 87, 49}; +static const byte _vol_factor_by_zoom[] = {255, 190, 134, 87}; assert_compile(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END); static const byte _sound_base_vol[] = { diff -r 439563b70fd3 -r 011888c570df src/texteff.cpp --- a/src/texteff.cpp Mon Jun 11 11:50:49 2007 +0000 +++ b/src/texteff.cpp Mon Jun 11 11:59:36 2007 +0000 @@ -353,7 +353,6 @@ case ZOOM_LVL_OUT_4X: case ZOOM_LVL_OUT_8X: - case ZOOM_LVL_OUT_16X: break; default: NOT_REACHED(); diff -r 439563b70fd3 -r 011888c570df src/viewport.cpp --- a/src/viewport.cpp Mon Jun 11 11:50:49 2007 +0000 +++ b/src/viewport.cpp Mon Jun 11 11:59:36 2007 +0000 @@ -858,9 +858,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } } @@ -931,9 +928,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } } @@ -1004,9 +998,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } } @@ -1077,9 +1068,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } } @@ -1581,9 +1569,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } @@ -1642,9 +1627,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } @@ -1703,9 +1685,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } @@ -1764,9 +1743,6 @@ } break; - case ZOOM_LVL_OUT_16X: - break; - default: NOT_REACHED(); } diff -r 439563b70fd3 -r 011888c570df src/zoom.hpp --- a/src/zoom.hpp Mon Jun 11 11:50:49 2007 +0000 +++ b/src/zoom.hpp Mon Jun 11 11:59:36 2007 +0000 @@ -11,7 +11,6 @@ ZOOM_LVL_OUT_2X, ZOOM_LVL_OUT_4X, ZOOM_LVL_OUT_8X, - ZOOM_LVL_OUT_16X, ZOOM_LVL_END, /* Here we define in which zoom viewports are */ @@ -28,7 +27,7 @@ ZOOM_LVL_DETAIL = ZOOM_LVL_OUT_2X, ///< All zoomlevels below or equal to this, will result in details on the screen, like road-work, ... ZOOM_LVL_MIN = ZOOM_LVL_NORMAL, - ZOOM_LVL_MAX = ZOOM_LVL_OUT_16X, + ZOOM_LVL_MAX = ZOOM_LVL_OUT_8X, }; extern ZoomLevel _saved_scrollpos_zoom;