model loading code merge. dragged in smoe merges and cleanups of d_iface.h,

r_local.h, r_shared.h, client.h and render.h at the same time (couldn't get
away from that:/) verly likely to be lots of breakage (eg, player and eye
models are NOT checksummed atm), but everything builds

nq/include/client.h

@@ -40,6 +40,7 @@
 
 #include "protocol.h"
 #include "net.h"
+#include "r_local.h"
 #include "render.h"
 #include "game.h"
 
@@ -71,18 +72,6 @@ typedef struct
 	byte	translations[VID_GRADES*256];
 } scoreboard_t;
 
-typedef struct
-{
-	int		destcolor[3];
-	int		percent;		// 0-256
-} cshift_t;
-
-#define	CSHIFT_CONTENTS	0
-#define	CSHIFT_DAMAGE	1
-#define	CSHIFT_BONUS	2
-#define	CSHIFT_POWERUP	3
-#define	NUM_CSHIFTS		4
-
 #define	NAME_LENGTH	64
 
 
@@ -92,22 +81,6 @@ typedef struct
 
 #define	SIGNONS		4			// signon messages to receive before connected
 
-#define	MAX_DLIGHTS		32
-typedef struct
-{
-	vec3_t	origin;
-	float	radius;
-	float	die;				// stop lighting after this time
-	float	decay;				// drop this each second
-	float	minlight;			// don't add when contributing less
-	int		key;
-	float	_color[3];
-	float	*color;
-#ifdef QUAKE2
-	qboolean	dark;			// subtracts light instead of adding
-#endif
-} dlight_t;
-
 
 #define	MAX_BEAMS	24
 typedef struct