From 9c26231221afd0e19d40720812986dd63ba2ab36 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 4 Aug 2007 21:32:52 +0000 Subject: fixed so connections errors are propagated out to the gui --- src/engine/network.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine/network.cpp b/src/engine/network.cpp index 838c5f5d..41d0367d 100644 --- a/src/engine/network.cpp +++ b/src/engine/network.cpp @@ -134,7 +134,6 @@ static void conn_reset(NETCONNECTION *conn) } conn->state = NETWORK_CONNSTATE_OFFLINE; - mem_zero(conn->error_string, sizeof(conn->error_string)); conn->last_send_time = 0; conn->last_recv_time = 0; conn->token = -1; @@ -165,6 +164,7 @@ static void conn_init(NETCONNECTION *conn, NETSOCKET socket) conn->socket = socket; conn->connected = 0; conn->disconnected = 0; + mem_zero(conn->error_string, sizeof(conn->error_string)); } static void conn_ack(NETCONNECTION *conn, int ack) @@ -425,6 +425,8 @@ static int conn_update(NETCONNECTION *conn) if(time_get()-conn->last_send_time > time_freq()/2) // send a new connect/accept every 500ms conn_send(conn, NETWORK_PACKETFLAG_CONNECT|NETWORK_PACKETFLAG_ACCEPT, 0, 0); } + + return 0; } @@ -699,7 +701,7 @@ int net_client_disconnect(NETCLIENT *c, const char *reason) { // TODO: do this more graceful dbg_msg("net_client", "disconnected. reason=\"%s\"", reason); - conn_disconnect(&c->conn, 0); + conn_disconnect(&c->conn, reason); return 0; } -- cgit 1.4.1