summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-12-16 19:28:07 +0000
committerrubidium <rubidium@openttd.org>2007-12-16 19:28:07 +0000
commit0730b9afc135eabce02144e2928b86cfa0b7f95e (patch)
tree8142f78e07165065be92bf9329eadd6223d959de
parent3bba097bb35e55da5cc3d7eee3c60d6d0821fa17 (diff)
downloadopenttd-0730b9afc135eabce02144e2928b86cfa0b7f95e.tar.xz
(svn r11648) -Fix [FS#1560]: the company password was not set when one pressed the enter key.
-rw-r--r--src/network/network_gui.cpp6
-rw-r--r--src/strings.cpp1
2 files changed, 5 insertions, 2 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 34b28ec9a..876f74df0 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1938,7 +1938,11 @@ static void NetworkCompanyPasswordWindowWndProc(Window *w, WindowEvent *e)
case WE_KEYPRESS:
switch (HandleEditBoxKey(w, &WP(w, chatquerystr_d), 4, e)) {
case 1: // Return
- /* FALLTHROUGH */
+ e->event = WE_CLICK;
+ e->we.click.widget = NCPWW_OK;
+ NetworkCompanyPasswordWindowWndProc(w, e);
+ break;
+
case 2: // Escape
DeleteWindow(w);
break;
diff --git a/src/strings.cpp b/src/strings.cpp
index d1a067b58..9a5f72e39 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -33,7 +33,6 @@
#include "vehicle.h"
#include "newgrf_engine.h"
#include "spritecache.h"
-#undef WITH_FREETYPE
#include "fontcache.h"
#include "gui.h"