More header merges.

This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-05-09 17:57:57 +00:00
parent 85de55a05c
commit 7567098bc0
16 changed files with 100 additions and 117 deletions

View file

@ -38,13 +38,14 @@ typedef struct
} location_t;
location_t *locs_find(vec3_t target);
void locs_load(char *filename);
void locs_reset();
void locs_add(vec3_t location, char *name);
void map_to_loc (char *mapname, char *filename);
void locs_add (vec3_t location, char *name);
void locs_del (vec3_t loc);
void locs_edit (vec3_t loc, char *desc);
void locs_load(char *filename);
void locs_mark (vec3_t loc, char *desc);
int locs_nearest (vec3_t loc);
void locs_reset ();
void locs_save (char *filename, qboolean gz);
int locs_nearest (vec3_t loc);
void map_to_loc (char *mapname, char *filename);
#endif // __locs_h

View file

@ -1,11 +1,10 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
EXTRA_DIST = adivtab.h anorm_dots.h anorms.h block16.h block8.h bothdefs.h \
buildnum.h cl_cam.h cl_demo.h cl_ents.h cl_input.h cl_main.h \
cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h commdef.h \
d_iface.h d_ifacea.h d_local.h draw.h game.h gl_warp_sin.h hl.h \
host.h locs.h logos.h modelgen.h msg_ucmd.h net.h pcx.h pmove.h \
progdefs.h protocol.h r_dynamic.h r_local.h r_shared.h render.h \
server.h skin.h sv_pr_cmds.h sv_progs.h teamplay.h texture.h tga.h \
world.h
EXTRA_DIST = bothdefs.h buildnum.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \
cl_main.h cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h \
commdef.h d_iface.h d_ifacea.h d_local.h draw.h game.h \
gl_warp_sin.h host.h logos.h modelgen.h \
msg_ucmd.h net.h pmove.h progdefs.h protocol.h \
r_dynamic.h r_local.h r_shared.h render.h server.h skin.h \
sv_pr_cmds.h sv_progs.h texture.h world.h

View file

@ -42,6 +42,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/locs.h"
#include "QF/mathlib.h"
#include "QF/qargs.h"
#include "QF/sound.h"
@ -54,7 +55,6 @@
#include "cl_parse.h" //FIXME CL_NewTranslation
#include "commdef.h"
#include "glquake.h"
#include "locs.h"
#include "r_dynamic.h"
#include "r_local.h"
#include "skin.h"

View file

