mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-30 08:20:40 +00:00
move the api headers into include/QF and clean up (most of) the resulting mess.
target specific files that I don't build won't compile yet. just put QF/ infront of the offending headers. Also move ver_check into libqfutils
This commit is contained in:
parent
f6073d756f
commit
f78b973978
306 changed files with 897 additions and 874 deletions
|
@ -36,18 +36,18 @@
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "crc.h"
|
#include "QF/crc.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "hash.h"
|
#include "QF/hash.h"
|
||||||
#include "progs.h"
|
#include "QF/progs.h"
|
||||||
#include "qdefs.h"
|
#include "QF/qdefs.h"
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "sys.h" //XXX
|
#include "QF/sys.h" //XXX
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "va.h"
|
#include "QF/va.h"
|
||||||
|
|
||||||
cvar_t *pr_boundscheck;
|
cvar_t *pr_boundscheck;
|
||||||
|
|
||||||
|
|
|
@ -38,10 +38,10 @@
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "progs.h"
|
#include "QF/progs.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
|
|
||||||
char *pr_opnames[] = {
|
char *pr_opnames[] = {
|
||||||
"DONE",
|
"DONE",
|
||||||
|
|
|
@ -39,8 +39,8 @@
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "hash.h"
|
#include "QF/hash.h"
|
||||||
#include "progs.h"
|
#include "QF/progs.h"
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
strref_get_key (void *_sr, void *notused)
|
strref_get_key (void *_sr, void *notused)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
noinst_LIBRARIES = libqfutil.a
|
noinst_LIBRARIES = libqfutil.a
|
||||||
|
|
||||||
libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c zone.c
|
libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c zone.c
|
||||||
|
|
||||||
all-local: ../libqfutil.a
|
all-local: ../libqfutil.a
|
||||||
|
|
||||||
|
|
|
@ -41,9 +41,9 @@
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "checksum.h"
|
#include "QF/checksum.h"
|
||||||
#include "crc.h"
|
#include "QF/crc.h"
|
||||||
#include "mdfour.h"
|
#include "QF/mdfour.h"
|
||||||
|
|
||||||
static byte chktbl[1024 + 4] = {
|
static byte chktbl[1024 + 4] = {
|
||||||
0x78, 0xd2, 0x94, 0xe3, 0x41, 0xec, 0xd6, 0xd5, 0xcb, 0xfc, 0xdb, 0x8a,
|
0x78, 0xd2, 0x94, 0xe3, 0x41, 0xec, 0xd6, 0xd5, 0xcb, 0xfc, 0xdb, 0x8a,
|
||||||
|
|
|
@ -38,16 +38,16 @@
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "hash.h"
|
#include "QF/hash.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "sizebuf.h"
|
#include "QF/sizebuf.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
|
|
||||||
void Cmd_ForwardToServer (void);
|
void Cmd_ForwardToServer (void);
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "crc.h"
|
#include "QF/crc.h"
|
||||||
|
|
||||||
// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
|
// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
|
||||||
// and the initial and final xor values shown below... in other words, the
|
// and the initial and final xor values shown below... in other words, the
|
||||||
|
|
|
@ -42,11 +42,11 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "hash.h"
|
#include "QF/hash.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
|
|
||||||
cvar_t *cvar_vars;
|
cvar_t *cvar_vars;
|
||||||
char *cvar_null_string = "";
|
char *cvar_null_string = "";
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "compat.h"
|
#include "QF/compat.h"
|
||||||
#include "hash.h"
|
#include "QF/hash.h"
|
||||||
|
|
||||||
static unsigned long
|
static unsigned long
|
||||||
hash (const char *str)
|
hash (const char *str)
|
||||||
|
|
|
@ -39,8 +39,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "info.h"
|
#include "QF/info.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
INFO STRINGS
|
INFO STRINGS
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "link.h"
|
#include "QF/link.h"
|
||||||
|
|
||||||
// ClearLink is used for new headnodes
|
// ClearLink is used for new headnodes
|
||||||
void
|
void
|
||||||
|
|
|
@ -38,9 +38,9 @@
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "mathlib.h"
|
#include "QF/mathlib.h"
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
|
|
||||||
vec3_t vec3_origin = { 0, 0, 0 };
|
vec3_t vec3_origin = { 0, 0, 0 };
|
||||||
int nanmask = 255 << 23;
|
int nanmask = 255 << 23;
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mdfour.h"
|
#include "QF/mdfour.h"
|
||||||
#include "uint32.h"
|
#include "QF/uint32.h"
|
||||||
|
|
||||||
/* NOTE: This code makes no attempt to be fast!
|
/* NOTE: This code makes no attempt to be fast!
|
||||||
|
|
||||||
|
|
|
@ -36,9 +36,9 @@
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
MESSAGE IO FUNCTIONS
|
MESSAGE IO FUNCTIONS
|
||||||
|
|
|
@ -43,11 +43,11 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "crc.h"
|
#include "QF/crc.h"
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
|
|
||||||
static char **largv;
|
static char **largv;
|
||||||
static char *argvdummy = " ";
|
static char *argvdummy = " ";
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
BYTE ORDER FUNCTIONS
|
BYTE ORDER FUNCTIONS
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "qfplist.h"
|
#include "QF/qfplist.h"
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
static plitem_t *PL_ParsePropertyListItem (pldata_t *);
|
static plitem_t *PL_ParsePropertyListItem (pldata_t *);
|
||||||
static qboolean PL_SkipSpace (pldata_t *);
|
static qboolean PL_SkipSpace (pldata_t *);
|
||||||
|
|
|
@ -36,10 +36,10 @@
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "sizebuf.h"
|
#include "QF/sizebuf.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
|
|
||||||
void
|
void
|
||||||
SZ_Alloc (sizebuf_t *buf, int startsize)
|
SZ_Alloc (sizebuf_t *buf, int startsize)
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
va
|
va
|
||||||
|
|
|
@ -38,11 +38,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
|
|
||||||
#define DYNAMIC_SIZE 0x20000
|
#define DYNAMIC_SIZE 0x20000
|
||||||
#define ZONEID 0x1d4a11
|
#define ZONEID 0x1d4a11
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __bspfile_h
|
#ifndef __bspfile_h
|
||||||
#define __bspfile_h
|
#define __bspfile_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
// upper design bounds
|
// upper design bounds
|
||||||
|
|
||||||
|
|
|
@ -31,15 +31,15 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "info.h"
|
#include "QF/info.h"
|
||||||
#include "mathlib.h"
|
#include "QF/mathlib.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "model.h"
|
#include "model.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "render.h"
|
#include "render.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
|
||||||
typedef struct usercmd_s
|
typedef struct usercmd_s
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
|
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
void GetEvent( void );
|
void GetEvent( void );
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
VID_CheckDGA
|
VID_CheckDGA
|
||||||
|
|
|
@ -31,9 +31,9 @@
|
||||||
#ifndef __game_h
|
#ifndef __game_h
|
||||||
#define __game_h
|
#define __game_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "qdefs.h"
|
#include "QF/qdefs.h"
|
||||||
|
|
||||||
#undef MAX_DATAGRAM
|
#undef MAX_DATAGRAM
|
||||||
#define MAX_DATAGRAM 1024 // max length of unreliable message
|
#define MAX_DATAGRAM 1024 // max length of unreliable message
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "model.h"
|
#include "model.h"
|
||||||
#include "d_iface.h"
|
#include "d_iface.h"
|
||||||
|
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#ifndef __host_h
|
#ifndef __host_h
|
||||||
#define __host_h
|
#define __host_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
|
|
||||||
extern qboolean noclip_anglehack;
|
extern qboolean noclip_anglehack;
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,9 @@
|
||||||
#ifndef _INPUT_H
|
#ifndef _INPUT_H
|
||||||
#define _INPUT_H
|
#define _INPUT_H
|
||||||
|
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
#define freelook (in_mlook.state&1 || cl_freelook->int_val)
|
#define freelook (in_mlook.state&1 || cl_freelook->int_val)
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
|
|
||||||
extern cvar_t *joy_device; // Joystick device name
|
extern cvar_t *joy_device; // Joystick device name
|
||||||
|
|
|
@ -29,12 +29,12 @@
|
||||||
#ifndef _MODEL_H
|
#ifndef _MODEL_H
|
||||||
#define _MODEL_H
|
#define _MODEL_H
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "render.h"
|
#include "render.h"
|
||||||
#include "bspfile.h"
|
#include "bspfile.h"
|
||||||
#include "spritegn.h"
|
#include "spritegn.h"
|
||||||
#include "modelgen.h"
|
#include "modelgen.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,9 @@
|
||||||
#ifndef __net_h
|
#ifndef __net_h
|
||||||
#define __net_h
|
#define __net_h
|
||||||
|
|
||||||
#include "gcc_attr.h"
|
#include "QF/gcc_attr.h"
|
||||||
#include "sizebuf.h"
|
#include "QF/sizebuf.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
|
|
||||||
struct qsockaddr
|
struct qsockaddr
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __net_udp_h
|
#ifndef __net_udp_h
|
||||||
#define __net_udp_h
|
#define __net_udp_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
int UDP_Init (void);
|
int UDP_Init (void);
|
||||||
void UDP_Shutdown (void);
|
void UDP_Shutdown (void);
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __protocol_h
|
#ifndef __protocol_h
|
||||||
#define __protocol_h
|
#define __protocol_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
#define PROTOCOL_VERSION 15
|
#define PROTOCOL_VERSION 15
|
||||||
|
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#ifndef __render_h
|
#ifndef __render_h
|
||||||
#define __render_h
|
#define __render_h
|
||||||
|
|
||||||
#include "mathlib.h"
|
#include "QF/mathlib.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "vid.h"
|
#include "vid.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
|
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#ifndef __screen_h
|
#ifndef __screen_h
|
||||||
#define __screen_h
|
#define __screen_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
|
|
||||||
void SCR_Init (void);
|
void SCR_Init (void);
|
||||||
void SCR_InitCvars (void);
|
void SCR_InitCvars (void);
|
||||||
|
|
|
@ -31,15 +31,15 @@
|
||||||
|
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
|
|
||||||
#include "gcc_attr.h"
|
#include "QF/gcc_attr.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "model.h"
|
#include "model.h"
|
||||||
#include "sv_progs.h"
|
#include "sv_progs.h"
|
||||||
#include "sizebuf.h"
|
#include "QF/sizebuf.h"
|
||||||
#include "info.h"
|
#include "QF/info.h"
|
||||||
#include "quakeio.h"
|
#include "QF/quakeio.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
|
||||||
extern progs_t sv_pr_state;
|
extern progs_t sv_pr_state;
|
||||||
|
|
|
@ -30,9 +30,9 @@
|
||||||
#ifndef __sound_h
|
#ifndef __sound_h
|
||||||
#define __sound_h
|
#define __sound_h
|
||||||
|
|
||||||
#include "mathlib.h"
|
#include "QF/mathlib.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
|
|
||||||
#define DEFAULT_SOUND_PACKET_VOLUME 255
|
#define DEFAULT_SOUND_PACKET_VOLUME 255
|
||||||
#define DEFAULT_SOUND_PACKET_ATTENUATION 1.0
|
#define DEFAULT_SOUND_PACKET_ATTENUATION 1.0
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#ifndef __sv_progs_h
|
#ifndef __sv_progs_h
|
||||||
#define __sv_progs_h
|
#define __sv_progs_h
|
||||||
|
|
||||||
#include "progs.h"
|
#include "QF/progs.h"
|
||||||
#include "sv_pr_cmds.h"
|
#include "sv_pr_cmds.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __vid_h_
|
#ifndef __vid_h_
|
||||||
#define __vid_h_
|
#define __vid_h_
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
#define VID_CBITS 6
|
#define VID_CBITS 6
|
||||||
#define VID_GRADES (1 << VID_CBITS)
|
#define VID_GRADES (1 << VID_CBITS)
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#ifndef __view_h
|
#ifndef __view_h
|
||||||
#define __view_h
|
#define __view_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
|
|
||||||
extern byte gammatable[256]; // palette is sent through this
|
extern byte gammatable[256]; // palette is sent through this
|
||||||
extern byte ramps[3][256];
|
extern byte ramps[3][256];
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __wad_h
|
#ifndef __wad_h
|
||||||
#define __wad_h
|
#define __wad_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
|
|
||||||
//===============
|
//===============
|
||||||
// TYPES
|
// TYPES
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __world_h
|
#ifndef __world_h
|
||||||
#define __world_h
|
#define __world_h
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "sv_progs.h"
|
#include "sv_progs.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
|
|
@ -43,10 +43,10 @@
|
||||||
|
|
||||||
#include <linux/cdrom.h>
|
#include <linux/cdrom.h>
|
||||||
|
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "cdaudio.h"
|
#include "cdaudio.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mathlib.h"
|
#include "QF/mathlib.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "world.h"
|
#include "world.h"
|
||||||
|
|
||||||
|
|
|
@ -38,10 +38,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "sizebuf.h"
|
#include "QF/sizebuf.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Cmd_ForwardToServer
|
Cmd_ForwardToServer
|
||||||
|
|
|
@ -33,14 +33,14 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "va.h"
|
#include "QF/va.h"
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
|
|
||||||
void CL_FinishTimeDemo (void);
|
void CL_FinishTimeDemo (void);
|
||||||
|
|
||||||
|
|
|
@ -32,11 +32,11 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
===============================================================================
|
===============================================================================
|
||||||
|
|
|
@ -31,18 +31,18 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "chase.h"
|
#include "chase.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "va.h"
|
#include "QF/va.h"
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
|
|
||||||
// we need to declare some mouse variables here, because the menu system
|
// we need to declare some mouse variables here, because the menu system
|
||||||
// references them even when on a unix system.
|
// references them even when on a unix system.
|
||||||
|
|
|
@ -35,16 +35,16 @@
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "cdaudio.h"
|
#include "cdaudio.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "sbar.h"
|
#include "sbar.h"
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
|
|
||||||
char *svc_strings[] = {
|
char *svc_strings[] = {
|
||||||
"svc_bad",
|
"svc_bad",
|
||||||
|
|
|
@ -32,9 +32,9 @@
|
||||||
|
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "msg.h"
|
#include "QF/msg.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
|
|
||||||
int num_temp_entities;
|
int num_temp_entities;
|
||||||
entity_t cl_temp_entities[MAX_TEMP_ENTITIES];
|
entity_t cl_temp_entities[MAX_TEMP_ENTITIES];
|
||||||
|
|
|
@ -30,13 +30,13 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
|
|
||||||
cvar_t *registered;
|
cvar_t *registered;
|
||||||
cvar_t *cmdline;
|
cvar_t *cmdline;
|
||||||
|
|
|
@ -39,16 +39,16 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "keys.h"
|
#include "QF/keys.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "va.h"
|
#include "QF/va.h"
|
||||||
|
|
||||||
int con_ormask;
|
int con_ormask;
|
||||||
console_t con_main;
|
console_t con_main;
|
||||||
|
|
|
@ -58,13 +58,13 @@
|
||||||
|
|
||||||
#include "context_x11.h"
|
#include "context_x11.h"
|
||||||
#include "dga_check.h"
|
#include "dga_check.h"
|
||||||
#include "va.h"
|
#include "QF/va.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "qtypes.h"
|
#include "QF/qtypes.h"
|
||||||
#include "vid.h"
|
#include "vid.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
static void (*event_handlers[LASTEvent]) (XEvent *);
|
static void (*event_handlers[LASTEvent]) (XEvent *);
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "d_local.h"
|
#include "d_local.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
|
|
||||||
int d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
|
int d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
|
||||||
|
|
||||||
|
|
|
@ -34,9 +34,9 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "d_local.h"
|
#include "d_local.h"
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
#include "d_iface.h"
|
#include "d_iface.h"
|
||||||
|
|
|
@ -32,9 +32,9 @@
|
||||||
|
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
#include "vid.h"
|
#include "vid.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "d_iface.h"
|
#include "d_iface.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
|
||||||
qboolean standard_quake = false;
|
qboolean standard_quake = false;
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "zone.h"
|
#include "QF/zone.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
#include "gib.h"
|
#include "gib.h"
|
||||||
#include "gib_instructions.h"
|
#include "gib_instructions.h"
|
||||||
#include "gib_interpret.h"
|
#include "gib_interpret.h"
|
||||||
|
|
|
@ -36,25 +36,25 @@
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "compat.h"
|
#include "QF/compat.h"
|
||||||
#include "bspfile.h" // needed by: glquake.h
|
#include "bspfile.h" // needed by: glquake.h
|
||||||
#include "vid.h"
|
#include "vid.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "mathlib.h" // needed by: protocol.h, render.h,
|
#include "QF/mathlib.h" // needed by: protocol.h, render.h,
|
||||||
// client.h,
|
// client.h,
|
||||||
// modelgen.h, glmodel.h
|
// modelgen.h, glmodel.h
|
||||||
#include "wad.h"
|
#include "wad.h"
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
#include "cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "net.h" // needed by: client.h
|
#include "net.h" // needed by: client.h
|
||||||
#include "protocol.h" // needed by: client.h
|
#include "protocol.h" // needed by: client.h
|
||||||
#include "cmd.h"
|
#include "QF/cmd.h"
|
||||||
#include "sbar.h"
|
#include "sbar.h"
|
||||||
#include "render.h" // needed by: client.h, model.h,
|
#include "render.h" // needed by: client.h, model.h,
|
||||||
// glquake.h
|
// glquake.h
|
||||||
#include "client.h" // need cls in this file
|
#include "client.h" // need cls in this file
|
||||||
#include "model.h" // needed by: glquake.h
|
#include "model.h" // needed by: glquake.h
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "glquake.h"
|
#include "glquake.h"
|
||||||
#include "view.h"
|
#include "view.h"
|
||||||
|
|
||||||
|
|
|
@ -38,10 +38,10 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "mdfour.h"
|
#include "QF/mdfour.h"
|
||||||
#include "model.h"
|
#include "model.h"
|
||||||
#include "quakefs.h"
|
#include "QF/quakefs.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
ALIAS MODEL DISPLAY LIST GENERATION
|
ALIAS MODEL DISPLAY LIST GENERATION
|
||||||
|
|
|
@ -34,10 +34,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "checksum.h"
|
#include "QF/checksum.h"
|
||||||
#include "glquake.h"
|
#include "glquake.h"
|
||||||
|
|
||||||
extern char loadname[];
|
extern char loadname[];
|
||||||
|
|
|
@ -34,10 +34,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "checksum.h"
|
#include "QF/checksum.h"
|
||||||
#include "glquake.h"
|
#include "glquake.h"
|
||||||
|
|
||||||
extern char loadname[];
|
extern char loadname[];
|
||||||
|
|
|
@ -34,10 +34,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
#include "sys.h"
|
#include "QF/sys.h"
|
||||||
#include "console.h"
|
#include "QF/console.h"
|
||||||
#include "qendian.h"
|
#include "QF/qendian.h"
|
||||||
#include "checksum.h"
|
#include "QF/checksum.h"
|
||||||
#include "glquake.h"
|
#include "glquake.h"
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue