diff options
author | rubidium <rubidium@openttd.org> | 2007-12-02 14:48:26 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-12-02 14:48:26 +0000 |
commit | d9081ad3f5eacf3f788c0246ff9c72eeaea9fd90 (patch) | |
tree | 5801e1ae4c02c7813e3235182983acbe0c8c799b /src/window.cpp | |
parent | 527b72749d5160eceb6e5999c0f329701b14ee47 (diff) | |
download | openttd-d9081ad3f5eacf3f788c0246ff9c72eeaea9fd90.tar.xz |
(svn r11556) -Feature: allow setting a default password for new companies in network games.
Diffstat (limited to 'src/window.cpp')
-rw-r--r-- | src/window.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/window.cpp b/src/window.cpp index 6f03da0fd..33063fbeb 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1699,11 +1699,12 @@ void HandleKeypress(uint32 key) e.we.keypress.cont = true; /* check if we have a query string window open before allowing hotkeys */ - if (FindWindowById(WC_QUERY_STRING, 0) != NULL || - FindWindowById(WC_SEND_NETWORK_MSG, 0) != NULL || - FindWindowById(WC_GENERATE_LANDSCAPE, 0) != NULL || - FindWindowById(WC_CONSOLE, 0) != NULL || - FindWindowById(WC_SAVELOAD, 0) != NULL) { + if (FindWindowById(WC_QUERY_STRING, 0) != NULL || + FindWindowById(WC_SEND_NETWORK_MSG, 0) != NULL || + FindWindowById(WC_GENERATE_LANDSCAPE, 0) != NULL || + FindWindowById(WC_CONSOLE, 0) != NULL || + FindWindowById(WC_SAVELOAD, 0) != NULL || + FindWindowById(WC_COMPANY_PASSWORD_WINDOW, 0) != NULL) { query_open = true; } @@ -1717,7 +1718,8 @@ void HandleKeypress(uint32 key) w->window_class != WC_SEND_NETWORK_MSG && w->window_class != WC_GENERATE_LANDSCAPE && w->window_class != WC_CONSOLE && - w->window_class != WC_SAVELOAD) { + w->window_class != WC_SAVELOAD && + w->window_class != WC_COMPANY_PASSWORD_WINDOW) { continue; } w->wndproc(w, &e); |