More header merges.

nq/include/gl_warp_sin.h

@@ -1,60 +0,0 @@
-/*
-	gl_warp_sin.h
-
-	@description@
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-	$Id$
-*/
-
- 0, 0.19633, 0.392541, 0.588517, 0.784137, 0.979285, 1.17384, 1.3677,
- 1.56072, 1.75281, 1.94384, 2.1337, 2.32228, 2.50945, 2.69512, 2.87916,
- 3.06147, 3.24193, 3.42044, 3.59689, 3.77117, 3.94319, 4.11282, 4.27998,
- 4.44456, 4.60647, 4.76559, 4.92185, 5.07515, 5.22538, 5.37247, 5.51632,
- 5.65685, 5.79398, 5.92761, 6.05767, 6.18408, 6.30677, 6.42566, 6.54068,
- 6.65176, 6.75883, 6.86183, 6.9607, 7.05537, 7.14579, 7.23191, 7.31368,
- 7.39104, 7.46394, 7.53235, 7.59623, 7.65552, 7.71021, 7.76025, 7.80562,
- 7.84628, 7.88222, 7.91341, 7.93984, 7.96148, 7.97832, 7.99036, 7.99759,
- 8, 7.99759, 7.99036, 7.97832, 7.96148, 7.93984, 7.91341, 7.88222,
- 7.84628, 7.80562, 7.76025, 7.71021, 7.65552, 7.59623, 7.53235, 7.46394,
- 7.39104, 7.31368, 7.23191, 7.14579, 7.05537, 6.9607, 6.86183, 6.75883,
- 6.65176, 6.54068, 6.42566, 6.30677, 6.18408, 6.05767, 5.92761, 5.79398,
- 5.65685, 5.51632, 5.37247, 5.22538, 5.07515, 4.92185, 4.76559, 4.60647,
- 4.44456, 4.27998, 4.11282, 3.94319, 3.77117, 3.59689, 3.42044, 3.24193,
- 3.06147, 2.87916, 2.69512, 2.50945, 2.32228, 2.1337, 1.94384, 1.75281,
- 1.56072, 1.3677, 1.17384, 0.979285, 0.784137, 0.588517, 0.392541, 0.19633,
- 9.79717e-16, -0.19633, -0.392541, -0.588517, -0.784137, -0.979285, -1.17384, -1.3677,
- -1.56072, -1.75281, -1.94384, -2.1337, -2.32228, -2.50945, -2.69512, -2.87916,
- -3.06147, -3.24193, -3.42044, -3.59689, -3.77117, -3.94319, -4.11282, -4.27998,
- -4.44456, -4.60647, -4.76559, -4.92185, -5.07515, -5.22538, -5.37247, -5.51632,
- -5.65685, -5.79398, -5.92761, -6.05767, -6.18408, -6.30677, -6.42566, -6.54068,
- -6.65176, -6.75883, -6.86183, -6.9607, -7.05537, -7.14579, -7.23191, -7.31368,
- -7.39104, -7.46394, -7.53235, -7.59623, -7.65552, -7.71021, -7.76025, -7.80562,
- -7.84628, -7.88222, -7.91341, -7.93984, -7.96148, -7.97832, -7.99036, -7.99759,
- -8, -7.99759, -7.99036, -7.97832, -7.96148, -7.93984, -7.91341, -7.88222,
- -7.84628, -7.80562, -7.76025, -7.71021, -7.65552, -7.59623, -7.53235, -7.46394,
- -7.39104, -7.31368, -7.23191, -7.14579, -7.05537, -6.9607, -6.86183, -6.75883,
- -6.65176, -6.54068, -6.42566, -6.30677, -6.18408, -6.05767, -5.92761, -5.79398,
- -5.65685, -5.51632, -5.37247, -5.22538, -5.07515, -4.92185, -4.76559, -4.60647,
- -4.44456, -4.27998, -4.11282, -3.94319, -3.77117, -3.59689, -3.42044, -3.24193,
- -3.06147, -2.87916, -2.69512, -2.50945, -2.32228, -2.1337, -1.94384, -1.75281,
- -1.56072, -1.3677, -1.17384, -0.979285, -0.784137, -0.588517, -0.392541, -0.19633,

qw/include/skin.h

@@ -1,64 +0,0 @@
-/*
-	skin.h
-
-	Client skin definitions
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-	$Id$
-*/
-
-#ifndef _SKIN_H
-#define _SKIN_H
-
-#include "client.h"
-
-#define MAX_CACHED_SKINS 128
-
-#define RSSHOT_WIDTH 320
-#define RSSHOT_HEIGHT 200
-
-typedef struct skin_s
-{
-	char		name[16];
-	qboolean	failedload;		// the name isn't a valid skin
-	cache_user_t	cache;
-	int         fb_texture;
-} skin_t;
-
-extern byte player_8bit_texels[320 * 200];
-extern skin_t   skin_cache[MAX_CACHED_SKINS];
-struct tex_s;
-struct player_info_s;
-
-void	Skin_Find (struct player_info_s *sc);
-struct tex_s *Skin_Cache (skin_t *skin);
-void	Skin_Skins_f (void);
-void	Skin_AllSkins_f (void);
-void	Skin_NextDownload (void);
-void	Skin_Init (void);
-void	Skin_Init_Cvars (void);
-void	Skin_Init_Translation (void);
-void	Skin_Set_Translate (struct player_info_s *player);
-void	Skin_Do_Translation (player_info_t *player);
-void	Skin_Process (skin_t *skin, struct tex_s *);
-
-#endif

qw/include/texture.h

@@ -1,47 +0,0 @@
-/*
-	texture.h
-
-	texture definition
-
-	Copyright (C) 2000       Bill Currie
-
-	Author: Bill Currie
-	Date: 2000-01-18
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-	$Id$
-*/
-
-#ifndef __texture_h
-#define __texture_h
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-// could not use texture_t as that is used for models.
-typedef struct tex_s {
-	int width;
-	int height;
-	unsigned char *palette;					// 0 = 32 bit, otherise 8
-	unsigned char data[ZERO_LENGTH_ARRAY];
-} tex_t;
-
-#endif // __texture_h

qw/source/cl_main.c

@@ -58,9 +58,29 @@
 # undef model_t
 #endif
 
+#include "QF/cdaudio.h"
+#include "QF/cmd.h"
+#include "QF/compat.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/input.h"
+#include "QF/keys.h"
+#include "QF/model.h"
+#include "QF/msg.h"
+#include "QF/plugin.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/qargs.h"
+#include "QF/screen.h"
+#include "QF/skin.h"
+#include "QF/sound.h"
+#include "QF/sys.h"
+#include "QF/teamplay.h"
+#include "QF/vid.h"
+#include "QF/va.h"
+
 #include "bothdefs.h"
 #include "buildnum.h"
-#include "QF/cdaudio.h"
 #include "cl_cam.h"
 #include "cl_demo.h"
 #include "cl_ents.h"
@@ -71,32 +91,13 @@
 #include "cl_slist.h"
 #include "cl_tent.h"
 #include "client.h"
-#include "QF/cmd.h"
-#include "QF/compat.h"
-#include "QF/console.h"
-#include "QF/cvar.h"
 #include "draw.h"
 #include "game.h"
 #include "host.h"
-#include "QF/input.h"
-#include "QF/keys.h"
-#include "QF/model.h"
-#include "QF/msg.h"
 #include "net.h"
 #include "pmove.h"
-#include "QF/plugin.h"
-#include "QF/qendian.h"
-#include "QF/quakefs.h"
-#include "QF/qargs.h"
 #include "sbar.h"
-#include "QF/screen.h"
-#include "skin.h"
-#include "QF/sound.h"
-#include "QF/sys.h"
-#include "QF/teamplay.h"
-#include "QF/vid.h"
 #include "view.h"
-#include "QF/va.h"
 
 void        CL_RemoveQFInfoKeys ();
 

qw/source/cl_parse.c

@@ -43,27 +43,28 @@
 #include <unistd.h>
 #endif
 
-#include "bothdefs.h"
 #include "QF/cdaudio.h"
+#include "QF/cmd.h"
+#include "QF/compat.h"
+#include "QF/console.h"
+#include "QF/msg.h"
+#include "QF/skin.h"
+#include "QF/screen.h"
+#include "QF/sound.h"
+#include "QF/teamplay.h"
+#include "QF/va.h"
+
+#include "bothdefs.h"
 #include "cl_ents.h"
 #include "cl_input.h"
 #include "cl_main.h"
 #include "cl_parse.h"
 #include "cl_tent.h"
 #include "client.h"
-#include "QF/cmd.h"
-#include "QF/compat.h"
-#include "QF/console.h"
 #include "host.h"
