qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 20:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

no header includes cvar.h now

Browse source
This commit is contained in:
Bill Currie 2001-05-31 03:41:35 +00:00
parent a488af9bf5
commit 6bf58ab1af
91 changed files with 339 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/QF/input.h
View file

@ -29,8 +29,6 @@
#ifndef __QF_input_h_
#define __QF_input_h_
#include <QF/cvar.h>
struct {
vec3_t angles;
vec3_t position;
@ -57,11 +55,11 @@ void IN_ModeChanged (void);
void IN_HandlePause (qboolean paused);
extern cvar_t *_windowed_mouse;
extern cvar_t *m_filter;
extern cvar_t *in_freelook;
extern cvar_t *sensitivity;
extern cvar_t *lookstrafe;
extern struct cvar_s *_windowed_mouse;
extern struct cvar_s *m_filter;
extern struct cvar_s *in_freelook;
extern struct cvar_s *sensitivity;
extern struct cvar_s *lookstrafe;
extern qboolean in_mouse_avail;
extern float in_mouse_x, in_mouse_y;

2
include/QF/plugin.h
View file

@ -75,7 +75,7 @@ typedef plugin_t * (*P_PluginInfo) (void);
/*
Plugin system variables
*/
extern cvar_t *fs_pluginpath;
extern struct cvar_s *fs_pluginpath;
/*
Function prototypes

1
include/QF/render.h
View file

@ -29,7 +29,6 @@
#ifndef __render_h
#define __render_h
#include "QF/cvar.h"
#include "QF/mathlib.h"
#include "QF/model.h"
#include "QF/qdefs.h" // FIXME

9
include/QF/screen.h
View file

@ -31,7 +31,6 @@
#define __screen_h
#include "QF/qtypes.h"
#include "QF/cvar.h"
void SCR_Init_Cvars (void);
void SCR_Init (void);
@ -72,10 +71,10 @@ extern int clearnotify; // set to 0 whenever notify text is drawn
extern qboolean scr_disabled_for_loading;
extern qboolean scr_skipupdate;
extern cvar_t *scr_viewsize;
extern cvar_t *scr_fov;
extern cvar_t *scr_viewsize;
extern cvar_t *scr_consize;
extern struct cvar_s *scr_viewsize;
extern struct cvar_s *scr_fov;
extern struct cvar_s *scr_viewsize;
extern struct cvar_s *scr_consize;
// only the refresh window will be updated unless these variables are flagged
extern int scr_copytop;

19
include/QF/sound.h
View file

@ -31,7 +31,6 @@
#define _SOUND_H
#include "QF/mathlib.h"
#include "QF/cvar.h"
#include "QF/zone.h"
#define AMBIENT_WATER 0
@ -177,16 +176,16 @@ extern volatile dma_t *shm;
extern volatile dma_t sn;
extern vec_t sound_nominal_clip_dist;
extern cvar_t *loadas8bit;
extern cvar_t *bgmvolume;
extern cvar_t *volume;
extern struct cvar_s *loadas8bit;
extern struct cvar_s *bgmvolume;
extern struct cvar_s *volume;
extern cvar_t *snd_device;
extern cvar_t *snd_rate;
extern cvar_t *snd_bits;
extern cvar_t *snd_stereo;
extern cvar_t *snd_interp;
extern cvar_t *snd_stereo_phase_separation;
extern struct cvar_s *snd_device;
extern struct cvar_s *snd_rate;
extern struct cvar_s *snd_bits;
extern struct cvar_s *snd_stereo;
extern struct cvar_s *snd_interp;
extern struct cvar_s *snd_stereo_phase_separation;
extern qboolean snd_initialized;

6
include/QF/teamplay.h
View file

@ -29,10 +29,8 @@
#ifndef __teamplay_h
#define __teamplay_h
#include "QF/cvar.h"
extern cvar_t *cl_parsesay;
extern cvar_t *cl_nofake;
extern struct cvar_s *cl_parsesay;
extern struct cvar_s *cl_nofake;
void Team_Init_Cvars (void);
void Team_BestWeaponImpulse (void);

7
include/QF/vfs.h
View file

@ -33,15 +33,14 @@
#include "QF/qtypes.h"
#include "QF/vfile.h"
#include "QF/cvar.h"
//============================================================================
#define MAX_OSPATH 128 // max length of a filesystem pathname
extern cvar_t *fs_userpath;
extern cvar_t *fs_sharepath;
extern cvar_t *fs_skinbase;
extern struct cvar_s *fs_userpath;
extern struct cvar_s *fs_sharepath;
extern struct cvar_s *fs_skinbase;
extern int com_filesize;
struct cache_user_s;

93
include/glquake.h
View file

@ -39,7 +39,6 @@
#include <GL/gl.h>
#include "QF/cvar.h"
#include "QF/model.h"
#include "QF/qfgl_ext.h"
#include "QF/wad.h"
@ -88,56 +87,56 @@ extern int netgraphtexture; // netgraph texture
extern int skytexturenum; // index in cl.loadmodel, not gl texture object
extern cvar_t *r_novis;
extern cvar_t *r_particles;
extern cvar_t *r_norefresh;
extern cvar_t *r_drawviewmodel;
extern cvar_t *r_shadows;
extern cvar_t *r_wateralpha;
extern cvar_t *r_waterripple;
extern cvar_t *r_dynamic;
extern cvar_t *r_netgraph;
extern cvar_t *r_lightmap;
extern cvar_t *r_mirroralpha;
extern struct cvar_s *r_novis;
extern struct cvar_s *r_particles;
extern struct cvar_s *r_norefresh;
extern struct cvar_s *r_drawviewmodel;
extern struct cvar_s *r_shadows;
extern struct cvar_s *r_wateralpha;
extern struct cvar_s *r_waterripple;
extern struct cvar_s *r_dynamic;
extern struct cvar_s *r_netgraph;
extern struct cvar_s *r_lightmap;
extern struct cvar_s *r_mirroralpha;
extern cvar_t *gl_affinemodels;
extern cvar_t *gl_clear;
extern cvar_t *gl_cull;
extern cvar_t *gl_poly;
extern cvar_t *gl_texsort;
extern cvar_t *gl_smoothmodels;
extern cvar_t *gl_affinemodels;
extern cvar_t *gl_polyblend;
extern cvar_t *gl_fb_bmodels;
extern cvar_t *gl_fb_models;
extern cvar_t *gl_dlight_lightmap;
extern cvar_t *gl_dlight_polyblend;
extern cvar_t *gl_dlight_smooth;
extern cvar_t *gl_keeptjunctions;
extern cvar_t *gl_reporttjunctions;
extern cvar_t *gl_flashblend;
extern cvar_t *gl_multitexture;
extern cvar_t *gl_nocolors;
extern cvar_t *gl_doubleeyes;
extern struct cvar_s *gl_affinemodels;
extern struct cvar_s *gl_clear;
extern struct cvar_s *gl_cull;
extern struct cvar_s *gl_poly;
extern struct cvar_s *gl_texsort;
extern struct cvar_s *gl_smoothmodels;
extern struct cvar_s *gl_affinemodels;
extern struct cvar_s *gl_polyblend;
extern struct cvar_s *gl_fb_bmodels;
extern struct cvar_s *gl_fb_models;
extern struct cvar_s *gl_dlight_lightmap;
extern struct cvar_s *gl_dlight_polyblend;
extern struct cvar_s *gl_dlight_smooth;
extern struct cvar_s *gl_keeptjunctions;
extern struct cvar_s *gl_reporttjunctions;
extern struct cvar_s *gl_flashblend;
extern struct cvar_s *gl_multitexture;
extern struct cvar_s *gl_nocolors;
extern struct cvar_s *gl_doubleeyes;
extern cvar_t *gl_ztrick;
extern cvar_t *gl_finish;
extern cvar_t *gl_clear;
extern cvar_t *gl_subdivide_size;
extern cvar_t *gl_particles;
extern cvar_t *gl_fires;
extern cvar_t *gl_fb_models;
extern cvar_t *gl_fb_bmodels;
extern cvar_t *gl_poly;
extern cvar_t *gl_polyblend;
extern struct cvar_s *gl_ztrick;
extern struct cvar_s *gl_finish;
extern struct cvar_s *gl_clear;
extern struct cvar_s *gl_subdivide_size;
extern struct cvar_s *gl_particles;
extern struct cvar_s *gl_fires;
extern struct cvar_s *gl_fb_models;
extern struct cvar_s *gl_fb_bmodels;
extern struct cvar_s *gl_poly;
extern struct cvar_s *gl_polyblend;
extern cvar_t *gl_max_size;
extern cvar_t *gl_playermip;
extern struct cvar_s *gl_max_size;
extern struct cvar_s *gl_playermip;
extern cvar_t *r_skyname;
extern cvar_t *gl_skymultipass;
extern cvar_t *gl_sky_clip;
extern cvar_t *gl_sky_divide;
extern struct cvar_s *r_skyname;
extern struct cvar_s *gl_skymultipass;
extern struct cvar_s *gl_sky_clip;
extern struct cvar_s *gl_sky_divide;
extern int mirrortexturenum; // quake texturenum, not gltexturenum
extern qboolean mirror;

150
include/r_cvar.h
View file

@ -1,79 +1,79 @@
extern cvar_t *cl_crossx;
extern cvar_t *cl_crossy;
extern cvar_t *cl_verstring;
extern cvar_t *crosshair;
extern cvar_t *crosshaircolor;
extern struct cvar_s *cl_crossx;
extern struct cvar_s *cl_crossy;
extern struct cvar_s *cl_verstring;
extern struct cvar_s *crosshair;
extern struct cvar_s *crosshaircolor;
extern cvar_t *d_mipcap;
extern cvar_t *d_mipscale;
extern cvar_t *d_subdiv16;
extern struct cvar_s *d_mipcap;
extern struct cvar_s *d_mipscale;
extern struct cvar_s *d_subdiv16;
extern cvar_t *gl_affinemodels;
extern cvar_t *gl_clear;
extern cvar_t *gl_conalpha;
extern cvar_t *gl_conspin;
extern cvar_t *gl_constretch;
extern cvar_t *gl_dlight_lightmap;
extern cvar_t *gl_dlight_polyblend;
extern cvar_t *gl_dlight_smooth;
extern cvar_t *gl_fb_bmodels;
extern cvar_t *gl_fb_models;
extern cvar_t *gl_fires;
extern cvar_t *gl_keeptjunctions;
extern cvar_t *gl_lerp_anim;
extern cvar_t *gl_lightmap_components;
extern cvar_t *gl_max_size;
extern cvar_t *gl_nocolors;
extern cvar_t *gl_picmip;
extern cvar_t *gl_playermip;
extern cvar_t *gl_reporttjunctions;
extern cvar_t *gl_sky_clip;
extern cvar_t *gl_skymultipass;
extern cvar_t *gl_texsort;
extern cvar_t *gl_triplebuffer;
extern struct cvar_s *gl_affinemodels;
extern struct cvar_s *gl_clear;
extern struct cvar_s *gl_conalpha;
extern struct cvar_s *gl_conspin;
extern struct cvar_s *gl_constretch;
extern struct cvar_s *gl_dlight_lightmap;
extern struct cvar_s *gl_dlight_polyblend;
extern struct cvar_s *gl_dlight_smooth;
extern struct cvar_s *gl_fb_bmodels;
extern struct cvar_s *gl_fb_models;
extern struct cvar_s *gl_fires;
extern struct cvar_s *gl_keeptjunctions;
extern struct cvar_s *gl_lerp_anim;
extern struct cvar_s *gl_lightmap_components;
extern struct cvar_s *gl_max_size;
extern struct cvar_s *gl_nocolors;
extern struct cvar_s *gl_picmip;
extern struct cvar_s *gl_playermip;
extern struct cvar_s *gl_reporttjunctions;
extern struct cvar_s *gl_sky_clip;
extern struct cvar_s *gl_skymultipass;
extern struct cvar_s *gl_texsort;
extern struct cvar_s *gl_triplebuffer;
extern cvar_t *r_aliasstats;
extern cvar_t *r_aliastransadj;
extern cvar_t *r_aliastransbase;
extern cvar_t *r_ambient;
extern cvar_t *r_clearcolor;
extern cvar_t *r_drawentities;
extern cvar_t *r_drawflat;
extern cvar_t *r_draworder;
extern cvar_t *r_drawviewmodel;
extern cvar_t *r_dspeeds;
extern cvar_t *r_dynamic;
extern cvar_t *r_fullbright;
extern cvar_t *r_graphheight;
extern cvar_t *r_lightmap;
extern cvar_t *r_maxedges;
extern cvar_t *r_maxsurfs;
extern cvar_t *r_mirroralpha;
extern cvar_t *r_netgraph;
extern cvar_t *r_netgraph_alpha;
extern cvar_t *r_netgraph_box;
extern cvar_t *r_norefresh;
extern cvar_t *r_novis;
extern cvar_t *r_numedges;
extern cvar_t *r_numsurfs;
extern cvar_t *r_particles;
extern cvar_t *r_reportedgeout;
extern cvar_t *r_reportsurfout;
extern cvar_t *r_shadows;
extern cvar_t *r_skyname;
extern cvar_t *r_speeds;
extern cvar_t *r_timegraph;
extern cvar_t *r_wateralpha;
extern cvar_t *r_waterripple;
extern cvar_t *r_waterwarp;
extern cvar_t *r_zgraph;
extern struct cvar_s *r_aliasstats;
extern struct cvar_s *r_aliastransadj;
extern struct cvar_s *r_aliastransbase;
extern struct cvar_s *r_ambient;
extern struct cvar_s *r_clearcolor;
extern struct cvar_s *r_drawentities;
extern struct cvar_s *r_drawflat;
extern struct cvar_s *r_draworder;
extern struct cvar_s *r_drawviewmodel;
extern struct cvar_s *r_dspeeds;
extern struct cvar_s *r_dynamic;
extern struct cvar_s *r_fullbright;
extern struct cvar_s *r_graphheight;
extern struct cvar_s *r_lightmap;
extern struct cvar_s *r_maxedges;
extern struct cvar_s *r_maxsurfs;
extern struct cvar_s *r_mirroralpha;
extern struct cvar_s *r_netgraph;
extern struct cvar_s *r_netgraph_alpha;
extern struct cvar_s *r_netgraph_box;
extern struct cvar_s *r_norefresh;
extern struct cvar_s *r_novis;
extern struct cvar_s *r_numedges;
extern struct cvar_s *r_numsurfs;
extern struct cvar_s *r_particles;
extern struct cvar_s *r_reportedgeout;
extern struct cvar_s *r_reportsurfout;
extern struct cvar_s *r_shadows;
extern struct cvar_s *r_skyname;
extern struct cvar_s *r_speeds;
extern struct cvar_s *r_timegraph;
extern struct cvar_s *r_wateralpha;
extern struct cvar_s *r_waterripple;
extern struct cvar_s *r_waterwarp;
extern struct cvar_s *r_zgraph;
extern cvar_t *scr_centertime;
extern cvar_t *scr_consize;
extern cvar_t *scr_conspeed;
extern cvar_t *scr_fov;
extern cvar_t *scr_printspeed;
extern cvar_t *scr_showpause;
extern cvar_t *scr_showram;
extern cvar_t *scr_showturtle;
extern cvar_t *scr_viewsize;
extern struct cvar_s *scr_centertime;
extern struct cvar_s *scr_consize;
extern struct cvar_s *scr_conspeed;
extern struct cvar_s *scr_fov;
extern struct cvar_s *scr_printspeed;
extern struct cvar_s *scr_showpause;
extern struct cvar_s *scr_showram;
extern struct cvar_s *scr_showturtle;
extern struct cvar_s *scr_viewsize;

1
include/r_local.h
View file

@ -30,7 +30,6 @@
#define _R_LOCAL_H
#include "QF/mathlib.h"
#include "QF/cvar.h"
#include "QF/vid.h"
#include "QF/model.h"
#include "r_shared.h"

1
include/view.h
View file

@ -31,7 +31,6 @@
#define __view_h_
#include "QF/mathlib.h"
#include "QF/cvar.h"
#define INFO_CSHIFT_BONUS (1 << 0)
#define INFO_CSHIFT_CONTENTS (1 << 1)

2
libs/audio/snd.c
View file

@ -28,7 +28,7 @@
$Id$
*/
#include "QF/qtypes.h"
#include "QF/cvar.h"
#include "QF/sound.h"
#include "QF/plugin.h"
#include "QF/console.h"

2
libs/audio/snd_common.c
View file

@ -28,7 +28,7 @@
$Id$
*/
#include "QF/qtypes.h"
#include "QF/cvar.h"
#include "QF/sound.h"
channel_t channels[MAX_CHANNELS];

2
libs/audio/targets/snd_alsa_0_9.c
View file

@ -35,7 +35,7 @@
#include <sys/asoundlib.h>
#include "QF/qtypes.h"
#include "QF/cvar.h"
#include "QF/sound.h"
#include "QF/qargs.h"
#include "QF/console.h"

1
libs/audio/targets/snd_disk.c
View file

@ -40,6 +40,7 @@
#include <sys/types.h>
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/sound.h"
#include "QF/qargs.h"
#include "QF/plugin.h"

1
libs/audio/targets/snd_dma.c
View file

@ -43,6 +43,7 @@
#endif
#include "QF/cmd.h"
#include "QF/cvar.h"
#include "QF/console.h"
#include "QF/model.h"
#include "QF/qargs.h"

1
libs/audio/targets/snd_mem.c
View file

@ -37,6 +37,7 @@
#endif
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/qendian.h"
#include "QF/sound.h"
#include "QF/sys.h"

1
libs/audio/targets/snd_mix.c
View file

@ -38,6 +38,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/sound.h"
#ifdef _WIN32

2
libs/audio/targets/snd_null.c
View file

@ -29,7 +29,7 @@
$Id$
*/
#include "QF/qtypes.h"
#include "QF/cvar.h"
#include "QF/sound.h"
#include "QF/plugin.h"

1
libs/audio/targets/snd_oss.c
View file

@ -57,6 +57,7 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/qargs.h"
#include "QF/sound.h"
#include "QF/plugin.h"

1
libs/util/plugin.c
View file

@ -53,6 +53,7 @@
# endif
#endif
#include "QF/cvar.h"
#include <QF/plugin.h>
#include <QF/console.h>

1
libs/video/renderer/gl/gl_draw.c
View file

@ -40,6 +40,7 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/render.h"
#include "QF/screen.h"

1
libs/video/renderer/gl/gl_dyn_fires.c
View file

@ -40,6 +40,7 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/render.h"
#include "glquake.h"

1
libs/video/renderer/gl/gl_dyn_part.c
View file

@ -41,6 +41,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/qargs.h"
#include "QF/render.h"
#include "QF/sys.h"

1
libs/video/renderer/gl/gl_rlight.c
View file

@ -39,6 +39,7 @@
#include <math.h>
#include <stdio.h>
#include "QF/cvar.h"
#include "QF/render.h"
#include "glquake.h"

1
libs/video/renderer/gl/gl_rmain.c
View file

@ -42,6 +42,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/locs.h"
#include "QF/mathlib.h"
#include "QF/qargs.h"

1
libs/video/renderer/gl/gl_rsurf.c
View file

@ -41,6 +41,7 @@
#include <stdio.h>
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/render.h"
#include "QF/sys.h"

1
libs/video/renderer/gl/gl_screen.c
View file

@ -41,6 +41,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/keys.h"
#include "QF/pcx.h"

1
libs/video/renderer/gl/gl_skin.c
View file

@ -32,6 +32,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/render.h"
#include "QF/skin.h"
#include "QF/texture.h"

1
libs/video/renderer/gl/gl_sky.c
View file

@ -38,6 +38,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/render.h"
#include "QF/tga.h"
#include "QF/vfs.h"

1
libs/video/renderer/gl/gl_textures.c
View file

@ -43,6 +43,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/crc.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/sys.h"
#include "QF/vid.h"

4
libs/video/renderer/sw/d_edge.c
View file

@ -30,9 +30,11 @@
# include "config.h"
#endif
#include "QF/cvar.h"
#include "QF/render.h"
#include "d_local.h"
#include "r_local.h"
#include "QF/render.h"
static int miplevel;

1
libs/video/renderer/sw/draw.c
View file

@ -37,6 +37,7 @@
#endif
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/sound.h"
#include "QF/sys.h"

1
libs/video/renderer/sw/screen.c
View file

@ -41,6 +41,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/keys.h"
#include "QF/pcx.h"

1
libs/video/renderer/sw/sw_graph.c
View file

@ -30,6 +30,7 @@
# include "config.h"
#endif
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/render.h"

1
libs/video/renderer/sw/sw_rmain.c
View file

@ -40,6 +40,7 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/locs.h"
#include "QF/mathlib.h"
#include "QF/render.h"

1
libs/video/renderer/sw/sw_rmisc.c
View file

@ -33,6 +33,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/render.h"
#include "QF/sys.h"

1
libs/video/renderer/sw/sw_rpart.c
View file

@ -34,6 +34,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/qargs.h"
#include "QF/vfs.h"
#include "QF/render.h"

2
libs/video/targets/vid_common_gl.c
View file

@ -46,11 +46,13 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/input.h"
#include "QF/qargs.h"
#include "QF/qfgl_ext.h"
#include "QF/vfs.h"
#include "QF/vid.h"
#include "glquake.h"
#include "sbar.h"

6
libs/video/targets/vid_sgl.c
View file

@ -43,14 +43,16 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "glquake.h"
#include "QF/cvar.h"
#include "QF/qargs.h"
#include "QF/qendian.h"
#include "sbar.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/vid.h"
#include "glquake.h"
#include "sbar.h"
#ifdef WIN32
/* FIXME: this is evil hack to get full DirectSound support with SDL */
# include <windows.h>

2
nq/include/chase.h
View file

@ -29,7 +29,7 @@
#ifndef __chase_h
#define __chase_h
extern cvar_t *chase_active;
extern struct cvar_s *chase_active;
void Chase_Init_Cvars (void);
void Chase_Reset (void);

45
nq/include/client.h
View file

@ -31,7 +31,6 @@
#include <stdio.h>
#include "QF/cvar.h"
#include "QF/info.h"
#include "QF/mathlib.h"
#include "QF/model.h"
@ -235,38 +234,38 @@ typedef struct
/*
cvars
*/
extern cvar_t *cl_name;
extern cvar_t *cl_color;
extern struct cvar_s *cl_name;
extern struct cvar_s *cl_color;
extern cvar_t *cl_upspeed;
extern cvar_t *cl_forwardspeed;
extern cvar_t *cl_backspeed;
extern cvar_t *cl_sidespeed;
extern struct cvar_s *cl_upspeed;
extern struct cvar_s *cl_forwardspeed;
extern struct cvar_s *cl_backspeed;
extern struct cvar_s *cl_sidespeed;
extern cvar_t *cl_movespeedkey;
extern struct cvar_s *cl_movespeedkey;
extern cvar_t *cl_yawspeed;
extern cvar_t *cl_pitchspeed;
extern struct cvar_s *cl_yawspeed;
extern struct cvar_s *cl_pitchspeed;
extern cvar_t *cl_anglespeedkey;
extern struct cvar_s *cl_anglespeedkey;
extern cvar_t *cl_autofire;
extern struct cvar_s *cl_autofire;
extern cvar_t *cl_shownet;
extern cvar_t *cl_nolerp;
extern struct cvar_s *cl_shownet;
extern struct cvar_s *cl_nolerp;
extern cvar_t *cl_sbar;
extern cvar_t *cl_hudswap;
extern struct cvar_s *cl_sbar;
extern struct cvar_s *cl_hudswap;
extern cvar_t *cl_pitchdriftspeed;
extern cvar_t *lookspring;
extern struct cvar_s *cl_pitchdriftspeed;
extern struct cvar_s *lookspring;
extern cvar_t *m_pitch;
extern cvar_t *m_yaw;
extern cvar_t *m_forward;
extern cvar_t *m_side;
extern struct cvar_s *m_pitch;
extern struct cvar_s *m_yaw;
extern struct cvar_s *m_forward;
extern struct cvar_s *m_side;
extern struct cvar_s *cl_name;
extern struct cvar_s *cl_name;
#define MAX_TEMP_ENTITIES 64 // lightning bolts, etc
#define MAX_STATIC_ENTITIES 128 // torches, etc

3
nq/include/game.h
View file

@ -32,7 +32,6 @@
#define __game_h
#include "QF/qtypes.h"
#include "QF/cvar.h"
#include "QF/qdefs.h"
#undef MAX_DATAGRAM
@ -165,7 +164,7 @@ extern int current_skill; // skill level for currently loaded level (in case
extern qboolean isDedicated;
extern qboolean abyss, rogue, hipnotic, standard_quake;
extern cvar_t *registered;
extern struct cvar_s *registered;
void Game_Init (void);

9
nq/include/host.h
View file

@ -31,7 +31,6 @@
#include "QF/gcc_attr.h"
#include "QF/qtypes.h"
#include "QF/cvar.h"
extern qboolean noclip_anglehack;
@ -47,11 +46,11 @@ typedef struct
extern quakeparms_t host_parms;
extern cvar_t *sys_ticrate;
extern cvar_t *sys_nostdout;
extern cvar_t *developer;
extern struct cvar_s *sys_ticrate;
extern struct cvar_s *sys_nostdout;
extern struct cvar_s *developer;
extern cvar_t *pausable;
extern struct cvar_s *pausable;
extern qboolean host_initialized; // true if into command execution
extern double host_frametime;

19
nq/include/net.h
View file

@ -31,7 +31,6 @@
#include "QF/gcc_attr.h"
#include "QF/sizebuf.h"
#include "QF/cvar.h"
struct qsockaddr
{
@ -349,14 +348,14 @@ extern qboolean slistLocal;
void NET_Slist_f (void);
extern cvar_t *config_com_port;
extern cvar_t *config_com_irq;
extern cvar_t *config_com_baud;
extern cvar_t *config_com_modem;
extern cvar_t *config_modem_dialtype;
extern cvar_t *config_modem_clear;
extern cvar_t *config_modem_init;
extern cvar_t *config_modem_hangup;
extern cvar_t *hostname;
extern struct cvar_s *config_com_port;
extern struct cvar_s *config_com_irq;
extern struct cvar_s *config_com_baud;
extern struct cvar_s *config_com_modem;
extern struct cvar_s *config_modem_dialtype;
extern struct cvar_s *config_modem_clear;
extern struct cvar_s *config_modem_init;
extern struct cvar_s *config_modem_hangup;
extern struct cvar_s *hostname;
#endif // __net_h

44
nq/include/server.h
View file

@ -32,15 +32,15 @@
#include <setjmp.h>
#include "QF/gcc_attr.h"
#include "net.h"
#include "QF/cvar.h"
#include "protocol.h"
#include "QF/model.h"
#include "sv_progs.h"
#include "QF/sizebuf.h"
#include "QF/info.h"
#include "QF/vfile.h"
#include "client.h"
#include "net.h"
#include "protocol.h"
#include "sv_progs.h"
extern progs_t sv_pr_state;
@ -220,26 +220,26 @@ typedef struct client_s
//============================================================================
extern cvar_t *teamplay;
extern cvar_t *skill;
extern cvar_t *deathmatch;
extern cvar_t *coop;
extern cvar_t *fraglimit;
extern cvar_t *timelimit;
extern struct cvar_s *teamplay;
extern struct cvar_s *skill;
extern struct cvar_s *deathmatch;
extern struct cvar_s *coop;
extern struct cvar_s *fraglimit;
extern struct cvar_s *timelimit;
extern cvar_t *sv_maxvelocity;
extern cvar_t *sv_gravity;
extern cvar_t *sv_nostep;
extern cvar_t *sv_friction;
extern cvar_t *sv_edgefriction;
extern cvar_t *sv_stopspeed;
extern cvar_t *sv_maxspeed;
extern cvar_t *sv_accelerate;
extern cvar_t *sv_idealpitchscale;
extern cvar_t *sv_aim;
extern cvar_t *sv_friction;
extern cvar_t *sv_stopspeed;
extern struct cvar_s *sv_maxvelocity;
extern struct cvar_s *sv_gravity;
extern struct cvar_s *sv_nostep;
extern struct cvar_s *sv_friction;
extern struct cvar_s *sv_edgefriction;
extern struct cvar_s *sv_stopspeed;
extern struct cvar_s *sv_maxspeed;
extern struct cvar_s *sv_accelerate;
extern struct cvar_s *sv_idealpitchscale;
extern struct cvar_s *sv_aim;
extern struct cvar_s *sv_friction;
extern struct cvar_s *sv_stopspeed;
extern server_static_t svs; // persistant server info
extern server_t sv; // local server

1
nq/source/cl_cam.c
View file

@ -30,6 +30,7 @@
# include "config.h"
#endif
#include "QF/cvar.h"
#include "QF/mathlib.h"
#include "client.h"
#include "world.h"

1
nq/source/cl_input.c
View file

@ -39,6 +39,7 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/input.h"
#include "QF/keys.h"
#include "QF/msg.h"

1
nq/source/cl_parse.c
View file

@ -39,6 +39,7 @@
#include "QF/cdaudio.h"
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/sys.h"
#include "QF/screen.h"

1
nq/source/cl_screen.c
View file

@ -39,6 +39,7 @@
#include <time.h>
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/pcx.h"
#include "QF/screen.h"

1
nq/source/console.c
View file

@ -41,6 +41,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/input.h"
#include "QF/keys.h"

1
nq/source/gl_view.c
View file

@ -39,6 +39,7 @@
#include <stdio.h>
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/info.h"
#include "client.h"

1
nq/source/host.c
View file

@ -34,6 +34,7 @@
#include "QF/compat.h"
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/gib.h"
#include "QF/input.h"

10
nq/source/host_cmd.c
View file

@ -30,12 +30,9 @@
# include "config.h"
#endif
#include "client.h"
#include "server.h"
#include "host.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "world.h"
#include "QF/cvar.h"
#include "QF/va.h"
#include "QF/screen.h"
#include "QF/msg.h"
@ -43,7 +40,12 @@
#include "QF/console.h"
#include "QF/keys.h"
#include "QF/sys.h"
#include "client.h"
#include "host.h"
#include "server.h"
#include "sv_progs.h"
#include "world.h"
int current_skill;

1
nq/source/host_skin.c
View file

@ -39,6 +39,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/screen.h"
#include "QF/skin.h"

1
nq/source/net_dgrm.c
View file

@ -38,6 +38,7 @@
#endif
#include "QF/cmd.h"
#include "QF/cvar.h"
#include "QF/sys.h"
#include "QF/keys.h"
#include "QF/qendian.h"

6
nq/source/net_loop.c
View file

@ -30,12 +30,14 @@
# include "config.h"
#endif
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/console.h"
#include "QF/sys.h"
#include "net.h"
#include "net_loop.h"
#include "client.h"
#include "QF/console.h"
#include "QF/sys.h"
#include "server.h"
qboolean localconnectpending = false;

1
nq/source/net_main.c
View file

@ -38,6 +38,7 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/qargs.h"
#include "QF/sizebuf.h"

4
nq/source/net_udp.c
View file

@ -76,12 +76,14 @@
#include <libc.h>
#endif
#include "net.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/qargs.h"
#include "QF/sys.h"
#include "QF/console.h"
#include "net.h"
#ifdef _WIN32
# undef EWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK

1
nq/source/pr_cmds.c
View file

@ -38,6 +38,7 @@
#include "QF/console.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/sys.h"
#include "QF/cmd.h"
#include "QF/va.h"

1
nq/source/r_view.c
View file

@ -33,6 +33,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/msg.h"
#include "QF/screen.h"

1
nq/source/sbar.c
View file

@ -33,6 +33,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/screen.h"
#include "QF/vid.h"

1
nq/source/skin.c
View file

@ -38,6 +38,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/hash.h"
#include "QF/pcx.h"
#include "QF/skin.h"

5
nq/source/sv_main.c
View file

@ -30,15 +30,16 @@
# include "config.h"
#endif
#include "server.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/sys.h"
#include "QF/cmd.h"
#include "host.h"
#include "world.h"
#include "server.h"
#include "sv_progs.h"
#include "world.h"
server_t sv;
server_static_t svs;

6
nq/source/sv_phys.c
View file

@ -30,12 +30,14 @@
# include "config.h"
#endif
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/sys.h"
#include "server.h"
#include "host.h"
#include "world.h"
#include "QF/console.h"
#include "sv_progs.h"
#include "QF/sys.h"
/*

3
nq/source/sv_progs.c
View file

@ -39,11 +39,12 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "host.h"
#include "server.h"
#include "sv_progs.h"
#include "world.h"
#include "progdefs.h"
progs_t sv_pr_state;

1
nq/source/sv_user.c
View file

@ -32,6 +32,7 @@
#endif
#include "server.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/console.h"
#include "world.h"

1
nq/source/sw_view.c
View file

@ -31,6 +31,7 @@
#endif
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/info.h"
#include "client.h"

3
qw/include/game.h
View file

@ -32,10 +32,9 @@
#define __game_h
#include "QF/qtypes.h"
#include "QF/cvar.h"
#include "QF/qdefs.h"
extern cvar_t *registered;
extern struct cvar_s *registered;
void Game_Init (void);
void Game_Init_Cvars (void);

3
qw/include/net.h
View file

@ -30,7 +30,6 @@
#define _NET_H
#include "QF/gcc_attr.h"
#include "QF/cvar.h"
#include "QF/qdefs.h"
#include "QF/sizebuf.h"
@ -51,7 +50,7 @@ extern netadr_t net_local_adr;
extern netadr_t net_from; // address of who sent the packet
extern struct msg_s *net_message;
extern cvar_t *hostname;
extern struct cvar_s *hostname;
extern int net_socket;

22
qw/include/server.h
View file

@ -31,16 +31,16 @@
#define _SERVER_H
#include "QF/gcc_attr.h"
#include "host.h"
#include "net.h"
#include "QF/cvar.h"
#include "protocol.h"
#include "QF/model.h"
#include "QF/progs.h"
#include "QF/sizebuf.h"
#include "QF/info.h"
#include "QF/vfile.h"
#include "host.h"
#include "net.h"
#include "protocol.h"
#define QW_SERVER
#define MAX_MASTERS 8 // max recipients for heartbeat packets
@ -369,16 +369,16 @@ typedef enum
//============================================================================
// FIXME: declare exported variables in their own relevant .h
extern cvar_t *sv_mintic, *sv_maxtic;
extern cvar_t *sv_maxspeed;
extern struct cvar_s *sv_mintic, *sv_maxtic;
extern struct cvar_s *sv_maxspeed;
extern netadr_t master_adr[MAX_MASTERS]; // address of the master server
extern cvar_t *spawn;
extern cvar_t *teamplay;
extern cvar_t *deathmatch;
extern cvar_t *fraglimit;
extern cvar_t *timelimit;
extern struct cvar_s *spawn;
extern struct cvar_s *teamplay;
extern struct cvar_s *deathmatch;
extern struct cvar_s *fraglimit;
extern struct cvar_s *timelimit;
extern server_static_t svs; // persistant server info
extern char *svs_info; // evil memory saving hack :)

6
qw/source/cl_cam.c
View file

@ -43,11 +43,13 @@
#include <math.h>
#include "cl_cam.h"
#include "client.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "cl_cam.h"
#include "client.h"
#include "pmove.h"
#include "sbar.h"

1
qw/source/cl_ents.c
View file

@ -38,6 +38,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/render.h"
#include "QF/skin.h"

16
qw/source/cl_input.c
View file

@ -37,20 +37,22 @@
#endif
#include "QF/checksum.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/msg.h"
#include "QF/teamplay.h"
#include "cl_cam.h"
#include "cl_demo.h"
#include "cl_input.h"
#include "cl_parse.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "host.h"
#include "QF/input.h"
#include "QF/keys.h"
#include "QF/msg.h"
#include "msg_ucmd.h"
#include "QF/teamplay.h"
#include "view.h"
cvar_t *cl_nodelta;

1
qw/source/cl_ngraph.c
View file

@ -31,6 +31,7 @@
#endif
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/render.h"

1
qw/source/cl_parse.c
View file

@ -46,6 +46,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/screen.h"
#include "QF/sound.h"

1
qw/source/cl_screen.c
View file

@ -39,6 +39,7 @@
#include <time.h>
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/pcx.h"
#include "QF/screen.h"

1
qw/source/cl_skin.c
View file

@ -39,6 +39,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/screen.h"
#include "QF/va.h"

12
qw/source/cl_slist.c
View file

@ -52,15 +52,17 @@
#endif
#include <stdlib.h>
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/vfile.h"
#include "bothdefs.h"
#include "cl_main.h"
#include "cl_slist.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/vfile.h"
server_entry_t *slist;
server_entry_t *all_slist;

1
qw/source/console.c
View file

@ -41,6 +41,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/input.h"
#include "QF/keys.h"

1
qw/source/gl_view.c
View file

@ -39,6 +39,7 @@
#include <stdio.h>
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/info.h"
#include "bothdefs.h"

1
qw/source/net_packetlog.c
View file

@ -40,6 +40,7 @@
#include <stdarg.h>
#include "QF/cmd.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/va.h"
#include "QF/vfs.h"

1
qw/source/sbar.c
View file

@ -40,6 +40,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/msg.h"
#include "QF/screen.h"

1
qw/source/skin.c
View file

@ -38,6 +38,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/hash.h"
#include "QF/pcx.h"
#include "QF/skin.h"

8
qw/source/sv_ccmds.c
View file

@ -38,18 +38,20 @@
#include <stdlib.h>
#include "bothdefs.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/qargs.h"
#include "QF/qendian.h"
#include "QF/vfs.h"
#include "server.h"
#include "sv_progs.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "bothdefs.h"
#include "server.h"
#include "sv_progs.h"
qboolean sv_allow_cheats;
int fp_messages = 4, fp_persecond = 4, fp_secondsdead = 10;

2
qw/source/sv_main.c
View file

@ -41,6 +41,7 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/model.h"
#include "QF/msg.h"
#include "QF/plugin.h"
@ -50,6 +51,7 @@
#include "QF/ver_check.h"
#include "QF/vfs.h"
#include "QF/zone.h"
#include "bothdefs.h"
#include "buildnum.h"
#include "game.h"

4
qw/source/sv_pr_cmds.c
View file

@ -35,12 +35,14 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "QF/va.h"
#include "server.h"
#include "sv_pr_cmds.h"
#include "sv_progs.h"
#include "world.h"
#include "QF/va.h"
#define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e))
#define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].int_var = PR_SetString((p), s))

2
qw/source/sv_progs.c
View file

@ -39,6 +39,8 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "server.h"
#include "progdefs.h"
#include "sv_progs.h"

8
qw/source/sv_send.c
View file

@ -37,15 +37,17 @@
#include <stdlib.h>
#include <time.h>
#include "bothdefs.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/msg.h"
#include "server.h"
#include "sv_progs.h"
#include "QF/sys.h"
#include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
#include "bothdefs.h"
#include "server.h"
#include "sv_progs.h"
#define CHAN_AUTO 0
#define CHAN_WEAPON 1
#define CHAN_VOICE 2

1
qw/source/sw_view.c
View file

@ -31,6 +31,7 @@
#endif
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/info.h"
#include "bothdefs.h"

1
qw/source/teamplay.c
View file

@ -41,6 +41,7 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/cmd.h"
#include "QF/cvar.h"
#include "QF/locs.h"
#include "QF/model.h"
#include "QF/sys.h"