Mercurial > hg > openttd

changeset 18731:df35e3840acf draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23579) -Fix (r23525): Most up/down arrows stopped working.
author frosch <frosch@openttd.org>
date Sat, 17 Dec 2011 20:52:07 +0000
parents 74fa2bdee3b7
children 2878ba8fde47
files src/genworld_gui.cpp src/network/network_gui.cpp src/toolbar_gui.cpp
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -593,7 +593,7 @@
 			case WID_GL_START_DATE_DOWN:
 			case WID_GL_START_DATE_UP: // Year buttons
 				/* Don't allow too fast scrolling */
-				if ((this->flags & WF_TIMEOUT) && this->timeout_timer <= 1) {
+				if (!(this->flags & WF_TIMEOUT) || this->timeout_timer <= 1) {
 					this->HandleButtonClick(widget);
 
 					_settings_newgame.game_creation.starting_year = Clamp(_settings_newgame.game_creation.starting_year + widget - WID_GL_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
@@ -611,7 +611,7 @@
 			case WID_GL_SNOW_LEVEL_DOWN:
 			case WID_GL_SNOW_LEVEL_UP: // Snow line buttons
 				/* Don't allow too fast scrolling */
-				if ((this->flags & WF_TIMEOUT) && this->timeout_timer <= 1) {
+				if (!(this->flags & WF_TIMEOUT) || this->timeout_timer <= 1) {
 					this->HandleButtonClick(widget);
 
 					_settings_newgame.game_creation.snow_line_height = Clamp(_settings_newgame.game_creation.snow_line_height + widget - WID_GL_SNOW_LEVEL_TEXT, MIN_SNOWLINE_HEIGHT, MAX_SNOWLINE_HEIGHT);
@@ -984,7 +984,7 @@
 			case WID_CS_START_DATE_DOWN:
 			case WID_CS_START_DATE_UP: // Year buttons
 				/* Don't allow too fast scrolling */
-				if ((this->flags & WF_TIMEOUT) && this->timeout_timer <= 1) {
+				if (!(this->flags & WF_TIMEOUT) || this->timeout_timer <= 1) {
 					this->HandleButtonClick(widget);
 					this->SetDirty();
 
@@ -1002,7 +1002,7 @@
 			case WID_CS_FLAT_LAND_HEIGHT_DOWN:
 			case WID_CS_FLAT_LAND_HEIGHT_UP: // Height level buttons
 				/* Don't allow too fast scrolling */
-				if ((this->flags & WF_TIMEOUT) && this->timeout_timer <= 1) {
+				if (!(this->flags & WF_TIMEOUT) || this->timeout_timer <= 1) {
 					this->HandleButtonClick(widget);
 					this->SetDirty();
 
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1087,7 +1087,7 @@
 			case WID_NSS_COMPANIES_BTND:  case WID_NSS_COMPANIES_BTNU:  // Click on up/down button for number of companies
 			case WID_NSS_SPECTATORS_BTND: case WID_NSS_SPECTATORS_BTNU: // Click on up/down button for number of spectators
 				/* Don't allow too fast scrolling */
-				if ((this->flags & WF_TIMEOUT) && this->timeout_timer <= 1) {
+				if (!(this->flags & WF_TIMEOUT) || this->timeout_timer <= 1) {
 					this->HandleButtonClick(widget);
 					this->SetDirty();
 					switch (widget) {
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1039,7 +1039,7 @@
 static CallBackFunction ToolbarScenDateBackward(Window *w)
 {
 	/* don't allow too fast scrolling */
-	if ((w->flags & WF_TIMEOUT) && w->timeout_timer <= 1) {
+	if (!(w->flags & WF_TIMEOUT) || w->timeout_timer <= 1) {
 		w->HandleButtonClick(WID_TE_DATE_BACKWARD);
 		w->SetDirty();
 
@@ -1053,7 +1053,7 @@
 static CallBackFunction ToolbarScenDateForward(Window *w)
 {
 	/* don't allow too fast scrolling */
-	if ((w->flags & WF_TIMEOUT) && w->timeout_timer <= 1) {
+	if (!(w->flags & WF_TIMEOUT) || w->timeout_timer <= 1) {
 		w->HandleButtonClick(WID_TE_DATE_FORWARD);
 		w->SetDirty();