-#include "QF/msg.h"
 #include "pmove.h"
 #include "protocol.h"
-#include "QF/screen.h"
 #include "sbar.h"
-#include "skin.h"
-#include "QF/sound.h"
-#include "QF/teamplay.h"
-#include "QF/va.h"
 #include "view.h"
 
 extern cvar_t *gl_dlight_polyblend;

qw/source/gl_model_alias.c

@@ -41,11 +41,12 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
-#include "glquake.h"
 #include "QF/model.h"
 #include "QF/qendian.h"
+#include "QF/skin.h"
+
+#include "glquake.h"
 #include "server.h"
-#include "skin.h"
 
 extern model_t *loadmodel;
 

qw/source/gl_rmain.c

@@ -45,6 +45,7 @@
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
+#include "QF/skin.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
@@ -57,7 +58,6 @@
 #include "glquake.h"
 #include "r_dynamic.h"
 #include "r_local.h"
-#include "skin.h"
 #include "view.h"
 
 entity_t	r_worldentity;

qw/source/gl_rmisc.c

@@ -41,6 +41,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
+#include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
 #include "QF/varrays.h"
@@ -48,7 +49,6 @@
 #include "glquake.h"
 #include "r_dynamic.h"
 #include "r_local.h"
-#include "skin.h"
 
 varray_t2f_c4f_v3f_t varray[MAX_VARRAY_VERTS];
 

qw/source/gl_screen.c

@@ -43,6 +43,7 @@
 #include "QF/console.h"
 #include "QF/keys.h"
 #include "QF/pcx.h"
+#include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/tga.h"
 
@@ -52,7 +53,6 @@
 #include "host.h"
 #include "r_local.h"
 #include "sbar.h"
-#include "skin.h"
 #include "view.h"
 
 /*

qw/source/gl_skin.c

@@ -30,13 +30,14 @@
 # include "config.h"
 #endif
 
+#include "QF/compat.h"
+#include "QF/skin.h"
+#include "QF/sys.h"
+#include "QF/texture.h"
+
 #include "glquake.h"
 #include "host.h"
 #include "protocol.h"
-#include "skin.h"
-#include "QF/compat.h"
-#include "QF/sys.h"
-#include "texture.h"
 
 byte        player_8bit_texels[320 * 200];
 static byte translate[256];

qw/source/pcx.c

@@ -41,12 +41,12 @@
 #include "QF/qendian.h"
 #include "QF/qtypes.h"
 #include "QF/quakefs.h"
+#include "QF/texture.h"
 #include "QF/vid.h"
 #include "QF/zone.h"
 
 #include "cl_parse.h"
 #include "host.h"
-#include "texture.h"
 
 
 tex_t *

qw/source/screen.c

@@ -43,6 +43,7 @@
 #include "QF/console.h"
 #include "QF/keys.h"
 #include "QF/pcx.h"
+#include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
 
@@ -52,7 +53,6 @@
 #include "draw.h"
 #include "host.h"
 #include "sbar.h"
-#include "skin.h"
 #include "view.h"
 
 /*

qw/source/skin.c

@@ -44,14 +44,14 @@
 #include "QF/pcx.h"
 #include "QF/qendian.h"
 #include "QF/screen.h"
+#include "QF/skin.h"
 #include "QF/sys.h"
+#include "QF/texture.h"
 #include "QF/va.h"
 
 #include "cl_parse.h"
 #include "client.h"
 #include "host.h"
-#include "skin.h"
-#include "texture.h"
 
 cvar_t     *baseskin;
 cvar_t     *noskins;

qw/source/sw_ralias.c

@@ -31,11 +31,12 @@
 #endif
 
 #include "QF/console.h"
+#include "QF/skin.h"
+#include "QF/sys.h"
+#include "QF/texture.h"
+
 #include "d_ifacea.h"
 #include "r_local.h"
-#include "skin.h"
-#include "QF/sys.h"
-#include "texture.h"
 
 #define LIGHT_MIN	5					// lowest light value we'll allow, to 
 										// avoid the

qw/source/sw_skin.c

@@ -29,20 +29,20 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
+#include "QF/compat.h"
+#include "QF/skin.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+
 #include "client.h"
 #include "host.h"
-#include "skin.h"
-#include "QF/compat.h"
-#include "QF/sys.h"
-#include "QF/vid.h"
 
 void
 Skin_Set_Translate (player_info_t *player)