@ -42,17 +42,17 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/keys.h"
#include "QF/pcx.h"
#include "QF/sys.h"
#include "QF/tga.h"
#include "cl_parse.h"
#include "draw.h"
#include "glquake.h"
#include "host.h"
#include "pcx.h"
#include "r_local.h"
#include "sbar.h"
#include "skin.h"
#include "tga.h"
#include "view.h"
/*
@ -164,6 +164,7 @@ int scr_center_lines;
int scr_erase_lines;
int scr_erase_center;
/*
SCR_CenterPrint
@ -186,6 +187,7 @@ SCR_CenterPrint (char *str)
}
}
void
SCR_DrawCenterString (void)
{
@ -232,6 +234,7 @@ SCR_DrawCenterString (void)
} while (1);
}
void
SCR_CheckDrawCenterString (void)
{
@ -249,11 +252,10 @@ SCR_CheckDrawCenterString (void)
SCR_DrawCenterString ();
}
//=============================================================================
/*
CalcFov
*/
float
CalcFov (float fov_x, float width, float height)
{
@ -272,6 +274,7 @@ CalcFov (float fov_x, float width, float height)
return a;
}
/*
SCR_CalcRefdef
@ -378,11 +381,10 @@ SCR_SizeDown_f (void)
vid.recalc_refdef = 1;
}
//============================================================================
/*
SCR_Init
*/
void
SCR_Init_Cvars (void)
{
@ -403,6 +405,7 @@ SCR_Init_Cvars (void)
cl_crossy = Cvar_Get ("cl_crossy", "0", CVAR_ARCHIVE, NULL, "Sets the position of the crosshair on the Y-axis.");
}
void
SCR_Init (void)
{
@ -421,9 +424,7 @@ SCR_Init (void)
scr_initialized = true;
}
/*
SCR_DrawRam
*/
void
SCR_DrawRam (void)
{
@ -436,9 +437,7 @@ SCR_DrawRam (void)
Draw_Pic (scr_vrect.x + 32, scr_vrect.y, scr_ram);
}
/*
SCR_DrawTurtle
*/
void
SCR_DrawTurtle (void)
{
@ -459,9 +458,7 @@ SCR_DrawTurtle (void)
Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
}
/*
SCR_DrawNet
*/
void
SCR_DrawNet (void)
{
@ -474,6 +471,7 @@ SCR_DrawNet (void)
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
extern cvar_t *show_time;
extern cvar_t *show_fps;
@ -551,9 +549,7 @@ SCR_DrawTime (void)
Draw_String8 (x, y, st);
}
/*
DrawPause
*/
void
SCR_DrawPause (void)
{
@ -574,9 +570,6 @@ SCR_DrawPause (void)
//=============================================================================
/*
SCR_SetUpToDrawConsole
*/
void
SCR_SetUpToDrawConsole (void)
{
@ -609,9 +602,7 @@ SCR_SetUpToDrawConsole (void)
con_notifylines = 0;
}
/*
SCR_DrawConsole
*/
void
SCR_DrawConsole (void)
{
@ -631,9 +622,7 @@ SCR_DrawConsole (void)
SCREEN SHOTS
*/
/*
SCR_ScreenShot_f
*/
void
SCR_ScreenShot_f (void)
{
@ -655,6 +644,7 @@ SCR_ScreenShot_f (void)
Con_Printf ("Wrote %s\n", pcxname);
}
/*
Find closest color in the palette for named color
*/
@ -691,6 +681,7 @@ MipColor (int r, int g, int b)
return best;
}
// in gl_draw.c
extern byte *draw_chars; // 8*8 graphic characters
@ -720,6 +711,7 @@ SCR_DrawCharToSnap (int num, byte * dest, int width)
}
void
SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
{
@ -736,9 +728,6 @@ SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
}
/*
SCR_RSShot_f
*/
void
SCR_RSShot_f (void)
{
@ -847,6 +836,7 @@ SCR_RSShot_f (void)
//=============================================================================
char *scr_notifystring;
void
@ -881,8 +871,10 @@ SCR_DrawNotifyString (void)
} while (1);
}
//=============================================================================
void
SCR_TileClear (void)
{
@ -908,6 +900,7 @@ SCR_TileClear (void)
}
}
extern void R_ForceLightUpdate (void);
int oldviewsize = 0;
@ -915,6 +908,7 @@ unsigned char lighthalf_v[3];
qboolean lighthalf;
extern cvar_t *gl_lightmode;
extern cvar_t *brightness;
/*
SCR_UpdateScreen

View file

@ -39,11 +39,11 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/quakefs.h"
#include "QF/tga.h"
#include "QF/vid.h"
#include "glquake.h"
#include "render.h"
#include "tga.h"
#include "view.h"
extern double realtime;

View file

@ -38,14 +38,15 @@
#include <limits.h>
#include "client.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "locs.h"
#include "QF/locs.h"
#include "QF/quakefs.h"
#include "QF/qtypes.h"
#include "QF/sys.h"
#include "client.h"
#define LOCATION_BLOCK 128 // 128 locations per block.
location_t **locations = NULL;

View file

@ -36,20 +36,19 @@
# include <strings.h>
#endif
#include "cl_parse.h"
#include "QF/console.h"
#include "host.h"
#include "pcx.h"
#include "QF/pcx.h"
#include "QF/qendian.h"
#include "QF/qtypes.h"
#include "QF/quakefs.h"
#include "texture.h"
#include "QF/vid.h"
#include "QF/zone.h"
/*
LoadPCX
*/
#include "cl_parse.h"
#include "host.h"
#include "texture.h"
tex_t *
LoadPCX (QFile *f, int convert)
{
@ -149,9 +148,7 @@ LoadPCX (QFile *f, int convert)
return tex;
}
/*
WritePCXfile
*/
void
WritePCXfile (char *filename, byte * data, int width, int height,
int rowbytes, byte * palette, qboolean upload, qboolean flip)

View file

