From 1f4fbfe833122074f2e0da38f656068d1d530bde Mon Sep 17 00:00:00 2001 From: sezero Date: Sun, 21 Feb 2010 00:01:08 +0000 Subject: [PATCH] bspfile.h, cdaudio.h, client.h, cmd.h, common.h, console.h, crc.h, cvar.h, d_ifacea.h, draw.h, gl_texmgr.h, glquake.h, image.h, input.h, keys.h, mathlib.h, menu.h, modelgen.h, net.h, net_dgrm.h, net_loop.h, net_sdlnet.h, net_udp.h, net_wins.h, platform.h, pr_comp.h, progdefs.h, progs.h, protocol.h, quakedef.h, render.h, resource.h, sbar.h, screen.h, server.h, sound.h, spritegn.h, sys.h, vid.h, view.h, wad.h, world.h, zone.h: added include guards to the headers. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@84 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/bspfile.h | 7 ++++++- Quake/cdaudio.h | 6 ++++++ Quake/client.h | 6 ++++++ Quake/cmd.h | 5 +++++ Quake/common.h | 6 ++++++ Quake/console.h | 5 +++++ Quake/crc.h | 7 +++++++ Quake/cvar.h | 6 ++++++ Quake/d_ifacea.h | 6 ++++++ Quake/draw.h | 5 +++++ Quake/gl_texmgr.h | 6 ++++++ Quake/glquake.h | 6 +++++- Quake/image.h | 7 +++++++ Quake/input.h | 7 +++++++ Quake/keys.h | 4 ++++ Quake/mathlib.h | 7 +++++++ Quake/menu.h | 5 +++++ Quake/modelgen.h | 6 ++++++ Quake/net.h | 7 +++++++ Quake/net_dgrm.h | 7 +++++++ Quake/net_loop.h | 7 +++++++ Quake/net_sdlnet.h | 6 ++++++ Quake/net_udp.h | 7 +++++++ Quake/net_wins.h | 7 +++++++ Quake/platform.h | 6 ++++++ Quake/pr_comp.h | 5 +++++ Quake/progdefs.h | 7 +++++++ Quake/progs.h | 5 +++++ Quake/protocol.h | 6 ++++++ Quake/quakedef.h | 6 ++++++ Quake/render.h | 5 +++++ Quake/resource.h | 6 ++++++ Quake/sbar.h | 6 ++++++ Quake/screen.h | 7 +++++++ Quake/server.h | 7 +++++++ Quake/sound.h | 7 ++++--- Quake/spritegn.h | 6 ++++++ Quake/sys.h | 5 +++++ Quake/vid.h | 6 ++++++ Quake/view.h | 6 ++++++ Quake/wad.h | 7 +++++++ Quake/world.h | 6 ++++++ Quake/zone.h | 6 +++++- 43 files changed, 257 insertions(+), 6 deletions(-) diff --git a/Quake/bspfile.h b/Quake/bspfile.h index 41eb7830..faff0a31 100644 --- a/Quake/bspfile.h +++ b/Quake/bspfile.h @@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __BSPFILE_H +#define __BSPFILE_H // upper design bounds @@ -323,4 +325,7 @@ void GetVectorForKey (entity_t *ent, char *key, vec3_t vec); epair_t *ParseEpair (void); -#endif +#endif /* QUAKE_GAME */ + +#endif /* __BSPFILE_H */ + diff --git a/Quake/cdaudio.h b/Quake/cdaudio.h index 5b55af5b..7f9264fc 100644 --- a/Quake/cdaudio.h +++ b/Quake/cdaudio.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __CDAUDIO_H +#define __CDAUDIO_H + int CDAudio_Init(void); void CDAudio_Play(byte track, qboolean looping); void CDAudio_Stop(void); @@ -26,3 +29,6 @@ void CDAudio_Pause(void); void CDAudio_Resume(void); void CDAudio_Shutdown(void); void CDAudio_Update(void); + +#endif /* __CDAUDIO_H */ + diff --git a/Quake/client.h b/Quake/client.h index 5bbd2544..1b00cf92 100644 --- a/Quake/client.h +++ b/Quake/client.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _CLIENT_H_ +#define _CLIENT_H_ + // client.h typedef struct @@ -369,3 +373,5 @@ void V_SetContentsColor (int contents); void CL_InitTEnts (void); void CL_SignonReply (void); +#endif /* _CLIENT_H_ */ + diff --git a/Quake/cmd.h b/Quake/cmd.h index a495c633..01e1cf03 100644 --- a/Quake/cmd.h +++ b/Quake/cmd.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_CMD_H +#define _QUAKE_CMD_H + // cmd.h -- Command buffer and command execution //=========================================================================== @@ -119,3 +122,5 @@ void Cmd_Print (char *text); // used by command functions to send output to either the graphics console or // passed as a print message to the client +#endif /* _QUAKE_CMD_H */ + diff --git a/Quake/common.h b/Quake/common.h index c84856db..a3aa5922 100644 --- a/Quake/common.h +++ b/Quake/common.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _Q_COMMON_H +#define _Q_COMMON_H + // comndef.h -- general definitions #if !defined BYTE_DEFINED @@ -189,3 +193,5 @@ extern qboolean standard_quake, rogue, hipnotic; extern qboolean fitzmode; // if true, runs in fitzquake mode and disabling custom quakespasm hacks. +#endif /* _Q_COMMON_H */ + diff --git a/Quake/console.h b/Quake/console.h index 7b99def8..f88b4c12 100644 --- a/Quake/console.h +++ b/Quake/console.h @@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __CONSOLE_H +#define __CONSOLE_H + // // console // @@ -56,3 +59,5 @@ char *Con_Quakebar (int len); void Con_TabComplete (void); void Con_LogCenterPrint (char *str); +#endif /* __CONSOLE_H */ + diff --git a/Quake/crc.h b/Quake/crc.h index 10cceddf..4556736e 100644 --- a/Quake/crc.h +++ b/Quake/crc.h @@ -18,9 +18,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_CRC_H +#define _QUAKE_CRC_H + /* crc.h */ void CRC_Init(unsigned short *crcvalue); void CRC_ProcessByte(unsigned short *crcvalue, byte data); unsigned short CRC_Value(unsigned short crcvalue); unsigned short CRC_Block (byte *start, int count); //johnfitz -- texture crc + +#endif /* _QUAKE_CRC_H */ + diff --git a/Quake/cvar.h b/Quake/cvar.h index 042b4566..2e1b6d68 100644 --- a/Quake/cvar.h +++ b/Quake/cvar.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __CVAR_H__ +#define __CVAR_H__ + // cvar.h /* @@ -101,3 +105,5 @@ void Cvar_Init (void); extern cvar_t *cvar_vars; +#endif /* __CVAR_H__ */ + diff --git a/Quake/d_ifacea.h b/Quake/d_ifacea.h index 407416ab..f0db16ec 100644 --- a/Quake/d_ifacea.h +++ b/Quake/d_ifacea.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __D_IFACE_H +#define __D_IFACE_H + // // d_ifacea.h // @@ -97,3 +101,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define atd_seamfixupX16 32 #define atd_size 36 +#endif /* __D_IFACE_H */ + diff --git a/Quake/draw.h b/Quake/draw.h index 02b65f37..86010c52 100644 --- a/Quake/draw.h +++ b/Quake/draw.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_DRAW_H +#define _QUAKE_DRAW_H + // draw.h -- these are the only functions outside the refresh allowed // to touch the vid buffer @@ -43,3 +46,5 @@ void GL_SetCanvas (canvastype newcanvas); //johnfitz void Draw_CheckConback (void); // QuakeSpasm customization +#endif /* _QUAKE_DRAW_H */ + diff --git a/Quake/gl_texmgr.h b/Quake/gl_texmgr.h index b0568a8b..5f087bb0 100644 --- a/Quake/gl_texmgr.h +++ b/Quake/gl_texmgr.h @@ -18,6 +18,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _GL_TEXMAN_H +#define _GL_TEXMAN_H + //gl_texmgr.h -- fitzquake's texture manager. manages opengl texture images #define TEXPREF_NONE 0x0000 @@ -99,3 +102,6 @@ extern qboolean gl_mtexable; void GL_DisableMultitexture (void); //selects texture unit 0 void GL_EnableMultitexture (void); //selects texture unit 1 void GL_Bind (gltexture_t *texture); + +#endif /* _GL_TEXMAN_H */ + diff --git a/Quake/glquake.h b/Quake/glquake.h index 83ee26ff..9fb9aee3 100644 --- a/Quake/glquake.h +++ b/Quake/glquake.h @@ -19,7 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// disable data conversion warnings + +#ifndef __GLQUAKE_H +#define __GLQUAKE_H void GL_BeginRendering (int *x, int *y, int *width, int *height); void GL_EndRendering (void); @@ -328,3 +330,5 @@ void Sky_LoadSkyBox (char *name); void TexMgr_RecalcWarpImageSize (void); +#endif /* __GLQUAKE_H */ + diff --git a/Quake/image.h b/Quake/image.h index 9d41f4aa..c87a1141 100644 --- a/Quake/image.h +++ b/Quake/image.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __GL_IMAGE_H +#define __GL_IMAGE_H + //image.h -- image reading / writing //be sure to free the hunk after using these loading functions @@ -26,3 +30,6 @@ byte *Image_LoadPCX (FILE *f, int *width, int *height); byte *Image_LoadImage (char *name, int *width, int *height); qboolean Image_WriteTGA (char *name, byte *data, int width, int height, int bpp, qboolean upsidedown); + +#endif /* __GL_IMAGE_H */ + diff --git a/Quake/input.h b/Quake/input.h index a834c94c..0be55aa7 100644 --- a/Quake/input.h +++ b/Quake/input.h @@ -19,6 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_INPUT_H +#define _QUAKE_INPUT_H + // input.h -- external (non-keyboard) input devices void IN_Init (void); @@ -42,3 +46,6 @@ void IN_Activate (); // called when the app becomes inactive void IN_Deactivate (qboolean free_cursor); + +#endif /* _QUAKE_INPUT_H */ + diff --git a/Quake/keys.h b/Quake/keys.h index d31718cd..a7ba3004 100644 --- a/Quake/keys.h +++ b/Quake/keys.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_KEYS_H +#define _QUAKE_KEYS_H + // // these are the key numbers that should be passed to Key_Event // @@ -155,4 +158,5 @@ void BuildKeyMaps (void); int Key_Map (SDL_KeyboardEvent *event); +#endif /* _QUAKE_KEYS_H */ diff --git a/Quake/mathlib.h b/Quake/mathlib.h index a50bc4b6..10f4241b 100644 --- a/Quake/mathlib.h +++ b/Quake/mathlib.h @@ -19,6 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __MATHLIB_H +#define __MATHLIB_H + // mathlib.h typedef float vec_t; @@ -120,3 +124,6 @@ float anglemod(float a); ) \ : \ BoxOnPlaneSide( (emins), (emaxs), (p))) + +#endif /* __MATHLIB_H */ + diff --git a/Quake/menu.h b/Quake/menu.h index 9b864992..bcb837a3 100644 --- a/Quake/menu.h +++ b/Quake/menu.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_MENU_H +#define _QUAKE_MENU_H + // // the net drivers should just set the apropriate bits in m_activenet, // instead of having the menu code look through their internal tables @@ -38,3 +41,5 @@ void M_ToggleMenu_f (void); void M_Print (int cx, int cy, char *str); +#endif /* _QUAKE_MENU_H */ + diff --git a/Quake/modelgen.h b/Quake/modelgen.h index 1d0bacbf..92dbcf4c 100644 --- a/Quake/modelgen.h +++ b/Quake/modelgen.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _MODELGEN_H +#define _MODELGEN_H + // // modelgen.h: header file for model generation program // @@ -133,3 +137,5 @@ typedef struct { #define IDPOLYHEADER (('O'<<24)+('P'<<16)+('D'<<8)+'I') // little-endian "IDPO" +#endif /* _MODELGEN_H */ + diff --git a/Quake/net.h b/Quake/net.h index ffc066c7..7dcc99ed 100644 --- a/Quake/net.h +++ b/Quake/net.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_NET_H +#define _QUAKE_NET_H + // net.h -- quake's interface to the networking layer struct qsockaddr @@ -332,3 +336,6 @@ extern qboolean slistSilent; extern qboolean slistLocal; void NET_Slist_f (void); + +#endif /* _QUAKE_NET_H */ + diff --git a/Quake/net_dgrm.h b/Quake/net_dgrm.h index e4a4a94d..77d95ad4 100644 --- a/Quake/net_dgrm.h +++ b/Quake/net_dgrm.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __NET_DATAGRAM_H +#define __NET_DATAGRAM_H + // net_dgrm.h @@ -33,3 +37,6 @@ qboolean Datagram_CanSendMessage (qsocket_t *sock); qboolean Datagram_CanSendUnreliableMessage (qsocket_t *sock); void Datagram_Close (qsocket_t *sock); void Datagram_Shutdown (void); + +#endif /* __NET_DATAGRAM_H */ + diff --git a/Quake/net_loop.h b/Quake/net_loop.h index cfd9f860..34f084af 100644 --- a/Quake/net_loop.h +++ b/Quake/net_loop.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __NET_LOOP_H +#define __NET_LOOP_H + // net_loop.h int Loop_Init (void); @@ -32,3 +36,6 @@ qboolean Loop_CanSendMessage (qsocket_t *sock); qboolean Loop_CanSendUnreliableMessage (qsocket_t *sock); void Loop_Close (qsocket_t *sock); void Loop_Shutdown (void); + +#endif /* __NET_LOOP_H */ + diff --git a/Quake/net_sdlnet.h b/Quake/net_sdlnet.h index 948853a1..a72bdebf 100644 --- a/Quake/net_sdlnet.h +++ b/Quake/net_sdlnet.h @@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __net_sdlnet_h +#define __net_sdlnet_h + int SDLN_Init (void); void SDLN_Shutdown (void); void SDLN_Listen (qboolean state); @@ -36,3 +39,6 @@ int SDLN_GetAddrFromName (char *name, struct qsockaddr *addr); int SDLN_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2); int SDLN_GetSocketPort (struct qsockaddr *addr); int SDLN_SetSocketPort (struct qsockaddr *addr, int port); + +#endif /* __net_sdlnet_h */ + diff --git a/Quake/net_udp.h b/Quake/net_udp.h index 75303011..61650374 100644 --- a/Quake/net_udp.h +++ b/Quake/net_udp.h @@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __net_udp_h +#define __net_udp_h + // net_udp.h int UDP_Init (void); @@ -37,3 +41,6 @@ int UDP_GetAddrFromName (char *name, struct qsockaddr *addr); int UDP_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2); int UDP_GetSocketPort (struct qsockaddr *addr); int UDP_SetSocketPort (struct qsockaddr *addr, int port); + +#endif /* __net_udp_h */ + diff --git a/Quake/net_wins.h b/Quake/net_wins.h index 09709184..08a5dc16 100644 --- a/Quake/net_wins.h +++ b/Quake/net_wins.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __NET_WINSOCK_H +#define __NET_WINSOCK_H + // net_wins.h int WINS_Init (void); @@ -38,3 +42,6 @@ int WINS_GetAddrFromName (char *name, struct qsockaddr *addr); int WINS_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2); int WINS_GetSocketPort (struct qsockaddr *addr); int WINS_SetSocketPort (struct qsockaddr *addr, int port); + +#endif /* __NET_WINSOCK_H */ + diff --git a/Quake/platform.h b/Quake/platform.h index 6f40e77d..9c6789ea 100644 --- a/Quake/platform.h +++ b/Quake/platform.h @@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_PLATFORM_H +#define _QUAKE_PLATFORM_H + // platform dependent way to set the window icon void PL_SetWindowIcon(void); @@ -28,3 +31,6 @@ void PL_VID_Shutdown (void); // show an error dialog void PL_ErrorDialog(char *text); + +#endif /* _QUAKE_PLATFORM_H */ + diff --git a/Quake/pr_comp.h b/Quake/pr_comp.h index 0e4d12fd..f79ca09d 100644 --- a/Quake/pr_comp.h +++ b/Quake/pr_comp.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __PR_COMP_H +#define __PR_COMP_H + // this file is shared by quake and qcc typedef int func_t; @@ -179,3 +182,5 @@ typedef struct int entityfields; } dprograms_t; +#endif /* __PR_COMP_H */ + diff --git a/Quake/progdefs.h b/Quake/progdefs.h index 790152be..5a806f56 100644 --- a/Quake/progdefs.h +++ b/Quake/progdefs.h @@ -18,4 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __PROGDEFS_H +#define __PROGDEFS_H + #include "progdefs.q1" + +#endif /* __PROGDEFS_H */ + diff --git a/Quake/progs.h b/Quake/progs.h index 8dabf6c1..c49e2f4c 100644 --- a/Quake/progs.h +++ b/Quake/progs.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_PROGS_H +#define _QUAKE_PROGS_H + #include "pr_comp.h" // defs shared with qcc #include "progdefs.h" // generated by program cdefs @@ -131,3 +134,5 @@ void ED_PrintNum (int ent); eval_t *GetEdictFieldValue(edict_t *ed, char *field); +#endif /* _QUAKE_PROGS_H */ + diff --git a/Quake/protocol.h b/Quake/protocol.h index 3e0848b9..64756b51 100644 --- a/Quake/protocol.h +++ b/Quake/protocol.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_PROTOCOL_H +#define _QUAKE_PROTOCOL_H + // protocol.h -- communications protocols #define PROTOCOL_NETQUAKE 15 //johnfitz -- standard quake protocol @@ -211,3 +215,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TE_BEAM 13 // PGM 01/21/97 +#endif /* _QUAKE_PROTOCOL_H */ + diff --git a/Quake/quakedef.h b/Quake/quakedef.h index 3f27dfa9..41c24baf 100644 --- a/Quake/quakedef.h +++ b/Quake/quakedef.h @@ -19,6 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __QUAKEDEFS_H +#define __QUAKEDEFS_H + // quakedef.h -- primary header for client //#define GLTEST // experimental stuff @@ -336,3 +340,5 @@ void TraceLine (vec3_t start, vec3_t end, vec3_t impact); void Chase_UpdateForClient (void); //johnfitz void Chase_UpdateForDrawing (void); //johnfitz +#endif /* __QUAKEDEFS_H */ + diff --git a/Quake/render.h b/Quake/render.h index dd6f9e15..1a39d412 100644 --- a/Quake/render.h +++ b/Quake/render.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_RENDER_H +#define _QUAKE_RENDER_H + // refresh.h -- public interface to refresh functions #define MAXCLIPPLANES 11 @@ -173,3 +176,5 @@ void D_DeleteSurfaceCache (void); void D_InitCaches (void *buffer, int size); void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj); +#endif /* _QUAKE_RENDER_H */ + diff --git a/Quake/resource.h b/Quake/resource.h index d2004d4e..d31f0fa8 100644 --- a/Quake/resource.h +++ b/Quake/resource.h @@ -1,3 +1,6 @@ +#ifndef _QUAKE_RESOURCE_H +#define _QUAKE_RESOURCE_H + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by winquake.rc @@ -18,3 +21,6 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + +#endif /* _QUAKE_RESOURCE_H */ + diff --git a/Quake/sbar.h b/Quake/sbar.h index 0dbcf04c..d9514a49 100644 --- a/Quake/sbar.h +++ b/Quake/sbar.h @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _QUAKE_SBAR_H +#define _QUAKE_SBAR_H + // the status bar is only redrawn if something has changed, but if anything // does, the entire thing will be redrawn for the next vid.numpages frames. @@ -37,3 +40,6 @@ void Sbar_IntermissionOverlay (void); // called each frame after the level has been completed void Sbar_FinaleOverlay (void); + +#endif /* _QUAKE_SBAR_H */ + diff --git a/Quake/screen.h b/Quake/screen.h index e368c209..0a9864dc 100644 --- a/Quake/screen.h +++ b/Quake/screen.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_SCREEN_H +#define _QUAKE_SCREEN_H + // screen.h void SCR_Init (void); @@ -74,3 +78,6 @@ extern cvar_t scr_crosshaircale; //johnfitz extern int scr_tileclear_updates; //johnfitz + +#endif /* _QUAKE_SCREEN_H */ + diff --git a/Quake/server.h b/Quake/server.h index 143104b5..9a977857 100644 --- a/Quake/server.h +++ b/Quake/server.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_SERVER_H +#define _QUAKE_SERVER_H + // server.h typedef struct @@ -226,3 +230,6 @@ void SV_CheckForNewClients (void); void SV_RunClients (void); void SV_SaveSpawnparms (); void SV_SpawnServer (char *server); + +#endif /* _QUAKE_SERVER_H */ + diff --git a/Quake/sound.h b/Quake/sound.h index 6f0e9578..56c0e396 100644 --- a/Quake/sound.h +++ b/Quake/sound.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // sound.h -- client sound i/o functions -#ifndef __SOUND__ -#define __SOUND__ +#ifndef __QUAKE_SOUND__ +#define __QUAKE_SOUND__ #define DEFAULT_SOUND_PACKET_VOLUME 255 #define DEFAULT_SOUND_PACKET_ATTENUATION 1.0 @@ -191,4 +191,5 @@ void SND_InitScaletable (void); void S_AmbientOff (void); void S_AmbientOn (void); -#endif +#endif /* __QUAKE_SOUND__ */ + diff --git a/Quake/spritegn.h b/Quake/spritegn.h index b5bb9651..1065052f 100644 --- a/Quake/spritegn.h +++ b/Quake/spritegn.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __SPRITEGEN_H +#define __SPRITEGEN_H + // // spritegn.h: header file for sprite generation program // @@ -109,3 +113,5 @@ typedef struct { #define IDSPRITEHEADER (('P'<<24)+('S'<<16)+('D'<<8)+'I') // little-endian "IDSP" +#endif /* __SPRITEGEN_H */ + diff --git a/Quake/sys.h b/Quake/sys.h index dbc566b1..f9c64f78 100644 --- a/Quake/sys.h +++ b/Quake/sys.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_SYS_H +#define _QUAKE_SYS_H + // sys.h -- non-portable functions // @@ -66,4 +70,5 @@ void Sys_Sleep (void); void Sys_SendKeyEvents (void); // Perform Key_Event () callbacks until the input que is empty +#endif /* _QUAKE_SYS_H */ diff --git a/Quake/vid.h b/Quake/vid.h index 6826544a..795b77e1 100644 --- a/Quake/vid.h +++ b/Quake/vid.h @@ -19,6 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __VID_DEFS_H +#define __VID_DEFS_H + // vid.h -- video driver defs #define VID_CBITS 6 @@ -83,3 +87,5 @@ void VID_SyncCvars (void); void VID_Toggle (void); +#endif /* __VID_DEFS_H */ + diff --git a/Quake/view.h b/Quake/view.h index e8fb9ab2..60ed197a 100644 --- a/Quake/view.h +++ b/Quake/view.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_VIEW_H +#define _QUAKE_VIEW_H + // view.h extern cvar_t vid_gamma; @@ -31,3 +35,5 @@ void V_UpdateBlend (void); float V_CalcRoll (vec3_t angles, vec3_t velocity); //void V_UpdatePalette (void); //johnfitz +#endif /* _QUAKE_VIEW_H */ + diff --git a/Quake/wad.h b/Quake/wad.h index e94b0e88..757314be 100644 --- a/Quake/wad.h +++ b/Quake/wad.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_WAD_H +#define _QUAKE_WAD_H + // wad.h //=============== @@ -74,3 +78,6 @@ void *W_GetLumpName (char *name); void *W_GetLumpNum (int num); void SwapPic (qpic_t *pic); + +#endif /* _QUAKE_WAD_H */ + diff --git a/Quake/world.h b/Quake/world.h index 7081b907..6554b266 100644 --- a/Quake/world.h +++ b/Quake/world.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _QUAKE_WORLD_H +#define _QUAKE_WORLD_H + // world.h typedef struct @@ -80,3 +84,5 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace); +#endif /* _QUAKE_WORLD_H */ + diff --git a/Quake/zone.h b/Quake/zone.h index 3a9a3d13..c9561a12 100644 --- a/Quake/zone.h +++ b/Quake/zone.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef __ZZONE_H +#define __ZZONE_H + /* memory allocation @@ -127,5 +131,5 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name); void Cache_Report (void); - +#endif /* __ZZONE_H */