diff options
| -rw-r--r-- | src/engine/client/client.c | 4 | ||||
| -rw-r--r-- | src/game/client/menu2.cpp | 18 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/engine/client/client.c b/src/engine/client/client.c index 3246a7d6..092f6805 100644 --- a/src/engine/client/client.c +++ b/src/engine/client/client.c @@ -358,7 +358,7 @@ int *client_get_input(int tick) } /* ------ state handling ----- */ -static int state; +static int state = CLIENTSTATE_OFFLINE; int client_state() { return state; } static void client_set_state(int s) { @@ -836,7 +836,7 @@ static void client_run() net = netclient_open(bindaddr, 0); /* connect to the server if wanted */ - if(config.cl_connect) + if(config.cl_connect[0] != 0) client_connect(config.cl_connect); inp_mouse_mode_relative(); diff --git a/src/game/client/menu2.cpp b/src/game/client/menu2.cpp index 0527e15f..a6724d0e 100644 --- a/src/game/client/menu2.cpp +++ b/src/game/client/menu2.cpp @@ -555,24 +555,6 @@ int ui2_do_key_reader(void *id, const RECT *rect, int key) ui2_draw_keyselect_button(id, "???", 0, rect, 0); else ui2_draw_keyselect_button(id, inp_key_name(key), 0, rect, 0); - - //ui2_do_label(rect, - /* - int box_type; - if (ui_active_item() == id || ui_hot_item() == id) - box_type = GUI_BOX_SCREEN_INFO; - else - box_type = GUI_BOX_SCREEN_TEXTBOX; - draw_box(box_type, tileset_regular, x, y, w, h); - - const char *str = inp_key_name(key); - ui_do_label(x + 10, y, str, 36); - if (ui_active_item() == id) - { - float w = gfx_pretty_text_width(36.0f, str, -1); - ui_do_label(x + 10 + w, y, "_", 36); - }*/ - return new_key; } |