diff options
| author | peter1138 <peter1138@openttd.org> | 2011-11-24 12:38:48 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2011-11-24 12:38:48 +0000 |
| commit | 81598273e9b6bb2ee20ebdd82f3d4646a02999ba (patch) | |
| tree | 2d13cc93dc84f2d99cff6fc2bb02214d4453f033 /src/zoom_type.h | |
| parent | 15d0a22aac6b90a2055e68d019cab4350376a8fd (diff) | |
| download | openttd-81598273e9b6bb2ee20ebdd82f3d4646a02999ba.tar.xz | |
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
Diffstat (limited to 'src/zoom_type.h')
| -rw-r--r-- | src/zoom_type.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/zoom_type.h b/src/zoom_type.h index 8b5761408..37ffc153c 100644 --- a/src/zoom_type.h +++ b/src/zoom_type.h @@ -14,6 +14,9 @@ #include "core/enum_type.hpp" +static int const ZOOM_LVL_SHIFT = 2; +static int const ZOOM_LVL_BASE = 1 << ZOOM_LVL_SHIFT; + /** All zoom levels we know. */ enum ZoomLevel { /* Our possible zoom-levels */ @@ -22,25 +25,28 @@ enum ZoomLevel { ZOOM_LVL_OUT_2X, ///< Zoomed 2 times out. ZOOM_LVL_OUT_4X, ///< Zoomed 4 times out. ZOOM_LVL_OUT_8X, ///< Zoomed 8 times out. + ZOOM_LVL_OUT_16X, ///< Zoomed 16 times out. + ZOOM_LVL_OUT_32X, ///< Zoomed 32 times out. ZOOM_LVL_END, ///< End for iteration. ZOOM_LVL_COUNT = ZOOM_LVL_END - ZOOM_LVL_BEGIN, ///< Number of zoom levels. /* Here we define in which zoom viewports are */ - ZOOM_LVL_VIEWPORT = ZOOM_LVL_NORMAL, ///< Default zoom level for viewports. - ZOOM_LVL_NEWS = ZOOM_LVL_NORMAL, ///< Default zoom level for the news messages. - ZOOM_LVL_INDUSTRY = ZOOM_LVL_OUT_2X, ///< Default zoom level for the industry view. - ZOOM_LVL_TOWN = ZOOM_LVL_OUT_2X, ///< Default zoom level for the town view. - ZOOM_LVL_AIRCRAFT = ZOOM_LVL_NORMAL, ///< Default zoom level for the aircraft view. - ZOOM_LVL_SHIP = ZOOM_LVL_NORMAL, ///< Default zoom level for the ship view. - ZOOM_LVL_TRAIN = ZOOM_LVL_NORMAL, ///< Default zoom level for the train view. - ZOOM_LVL_ROADVEH = ZOOM_LVL_NORMAL, ///< Default zoom level for the road vehicle view. - ZOOM_LVL_WORLD_SCREENSHOT = ZOOM_LVL_NORMAL, ///< Default zoom level for the world screen shot. - - 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_VIEWPORT = ZOOM_LVL_OUT_4X, ///< Default zoom level for viewports. + ZOOM_LVL_GUI = ZOOM_LVL_OUT_4X, ///< Default zoom level for GUI sprites. + ZOOM_LVL_NEWS = ZOOM_LVL_OUT_4X, ///< Default zoom level for the news messages. + ZOOM_LVL_INDUSTRY = ZOOM_LVL_OUT_8X, ///< Default zoom level for the industry view. + ZOOM_LVL_TOWN = ZOOM_LVL_OUT_8X, ///< Default zoom level for the town view. + ZOOM_LVL_AIRCRAFT = ZOOM_LVL_OUT_4X, ///< Default zoom level for the aircraft view. + ZOOM_LVL_SHIP = ZOOM_LVL_OUT_4X, ///< Default zoom level for the ship view. + ZOOM_LVL_TRAIN = ZOOM_LVL_OUT_4X, ///< Default zoom level for the train view. + ZOOM_LVL_ROADVEH = ZOOM_LVL_OUT_4X, ///< Default zoom level for the road vehicle view. + ZOOM_LVL_WORLD_SCREENSHOT = ZOOM_LVL_OUT_4X, ///< Default zoom level for the world screen shot. + + ZOOM_LVL_DETAIL = ZOOM_LVL_OUT_8X, ///< All zoomlevels below or equal to this, will result in details on the screen, like road-work, ... ZOOM_LVL_MIN = ZOOM_LVL_NORMAL, ///< Minimum zoom level. - ZOOM_LVL_MAX = ZOOM_LVL_OUT_8X, ///< Maximum zoom level. + ZOOM_LVL_MAX = ZOOM_LVL_OUT_32X, ///< Maximum zoom level. }; DECLARE_POSTFIX_INCREMENT(ZoomLevel) |