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/network/network_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/network/network_gui.cpp')
-rw-r--r-- | src/network/network_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index ed6ef2178..f860d3a79 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1156,7 +1156,7 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow { case NSSW_COMPANIES_BTND: case NSSW_COMPANIES_BTNU: // Click on up/down button for number of companies case NSSW_SPECTATORS_BTND: case NSSW_SPECTATORS_BTNU: // Click on up/down button for number of spectators /* Don't allow too fast scrolling */ - if ((this->flags4 & WF_TIMEOUT_MASK) <= WF_TIMEOUT_TRIGGER) { + if ((this->flags & WF_TIMEOUT) && this->timeout_timer <= 1) { this->HandleButtonClick(widget); this->SetDirty(); switch (widget) { @@ -1822,7 +1822,7 @@ struct NetworkClientListPopupWindow : Window { } this->InitNested(desc, client_id); - CLRBITS(this->flags4, WF_WHITE_BORDER_MASK); + CLRBITS(this->flags, WF_WHITE_BORDER); } virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number) |