mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-24 04:51:24 +00:00
a start on a #include audit for the header files and misc fixups for win32
This commit is contained in:
Bill Currie
parent
e245db2d12
commit
ee47b4d568
22 changed files with 55 additions and 58 deletions
|
|
@ -30,9 +30,6 @@
|
|||
#ifndef _BSPFILE_H
|
||||
#define _BSPFILE_H
|
||||
|
||||
#include "qtypes.h"
|
||||
|
||||
|
||||
// upper design bounds
|
||||
|
||||
#define MAX_MAP_HULLS 4
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
client.h
|
||||
cl_cam.h
|
||||
|
||||
Client definitions
|
||||
Client camera definitions
|
||||
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
|
||||
|
|
@ -33,14 +33,9 @@
|
|||
// try to get them self-sufficient by including whatever other
|
||||
// headers they might need
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "qtypes.h"
|
||||
#include "protocol.h"
|
||||
|
||||
//
|
||||
// cl_cam.c
|
||||
//
|
||||
#define CAM_NONE 0
|
||||
#define CAM_TRACK 1
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#ifndef _CL_PRED_H
|
||||
#define _CL_PRED_H
|
||||
|
||||
#include "qtypes.h"
|
||||
#include "client.h"
|
||||
|
||||
void CL_Prediction_Init_Cvars (void);
|
||||
|
|
|
|||
|
|
@ -29,21 +29,13 @@
|
|||
#ifndef _CLIENT_H
|
||||
#define _CLIENT_H
|
||||
|
||||
// since all headers are circular-protected with #ifdef _xxx_H
|
||||
// try to get them self-sufficient by including whatever other
|
||||
// headers they might need
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "info.h"
|
||||
#include "mathlib.h"
|
||||
#include "protocol.h"
|
||||
#include "net.h"
|
||||
#include "model.h"
|
||||
#include "sound.h"
|
||||
#include "render.h"
|
||||
#include "cvar.h"
|
||||
#include "protocol.h"
|
||||
#include "quakefs.h"
|
||||
#include "render.h"
|
||||
#include "vid.h"
|
||||
#include "zone.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
@ -321,36 +313,36 @@ typedef struct
|
|||
//
|
||||
// cvars
|
||||
//
|
||||
extern cvar_t *cl_warncmd;
|
||||
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_warncmd;
|
||||
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_shownet;
|
||||
extern cvar_t *cl_sbar;
|
||||
extern cvar_t *cl_sbar_separator;
|
||||
extern cvar_t *cl_hudswap;
|
||||
extern struct cvar_s *cl_shownet;
|
||||
extern struct cvar_s *cl_sbar;
|
||||
extern struct cvar_s *cl_sbar_separator;
|
||||
extern struct cvar_s *cl_hudswap;
|
||||
|
||||
extern cvar_t *cl_pitchdriftspeed;
|
||||
extern cvar_t *lookspring;
|
||||
extern cvar_t *lookstrafe;
|
||||
extern cvar_t *sensitivity;
|
||||
extern cvar_t *cl_freelook;
|
||||
extern struct cvar_s *cl_pitchdriftspeed;
|
||||
extern struct cvar_s *lookspring;
|
||||
extern struct cvar_s *lookstrafe;
|
||||
extern struct cvar_s *sensitivity;
|
||||
extern struct cvar_s *cl_freelook;
|
||||
|
||||
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 cvar_t *name;
|
||||
extern struct cvar_s *name;
|
||||
|
||||
|
||||
#define MAX_STATIC_ENTITIES 128 // torches, etc
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include "cvar.h"
|
||||
#include "gcc_attr.h"
|
||||
#include "qtypes.h"
|
||||
|
||||
/* The host system specifies the base of the directory tree, the
|
||||
command line parms passed to the program, and the amount of memory
|
||||
|
|
@ -53,8 +53,8 @@ typedef struct
|
|||
/* Host */
|
||||
extern quakeparms_t host_parms;
|
||||
|
||||
extern cvar_t *sys_nostdout;
|
||||
extern cvar_t *developer;
|
||||
extern struct cvar_s *sys_nostdout;
|
||||
extern struct cvar_s *developer;
|
||||
|
||||
extern qboolean host_initialized; /* True if into command execution. */
|
||||
//extern double host_frametime;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#include "cvar.h"
|
||||
#include "qtypes.h"
|
||||
|
||||
void GetEvent( void );
|
||||
|
|
@ -48,7 +47,7 @@ extern Window x_win;
|
|||
extern qboolean doShm;
|
||||
extern int x_shmeventtype;
|
||||
extern qboolean oktodraw;
|
||||
extern cvar_t *vid_fullscreen;
|
||||
extern struct cvar_s *vid_fullscreen;
|
||||
|
||||
qboolean x11_add_event (int event, void (*event_handler)(XEvent *));
|
||||
qboolean x11_del_event (int event, void (*event_handler)(XEvent *));
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "mathlib.h"
|
||||
#include "model.h"
|
||||
#include "cvar.h"
|
||||
|
||||
#define WARP_WIDTH 320
|
||||
#define WARP_HEIGHT 200
|
||||
|
|
@ -120,7 +119,7 @@ typedef struct
|
|||
int color;
|
||||
} zpointdesc_t;
|
||||
|
||||
extern cvar_t *r_drawflat;
|
||||
extern struct cvar_s *r_drawflat;
|
||||
extern int d_spanpixcount;
|
||||
extern int r_framecount; // sequence # of current frame since Quake
|
||||
// started
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
#ifndef _FRACTALNOISE_H
|
||||
#define _FRACTALNOISE_H
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
void fractalnoise(unsigned char *noise, int size);
|
||||
|
||||
#endif // _FRACTALNOISE_H
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
#endif
|
||||
|
||||
#include <GL/gl.h>
|
||||
//#include <GL/glu.h>
|
||||
|
||||
#include "model.h"
|
||||
#include "render.h"
|
||||
|
|
|
|||
|
|
@ -29,6 +29,14 @@
|
|||
#ifndef _INFO_H
|
||||
#define _INFO_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#define MAX_INFO_STRING 512
|
||||
#define MAX_SERVERINFO_STRING 512
|
||||
#define MAX_LOCALINFO_STRING 32768
|
||||
|
|
|
|||
|
|
@ -41,9 +41,7 @@
|
|||
#ifdef HAVE_WINSOCK_H
|
||||
#include <winsock.h>
|
||||
#endif
|
||||
#ifdef HAVE_SETJMP_H
|
||||
#include <setjmp.h>
|
||||
#endif
|
||||
|
||||
#include "bothdefs.h"
|
||||
#include "buildnum.h"
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "host.h"
|
||||
#include "sys.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
#include "screen.h"
|
||||
#include "sbar.h"
|
||||
#include "skin.h"
|
||||
#include "sound.h"
|
||||
#include "teamplay.h"
|
||||
#include "va.h"
|
||||
#include "view.h"
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include "cvar.h"
|
||||
#include "host.h"
|
||||
#include "qargs.h"
|
||||
#include "sys.h"
|
||||
|
|
|
|||
|
|
@ -45,8 +45,10 @@
|
|||
#include "client.h"
|
||||
#include "console.h"
|
||||
#include "host.h"
|
||||
#include "model.h"
|
||||
#include "msg.h"
|
||||
#include "r_dynamic.h"
|
||||
#include "sound.h"
|
||||
|
||||
#define MAX_BEAMS 8
|
||||
#define MAX_BEAM_ENTS 20
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
#include "qargs.h"
|
||||
#include "r_dynamic.h"
|
||||
#include "skin.h"
|
||||
#include "sound.h"
|
||||
#include "sys.h"
|
||||
#include "view.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
#include "va.h"
|
||||
#include "vid.h"
|
||||
#include "view.h"
|
||||
#include "winquake.h"
|
||||
|
||||
void (*vid_menudrawfn) (void);
|
||||
void (*vid_menukeyfn) (int key);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include "d_ifacea.h"
|
||||
#include "r_local.h"
|
||||
#include "sound.h"
|
||||
|
||||
#if 0
|
||||
// FIXME
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
#include "cmd.h"
|
||||
#include "r_local.h"
|
||||
#include "screen.h"
|
||||
#include "sound.h"
|
||||
#include "sys.h"
|
||||
#include "view.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
#include "cmd.h"
|
||||
#include "console.h"
|
||||
#include "host.h"
|
||||
#include "model.h"
|
||||
#include "qargs.h"
|
||||
#include "sys.h"
|
||||
#include "sound.h"
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
#include "cmd.h"
|
||||
#include "client.h"
|
||||
#include "locs.h"
|
||||
#include "model.h"
|
||||
#include "quakefs.h"
|
||||
#include "sys.h"
|
||||
#include "teamplay.h"
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
#include "commdef.h"
|
||||
#include "console.h"
|
||||
#include "crc.h"
|
||||
#include "mathlib.h"
|
||||
#include "server.h"
|
||||
#include "world.h"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue