about summary refs log tree commit diff
path: root/src/game/client
diff options
context:
space:
mode:
authorAlfred Eriksson <somerunce@gmail.com>2008-09-07 08:30:49 +0000
committerAlfred Eriksson <somerunce@gmail.com>2008-09-07 08:30:49 +0000
commitc3ff86330f6baa479a4d1ef79f1fd906b2a1a4a2 (patch)
tree182099f48322e9b740954daa19cc653cbc8019f6 /src/game/client
parent6dcea2c4ca59e0f1ac8450cc31550bdb35bc21b1 (diff)
downloadzcatch-c3ff86330f6baa479a4d1ef79f1fd906b2a1a4a2.tar.gz
zcatch-c3ff86330f6baa479a4d1ef79f1fd906b2a1a4a2.zip
merge from 0.4.3: lots of small stuff
Diffstat (limited to 'src/game/client')
-rw-r--r--src/game/client/components/menus_browser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp
index 6354ee22..5656bc7e 100644
--- a/src/game/client/components/menus_browser.cpp
+++ b/src/game/client/components/menus_browser.cpp
@@ -614,7 +614,7 @@ void MENUS::render_serverbrowser(RECT main_view)
 		ui_vmargin(&button, 2.0f, &button);
 		//ui_vmargin(&button, 2.0f, &button);
 		static int join_button = 0;
-		if(ui_do_button(&join_button, "Connect", 0, &button, ui_draw_menu_button, 0))
+		if(ui_do_button(&join_button, "Connect", 0, &button, ui_draw_menu_button, 0) || inp_key_down(KEY_ENTER))
 			client_connect(config.ui_server_address);
 					
 		ui_hsplit_b(&button_box, 5.0f, &button_box, &button);