summaryrefslogtreecommitdiff
path: root/src/main_gui.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2011-02-05 16:36:37 +0000
committerfrosch <frosch@openttd.org>2011-02-05 16:36:37 +0000
commit9e1695aa1e8079fc46d05af25a26917cfd678deb (patch)
treecebc4f0862fc6eced4a29f95b45a63d039522073 /src/main_gui.cpp
parentb992a939966dfe50e16688d1f30767a50b2d2bc5 (diff)
downloadopenttd-9e1695aa1e8079fc46d05af25a26917cfd678deb.tar.xz
(svn r21977) -Codechange: Always cal Window::OnMouseWheel(), independent of viewport scroll/zoom settings.
Diffstat (limited to 'src/main_gui.cpp')
-rw-r--r--src/main_gui.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index e12f417e8..ee135f686 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -421,7 +421,9 @@ struct MainWindow : Window
virtual void OnMouseWheel(int wheel)
{
- ZoomInOrOutToCursorWindow(wheel < 0, this);
+ if (_settings_client.gui.scrollwheel_scrolling == 0) {
+ ZoomInOrOutToCursorWindow(wheel < 0, this);
+ }
}
virtual void OnResize()