diff options
author | truebrain <truebrain@openttd.org> | 2011-12-15 19:54:23 +0000 |
---|---|---|
committer | truebrain <truebrain@openttd.org> | 2011-12-15 19:54:23 +0000 |
commit | df0afdf0dca6b3d4f621248ada2aed73d7481c66 (patch) | |
tree | fe5b1ab9e0e996c53e17d2eb82442b1829e89cbc /src/settings_gui.cpp | |
parent | 2ecbe895093f91bfdecbd8ab29d0641c2fd9a0f3 (diff) | |
download | openttd-df0afdf0dca6b3d4f621248ada2aed73d7481c66.tar.xz |
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
Diffstat (limited to 'src/settings_gui.cpp')
-rw-r--r-- | src/settings_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index e0fca2afc..47bb9a4d3 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1708,7 +1708,7 @@ struct GameSettingsWindow : Window { if (step == 0) step = 1; /* don't allow too fast scrolling */ - if ((this->flags4 & WF_TIMEOUT_MASK) > WF_TIMEOUT_TRIGGER) { + if ((this->flags & WF_TIMEOUT) && this->timeout_timer > 1) { _left_button_clicked = false; return; } @@ -1735,7 +1735,7 @@ struct GameSettingsWindow : Window { } this->clicked_entry = pe; this->clicked_entry->SetButtons((x >= 10) != (_current_text_dir == TD_RTL) ? SEF_RIGHT_DEPRESSED : SEF_LEFT_DEPRESSED); - this->flags4 |= WF_TIMEOUT_BEGIN; + this->SetTimeout(); _left_button_clicked = false; } break; @@ -2016,7 +2016,7 @@ struct CustomCurrencyWindow : Window { ShowQueryString(str, STR_CURRENCY_CHANGE_PARAMETER, len + 1, this, afilter, QSF_NONE); } - this->flags4 |= WF_TIMEOUT_BEGIN; + this->SetTimeout(); this->SetDirty(); } |