From 25cb618e4dffea447e19df16dcac07d44a4a5297 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 May 2012 20:32:41 +0900
Subject: [PATCH] Clean up client_static_t a little more.

---
 nq/include/client.h | 20 ++++++--------------
 qw/include/client.h | 14 +++++---------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/nq/include/client.h b/nq/include/client.h
index 75d39da80..3590b0e12 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -96,17 +96,14 @@ typedef enum {
   the client_static_t structure is persistant through an arbitrary number
   of server connections
 */
-typedef struct
-{
+typedef struct {
+// connection information
 	cactive_t	state;
+	signon_t    signon;
 
-// file transfer from server
-	QFile	   *download;
-	char	   *downloadtempname;
-	char	   *downloadname;
-	int			downloadnumber;
-	dltype_t	downloadtype;
-	int			downloadpercent;
+// network stuff
+	struct qsocket_s	*netcon;
+	sizebuf_t	message;		// writing buffer to send to server
 
 // demo loop control
 	int			demonum;		// -1 = don't play demos
@@ -123,11 +120,6 @@ typedef struct
 	int			td_lastframe;		// to meter out one message a frame
 	int			td_startframe;		// host_framecount at start
 	float		td_starttime;		// realtime at second frame of timedemo
-
-// connection information
-	signon_t    signon;
-	struct qsocket_s	*netcon;
-	sizebuf_t	message;		// writing buffer to send to server
 } client_static_t;
 
 extern client_static_t	cls;
diff --git a/qw/include/client.h b/qw/include/client.h
index bdff6f31a..eb30e5f56 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -136,14 +136,14 @@ typedef struct
 
 // network stuff
 	netchan_t	netchan;
-
-// private userinfo for sending to masterless servers
-	struct info_s	*userinfo;
-
+	int			qport;
+	int			challenge;
+	float		latency;		// rolling average
 	struct dstring_s *servername;		// name of server from original connect
 	netadr_t	server_addr;			// address of server
 
-	int			qport;
+// private userinfo for sending to masterless servers
+	struct info_s	*userinfo;
 
 // file transfer from server
 	QFile		*download;
@@ -174,10 +174,6 @@ typedef struct
 	float		td_lastframe;		// to meter out one message a frame
 	int			td_startframe;		// host_framecount at start
 	float		td_starttime;		// realtime at second frame of timedemo
-
-	int			challenge;
-
-	float		latency;		// rolling average
 } client_static_t;
 
 extern client_static_t	cls;