summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-06-11 11:59:36 +0000
committertruelight <truelight@openttd.org>2007-06-11 11:59:36 +0000
commita391f03ae23d9bc9df188f976214d61b75be8b48 (patch)
tree50c0c99556115ffbf64903dfe7833e8547f5707b
parent6b101cc177a9e689dd193041b82661ab140b817c (diff)
downloadopenttd-a391f03ae23d9bc9df188f976214d61b75be8b48.tar.xz
(svn r10093) -Revert: removed 16x zoom-out as it is broken beyond repair
-rw-r--r--src/sound.cpp2
-rw-r--r--src/texteff.cpp1
-rw-r--r--src/viewport.cpp24
-rw-r--r--src/zoom.hpp3
4 files changed, 2 insertions, 28 deletions
diff --git a/src/sound.cpp b/src/sound.cpp
index fdc6c8451..ac8f3c2fa 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -152,7 +152,7 @@ static void StartSound(uint sound, int panning, uint volume)
}
-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 --git a/src/texteff.cpp b/src/texteff.cpp
index c9708d4d7..ad94b1d6f 100644
--- a/src/texteff.cpp
+++ b/src/texteff.cpp
@@ -353,7 +353,6 @@ void DrawTextEffects(DrawPixelInfo *dpi)
case ZOOM_LVL_OUT_4X:
case ZOOM_LVL_OUT_8X:
- case ZOOM_LVL_OUT_16X:
break;
default: NOT_REACHED();
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 1fc915ec5..4e2c4a217 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -858,9 +858,6 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
}
@@ -931,9 +928,6 @@ static void ViewportAddStationNames(DrawPixelInfo *dpi)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
}
@@ -1004,9 +998,6 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
}
@@ -1077,9 +1068,6 @@ static void ViewportAddWaypoints(DrawPixelInfo *dpi)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
}
@@ -1581,9 +1569,6 @@ static bool CheckClickOnTown(const ViewPort *vp, int x, int y)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
@@ -1642,9 +1627,6 @@ static bool CheckClickOnStation(const ViewPort *vp, int x, int y)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
@@ -1703,9 +1685,6 @@ static bool CheckClickOnSign(const ViewPort *vp, int x, int y)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
@@ -1764,9 +1743,6 @@ static bool CheckClickOnWaypoint(const ViewPort *vp, int x, int y)
}
break;
- case ZOOM_LVL_OUT_16X:
- break;
-
default: NOT_REACHED();
}
diff --git a/src/zoom.hpp b/src/zoom.hpp
index 19e64e615..e0e7cc7a0 100644
--- a/src/zoom.hpp
+++ b/src/zoom.hpp
@@ -11,7 +11,6 @@ enum ZoomLevel {
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 @@ enum ZoomLevel {
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;