Update to OpenTTD 1.9.0-beta2

--HG-- branch : openttd
2019-02-13 15:17:23 +03:00
parent 42ec3bd611
commit 2bda8d4f34
1362 changed files with 22145 additions and 10644 deletions
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -1,4 +1,4 @@
-/* $Id: viewport_gui.cpp 27743 2017-02-05 17:54:46Z frosch $ */
+/* $Id$ */

 /*
 * This file is part of OpenTTD.
@@ -138,7 +138,7 @@ public:

 	virtual void OnMouseWheel(int wheel)
 	{
-		if (_settings_client.gui.scrollwheel_scrolling == 0) {
+		if (_settings_client.gui.scrollwheel_scrolling != 2) {
 			ZoomInOrOutToCursorWindow(wheel < 0, this);
 		}
 	}