@ -38,20 +38,21 @@
#include <time.h>
#include "cl_parse.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/keys.h"
#include "QF/pcx.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "cl_parse.h"
#include "client.h"
#include "d_iface.h"
#include "draw.h"
#include "host.h"
#include "QF/keys.h"
#include "pcx.h"
#include "sbar.h"
#include "skin.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "view.h"
/*
@ -162,11 +163,12 @@ int scr_center_lines;
int scr_erase_lines;
int scr_erase_center;
/*
SCR_CenterPrint
Called for important messages that should stay in the center of the screen
for a few moments
Called for important messages that should stay in the center of the
screen for a few moments
*/
void
SCR_CenterPrint (char *str)
@ -230,6 +232,7 @@ SCR_DrawCenterString (void)
} while (1);
}
void
SCR_CheckDrawCenterString (void)
{
@ -247,11 +250,10 @@ SCR_CheckDrawCenterString (void)
SCR_DrawCenterString ();
}
//=============================================================================
/*
CalcFov
*/
float
CalcFov (float fov_x, float width, float height)
{
@ -270,6 +272,7 @@ CalcFov (float fov_x, float width, float height)
return a;
}
/*
SCR_CalcRefdef
@ -394,11 +397,10 @@ SCR_SizeDown_f (void)
vid.recalc_refdef = 1;
}
//============================================================================
/*
SCR_Init
*/
void
SCR_Init_Cvars (void)
{
@ -418,6 +420,7 @@ SCR_Init_Cvars (void)
cl_crossy = Cvar_Get ("cl_crossy", "0", CVAR_ARCHIVE, NULL, "Sets the position of the crosshair on the Y-axis");
}
void
SCR_Init (void)
{
@ -436,9 +439,7 @@ SCR_Init (void)
scr_initialized = true;
}
/*
SCR_DrawRam
*/
void
SCR_DrawRam (void)
{
@ -451,9 +452,7 @@ SCR_DrawRam (void)
Draw_Pic (scr_vrect.x + 32, scr_vrect.y, scr_ram);
}
/*
SCR_DrawTurtle
*/
void
SCR_DrawTurtle (void)
{
@ -474,9 +473,7 @@ SCR_DrawTurtle (void)
Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
}
/*
SCR_DrawNet
*/
void
SCR_DrawNet (void)
{
@ -489,6 +486,7 @@ SCR_DrawNet (void)
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
extern cvar_t *show_fps;
extern cvar_t *show_time;
@ -527,6 +525,7 @@ SCR_DrawFPS (void)
Draw_String8 (x, y, st);
}
/*
SCR_DrawTime
@ -564,9 +563,7 @@ SCR_DrawTime (void)
Draw_String8 (x, y, st);
}
/*
DrawPause
*/
void
SCR_DrawPause (void)
{
@ -587,9 +584,6 @@ SCR_DrawPause (void)
//=============================================================================
/*
SCR_SetUpToDrawConsole
*/
void
SCR_SetUpToDrawConsole (void)
{
@ -622,9 +616,7 @@ SCR_SetUpToDrawConsole (void)
con_notifylines = 0;
}
/*
SCR_DrawConsole
*/
void
SCR_DrawConsole (void)
{
@ -645,9 +637,6 @@ SCR_DrawConsole (void)
*/
/*
SCR_ScreenShot_f
*/
void
SCR_ScreenShot_f (void)
{
@ -672,8 +661,9 @@ SCR_ScreenShot_f (void)
Con_Printf ("Wrote %s\n", pcxname);
}
/*
Find closest color in the palette for named color
Find closest color in the palette for named color
*/
int
MipColor (int r, int g, int b)
@ -708,6 +698,7 @@ MipColor (int r, int g, int b)
return best;
}
// in draw.c
extern byte *draw_chars; // 8*8 graphic characters
@ -737,6 +728,7 @@ SCR_DrawCharToSnap (int num, byte * dest, int width)
}
void
SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
{
@ -753,9 +745,6 @@ SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
}
/*
SCR_RSShot_f
*/
void
SCR_RSShot_f (void)
{
@ -857,6 +846,7 @@ SCR_RSShot_f (void)
//=============================================================================
char *scr_notifystring;
void
@ -894,6 +884,7 @@ SCR_DrawNotifyString (void)
//=============================================================================
/*
SCR_UpdateScreen
@ -1046,9 +1037,7 @@ SCR_UpdateScreen (void)
}
}
/*
SCR_UpdateWholeScreen
*/
void
SCR_UpdateWholeScreen (void)
{

View file

@ -41,15 +41,15 @@
#include "QF/console.h"
#include "QF/hash.h"
#include "QF/msg.h"
#include "QF/pcx.h"
#include "QF/qendian.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "cl_parse.h"
#include "client.h"
#include "host.h"
#include "pcx.h"
#include "QF/screen.h"
#include "skin.h"
#include "texture.h"

View file

@ -38,18 +38,19 @@
#include <math.h>
#include "bothdefs.h"
#include "cl_cam.h"
#include "cl_main.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "locs.h"
#include "QF/locs.h"
#include "QF/mathlib.h"
#include "r_dynamic.h"
#include "r_local.h"
#include "QF/screen.h"
#include "QF/sound.h"
#include "QF/sys.h"
#include "bothdefs.h"
#include "cl_cam.h"
#include "cl_main.h"
#include "r_dynamic.h"
#include "r_local.h"
#include "view.h"

View file

@ -38,14 +38,15 @@
#include <errno.h>
#include "bothdefs.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "client.h"
#include "locs.h"
#include "QF/locs.h"
#include "QF/model.h"
#include "QF/sys.h"
#include "bothdefs.h"
#include "client.h"
#include "teamplay.h"
extern cvar_t *skin;

View file

@ -41,7 +41,8 @@
#include "QF/qendian.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
#include "tga.h"
#include "QF/tga.h"
static int
fgetLittleShort (QFile *f)
@ -54,6 +55,7 @@ fgetLittleShort (QFile *f)
return (short) (b1 + b2 * 256);
}
/*
static int
fgetLittleLong (QFile *f)
@ -70,10 +72,7 @@ fgetLittleLong (QFile *f)
*/
/*
LoadTGA
*/
byte *
byte *
LoadTGA (QFile *fin)
{
int columns, rows, numPixels;
@ -228,6 +227,7 @@ LoadTGA (QFile *fin)
return targa_rgba;
}
void
WriteTGAfile (const char *tganame, byte *data, int width, int height)
{