changeset 8087:4537e595b8b6 draft

(svn r11648) -Fix [FS#1560]: the company password was not set when one pressed the enter key.
author rubidium <rubidium@openttd.org>
date Sun, 16 Dec 2007 19:28:07 +0000
parents cf823beec060
children 5d7c61206209
files src/network/network_gui.cpp src/strings.cpp
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1938,7 +1938,11 @@
 		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;
--- 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"