diff --git a/images/terrain/fog-n-ne-se-s.png b/images/terrain/fog-n-ne-se-s.png deleted file mode 100644 index cafb7235866..00000000000 Binary files a/images/terrain/fog-n-ne-se-s.png and /dev/null differ diff --git a/images/terrain/fog-n-ne-se.png b/images/terrain/fog-n-ne-se.png deleted file mode 100644 index 63f03cbe7e0..00000000000 Binary files a/images/terrain/fog-n-ne-se.png and /dev/null differ diff --git a/images/terrain/fog-n-ne.png b/images/terrain/fog-n-ne.png deleted file mode 100644 index 2b24f32c425..00000000000 Binary files a/images/terrain/fog-n-ne.png and /dev/null differ diff --git a/images/terrain/fog-n.png b/images/terrain/fog-n.png deleted file mode 100644 index 7aae4c1f540..00000000000 Binary files a/images/terrain/fog-n.png and /dev/null differ diff --git a/images/terrain/fog-ne-se-s.png b/images/terrain/fog-ne-se-s.png deleted file mode 100644 index fd2e5798e2d..00000000000 Binary files a/images/terrain/fog-ne-se-s.png and /dev/null differ diff --git a/images/terrain/fog-ne-se.png b/images/terrain/fog-ne-se.png deleted file mode 100644 index d40f7bce960..00000000000 Binary files a/images/terrain/fog-ne-se.png and /dev/null differ diff --git a/images/terrain/fog-ne.png b/images/terrain/fog-ne.png deleted file mode 100644 index 9e74acb3941..00000000000 Binary files a/images/terrain/fog-ne.png and /dev/null differ diff --git a/images/terrain/fog-nw-n-ne.png b/images/terrain/fog-nw-n-ne.png deleted file mode 100644 index 64db93c886e..00000000000 Binary files a/images/terrain/fog-nw-n-ne.png and /dev/null differ diff --git a/images/terrain/fog-nw-n.png b/images/terrain/fog-nw-n.png deleted file mode 100644 index 78e2553fa01..00000000000 Binary files a/images/terrain/fog-nw-n.png and /dev/null differ diff --git a/images/terrain/fog-nw.png b/images/terrain/fog-nw.png deleted file mode 100644 index 149402238c7..00000000000 Binary files a/images/terrain/fog-nw.png and /dev/null differ diff --git a/images/terrain/fog-s-sw-nw-n.png b/images/terrain/fog-s-sw-nw-n.png deleted file mode 100644 index 91ae2f5f2bc..00000000000 Binary files a/images/terrain/fog-s-sw-nw-n.png and /dev/null differ diff --git a/images/terrain/fog-s-sw-nw.png b/images/terrain/fog-s-sw-nw.png deleted file mode 100644 index a51804cdd4c..00000000000 Binary files a/images/terrain/fog-s-sw-nw.png and /dev/null differ diff --git a/images/terrain/fog-s-sw.png b/images/terrain/fog-s-sw.png deleted file mode 100644 index 92a32585236..00000000000 Binary files a/images/terrain/fog-s-sw.png and /dev/null differ diff --git a/images/terrain/fog-s.png b/images/terrain/fog-s.png deleted file mode 100644 index 191c5c77fa0..00000000000 Binary files a/images/terrain/fog-s.png and /dev/null differ diff --git a/images/terrain/fog-se-s-sw.png b/images/terrain/fog-se-s-sw.png deleted file mode 100644 index 0e46d614383..00000000000 Binary files a/images/terrain/fog-se-s-sw.png and /dev/null differ diff --git a/images/terrain/fog-se-s.png b/images/terrain/fog-se-s.png deleted file mode 100644 index 1de305ad6a0..00000000000 Binary files a/images/terrain/fog-se-s.png and /dev/null differ diff --git a/images/terrain/fog-se.png b/images/terrain/fog-se.png deleted file mode 100644 index 6cb84333cdf..00000000000 Binary files a/images/terrain/fog-se.png and /dev/null differ diff --git a/images/terrain/fog-sw-nw-n.png b/images/terrain/fog-sw-nw-n.png deleted file mode 100644 index 5bb626d3d89..00000000000 Binary files a/images/terrain/fog-sw-nw-n.png and /dev/null differ diff --git a/images/terrain/fog-sw-nw.png b/images/terrain/fog-sw-nw.png deleted file mode 100644 index eeaaeb48cfd..00000000000 Binary files a/images/terrain/fog-sw-nw.png and /dev/null differ diff --git a/images/terrain/fog-sw.png b/images/terrain/fog-sw.png deleted file mode 100644 index e4aafca25d7..00000000000 Binary files a/images/terrain/fog-sw.png and /dev/null differ diff --git a/images/terrain/fog.png b/images/terrain/fog.png index 3de130e506c..305762b222b 100644 Binary files a/images/terrain/fog.png and b/images/terrain/fog.png differ diff --git a/images/terrain/grid.png b/images/terrain/grid.png index ab69d895cdd..fad0e14b3d4 100644 Binary files a/images/terrain/grid.png and b/images/terrain/grid.png differ diff --git a/images/terrain/void-n.png b/images/terrain/void-n.png deleted file mode 100644 index c35b6e91324..00000000000 Binary files a/images/terrain/void-n.png and /dev/null differ diff --git a/images/terrain/void-ne.png b/images/terrain/void-ne.png deleted file mode 100644 index 41ed2184fdc..00000000000 Binary files a/images/terrain/void-ne.png and /dev/null differ diff --git a/images/terrain/void-nw.png b/images/terrain/void-nw.png deleted file mode 100644 index 573d5b30d64..00000000000 Binary files a/images/terrain/void-nw.png and /dev/null differ diff --git a/images/terrain/void-s.png b/images/terrain/void-s.png deleted file mode 100644 index fe1f96b44bc..00000000000 Binary files a/images/terrain/void-s.png and /dev/null differ diff --git a/images/terrain/void-se.png b/images/terrain/void-se.png deleted file mode 100644 index a6184303626..00000000000 Binary files a/images/terrain/void-se.png and /dev/null differ diff --git a/images/terrain/void-sw.png b/images/terrain/void-sw.png deleted file mode 100644 index d1e066f87d6..00000000000 Binary files a/images/terrain/void-sw.png and /dev/null differ diff --git a/images/terrain/void.png b/images/terrain/void.png index fc81d35db08..be34c5da77e 100644 Binary files a/images/terrain/void.png and b/images/terrain/void.png differ diff --git a/src/display.cpp b/src/display.cpp index eb34bc69ef3..f3d8c07de28 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -41,6 +41,7 @@ std::map display::debugHighlights_; namespace { + const int MinZoom = 36; const int DefaultZoom = 72; const int MaxZoom = 200; @@ -290,7 +291,7 @@ double display::zoom(int amount) const int orig_zoom = zoom_; zoom_ += amount; - if(zoom_ > MaxZoom) { + if(zoom_ < MinZoom || zoom_ > MaxZoom) { zoom_ = orig_zoom; xpos_ = orig_xpos; ypos_ = orig_ypos;