From 2473e7d8356caaa21806dd868daf92b820f30eb3 Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Mon, 2 Dec 2019 10:00:56 -0500 Subject: [PATCH] fix header defines --- CMakeLists.txt | 2 +- source/arch_def.h | 4 ++-- source/bgmusic.h | 7 +++---- source/bspfile.h | 7 +++---- source/cdaudio.h | 7 +++---- source/cfgfile.h | 6 +++--- source/client.h | 7 +++---- source/cmd.h | 7 +++---- source/common.h | 7 +++---- source/console.h | 7 +++---- source/crc.h | 7 +++---- source/cvar.h | 7 +++---- source/draw.h | 7 +++---- source/filenames.h | 6 +++--- source/gl_model.h | 6 +++--- source/gl_texmgr.h | 7 +++---- source/glquake.h | 7 +++---- source/image.h | 7 +++---- source/input.h | 7 +++---- source/keys.h | 7 +++---- source/lodepng.h | 6 +++--- source/mathlib.h | 28 +++++++++------------------- source/menu.h | 7 +++---- source/modelgen.h | 13 +++---------- source/net.h | 7 +++---- source/net_defs.h | 7 +++---- source/net_dgrm.h | 7 +++---- source/net_loop.h | 7 +++---- source/net_sys.h | 7 +++---- source/platform.h | 7 +++---- source/pr_comp.h | 7 +++---- source/progdefs.h | 6 +++--- source/progs.h | 7 +++---- source/protocol.h | 9 +++------ source/q_ctype.h | 6 +++--- source/q_sound.h | 8 +++----- source/q_stdinc.h | 6 +++--- source/quakedef.h | 9 +++++---- source/render.h | 7 +++---- source/sbar.h | 7 +++---- source/screen.h | 7 +++---- source/server.h | 7 +++---- source/snd_codec.h | 7 +++---- source/snd_codeci.h | 7 +++---- source/snd_flac.h | 7 +++---- source/snd_mikmod.c | 4 ++-- source/snd_mikmod.h | 7 +++---- source/snd_mp3.h | 7 +++---- source/snd_opus.h | 7 +++---- source/snd_umx.h | 7 +++---- source/snd_vorbis.c | 2 +- source/snd_vorbis.h | 7 +++---- source/spritegn.h | 13 +++---------- source/stb_image_write.h | 6 +++--- source/strl_fn.h | 7 +++---- source/sys.h | 7 +++---- source/unix/net_udp.h | 7 +++---- source/vid.h | 7 +++---- source/view.h | 7 +++---- source/wad.h | 7 +++---- source/windows/net_wins.h | 7 +++---- source/windows/net_wipx.h | 7 +++---- source/{ => windows}/resource.h | 11 ++++------- source/windows/wsaerror.h | 2 +- source/world.h | 7 +++---- source/zone.h | 7 +++---- 66 files changed, 199 insertions(+), 276 deletions(-) rename source/{ => windows}/resource.h (82%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc98739..498bf69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,6 @@ set(srcs source/r_sprite.c source/r_world.c source/render.h - source/resource.h source/sbar.c source/sbar.h source/screen.h @@ -173,6 +172,7 @@ set(srcs_windows source/windows/net_wipx.c source/windows/net_wipx.h source/windows/pl_win.c + source/windows/resource.h source/windows/sys_sdl_win.c source/windows/wsaerror.h) diff --git a/source/arch_def.h b/source/arch_def.h index f96228d..91e68c8 100644 --- a/source/arch_def.h +++ b/source/arch_def.h @@ -24,8 +24,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef ARCHDEFS_H -#define ARCHDEFS_H +#ifndef spingle__arch_def_h +#define spingle__arch_def_h /* core ports */ #define PLATFRM_BSD 0 diff --git a/source/bgmusic.h b/source/bgmusic.h index 8912190..f5098ea 100644 --- a/source/bgmusic.h +++ b/source/bgmusic.h @@ -22,8 +22,8 @@ * */ -#ifndef _BGMUSIC_H_ -#define _BGMUSIC_H_ +#ifndef spingle__bgmusic_h +#define spingle__bgmusic_h extern bool bgmloop; extern cvar_t bgm_extmusic; @@ -39,5 +39,4 @@ void BGM_Resume(void); void BGM_PlayCDtrack(byte track, bool looping); -#endif /* _BGMUSIC_H_ */ - +#endif diff --git a/source/bspfile.h b/source/bspfile.h index cbfbcf1..4b88d81 100644 --- a/source/bspfile.h +++ b/source/bspfile.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __BSPFILE_H -#define __BSPFILE_H +#ifndef spingle__bspfile_h +#define spingle__bspfile_h // upper design bounds @@ -310,5 +310,4 @@ typedef struct //============================================================================ -#endif /* __BSPFILE_H */ - +#endif diff --git a/source/cdaudio.h b/source/cdaudio.h index e2f716d..a33c079 100644 --- a/source/cdaudio.h +++ b/source/cdaudio.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __CDAUDIO_H -#define __CDAUDIO_H +#ifndef spingle__cdaudio_h +#define spingle__cdaudio_h int32_t CDAudio_Init(void); int32_t CDAudio_Play(byte track, bool looping); @@ -31,5 +31,4 @@ void CDAudio_Resume(void); void CDAudio_Shutdown(void); void CDAudio_Update(void); -#endif /* __CDAUDIO_H */ - +#endif diff --git a/source/cfgfile.h b/source/cfgfile.h index 97af3da..56aacb7 100644 --- a/source/cfgfile.h +++ b/source/cfgfile.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __CFGFILE_H -#define __CFGFILE_H +#ifndef spingle__cfgfile_h +#define spingle__cfgfile_h int32_t CFG_OpenConfig(const char *cfg_name); // opens the given config file. only one open config file is @@ -39,4 +39,4 @@ void CFG_ReadCvarOverrides(const char **vars, int32_t num_vars); // the config file. call this after CFG_ReadCvars() and before // locking your cvars. -#endif /* __CFGFILE_H */ +#endif diff --git a/source/client.h b/source/client.h index 2867c89..6a60a1b 100644 --- a/source/client.h +++ b/source/client.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _CLIENT_H_ -#define _CLIENT_H_ +#ifndef spingle__client_h +#define spingle__client_h // client.h @@ -379,5 +379,4 @@ void TraceLine(vec3_t start, vec3_t end, vec3_t impact); void Chase_UpdateForClient(void); //johnfitz void Chase_UpdateForDrawing(void); //johnfitz -#endif /* _CLIENT_H_ */ - +#endif diff --git a/source/cmd.h b/source/cmd.h index 4724d81..98140e4 100644 --- a/source/cmd.h +++ b/source/cmd.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_CMD_H -#define _QUAKE_CMD_H +#ifndef spingle__cmd_h +#define spingle__cmd_h // cmd.h -- Command buffer and command execution @@ -123,5 +123,4 @@ void Cmd_Print(const 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 */ - +#endif diff --git a/source/common.h b/source/common.h index f24d008..4a3e49e 100644 --- a/source/common.h +++ b/source/common.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _Q_COMMON_H -#define _Q_COMMON_H +#ifndef spingle__common_h +#define spingle__common_h // comndef.h -- general definitions @@ -285,5 +285,4 @@ extern bool standard_quake, rogue, hipnotic; struct cvar_s; -#endif /* _Q_COMMON_H */ - +#endif diff --git a/source/console.h b/source/console.h index 30c6685..462968d 100644 --- a/source/console.h +++ b/source/console.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __CONSOLE_H -#define __CONSOLE_H +#ifndef spingle__console_h +#define spingle__console_h // // console @@ -65,5 +65,4 @@ void LOG_Init(quakeparms_t *parms); void LOG_Close(void); void Con_DebugLog(const char *msg); -#endif /* __CONSOLE_H */ - +#endif diff --git a/source/crc.h b/source/crc.h index b510235..b45ec7e 100644 --- a/source/crc.h +++ b/source/crc.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_CRC_H -#define _QUAKE_CRC_H +#ifndef spingle__crc_h +#define spingle__crc_h /* crc.h */ @@ -29,5 +29,4 @@ void CRC_ProcessByte(uint16_t *crcvalue, byte data); uint16_t CRC_Value(uint16_t crcvalue); uint16_t CRC_Block(const byte *start, int32_t count); //johnfitz -- texture crc -#endif /* _QUAKE_CRC_H */ - +#endif diff --git a/source/cvar.h b/source/cvar.h index d1e00cd..f645bec 100644 --- a/source/cvar.h +++ b/source/cvar.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __CVAR_H__ -#define __CVAR_H__ +#ifndef spingle__cvar_h +#define spingle__cvar_h /* cvar_t variables are used to hold scalar or string variables that can @@ -139,5 +139,4 @@ const char *Cvar_CompleteVariable(const char *partial); // attempts to match a partial variable name for command line completion // returns NULL if nothing fits -#endif /* __CVAR_H__ */ - +#endif diff --git a/source/draw.h b/source/draw.h index dc6a557..5c46101 100644 --- a/source/draw.h +++ b/source/draw.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_DRAW_H -#define _QUAKE_DRAW_H +#ifndef spingle__draw_h +#define spingle__draw_h // draw.h -- these are the only functions outside the refresh allowed // to touch the vid buffer @@ -44,5 +44,4 @@ void Draw_NewGame(void); void GL_SetCanvas(canvastype newcanvas); //johnfitz -#endif /* _QUAKE_DRAW_H */ - +#endif diff --git a/source/filenames.h b/source/filenames.h index 3a04c0d..13c5ab7 100644 --- a/source/filenames.h +++ b/source/filenames.h @@ -24,8 +24,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef FILENAMES_H -#define FILENAMES_H +#ifndef spingle__filenames_h +#define spingle__filenames_h #include @@ -80,4 +80,4 @@ static inline char *FIND_LAST_DIRSEP(const char *_the_path) } #endif -#endif /* FILENAMES_H */ +#endif diff --git a/source/gl_model.h b/source/gl_model.h index 3e61a88..4b26afa 100644 --- a/source/gl_model.h +++ b/source/gl_model.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __MODEL__ -#define __MODEL__ +#ifndef spingle__gl_model_h +#define spingle__gl_model_h #include "modelgen.h" #include "spritegn.h" @@ -519,4 +519,4 @@ byte *Mod_NoVisPVS(qmodel_t *model); void Mod_SetExtraFlags(qmodel_t *mod); -#endif // __MODEL__ +#endif diff --git a/source/gl_texmgr.h b/source/gl_texmgr.h index df79c87..76690ce 100644 --- a/source/gl_texmgr.h +++ b/source/gl_texmgr.h @@ -19,8 +19,8 @@ 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 +#ifndef spingle__gl_texmgr_h +#define spingle__gl_texmgr_h //gl_texmgr.h -- fitzquake's texture manager. manages opengl texture images @@ -107,5 +107,4 @@ void GL_EnableMultitexture(void); //selects texture unit 1 void GL_Bind(gltexture_t *texture); void GL_ClearBindings(void); -#endif /* _GL_TEXMAN_H */ - +#endif diff --git a/source/glquake.h b/source/glquake.h index e8ce441..c42b0f1 100644 --- a/source/glquake.h +++ b/source/glquake.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GLQUAKE_H -#define __GLQUAKE_H +#ifndef spingle__glquake_h +#define spingle__glquake_h void GL_BeginRendering(int32_t *x, int32_t *y, int32_t *width, int32_t *height); void GL_EndRendering(void); @@ -376,5 +376,4 @@ void R_ScaleView_DeleteTexture(void); float GL_WaterAlphaForSurface(msurface_t *fa); -#endif /* __GLQUAKE_H */ - +#endif diff --git a/source/image.h b/source/image.h index b4115a3..82fda8f 100644 --- a/source/image.h +++ b/source/image.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef GL_IMAGE_H -#define GL_IMAGE_H +#ifndef spingle__image_h +#define spingle__image_h //image.h -- image reading / writing @@ -34,5 +34,4 @@ bool Image_WriteTGA(const char *name, byte *data, int32_t width, int32_t height, bool Image_WritePNG(const char *name, byte *data, int32_t width, int32_t height, int32_t bpp, bool upsidedown); bool Image_WriteJPG(const char *name, byte *data, int32_t width, int32_t height, int32_t bpp, int32_t quality, bool upsidedown); -#endif /* GL_IMAGE_H */ - +#endif diff --git a/source/input.h b/source/input.h index ea2f800..982f743 100644 --- a/source/input.h +++ b/source/input.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_INPUT_H -#define _QUAKE_INPUT_H +#ifndef spingle__input_h +#define spingle__input_h // input.h -- external (non-keyboard) input devices @@ -53,5 +53,4 @@ void IN_Activate(); // called when the app becomes inactive void IN_Deactivate(bool free_cursor); -#endif /* _QUAKE_INPUT_H */ - +#endif diff --git a/source/keys.h b/source/keys.h index 7f87443..6d26d11 100644 --- a/source/keys.h +++ b/source/keys.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_KEYS_H -#define _QUAKE_KEYS_H +#ifndef spingle__keys_h +#define spingle__keys_h // // these are the key numbers that should be passed to Key_Event @@ -196,5 +196,4 @@ int32_t Key_GetChatMsgLen(void); void History_Init(void); void History_Shutdown(void); -#endif /* _QUAKE_KEYS_H */ - +#endif diff --git a/source/lodepng.h b/source/lodepng.h index bcc30cd..9286f87 100644 --- a/source/lodepng.h +++ b/source/lodepng.h @@ -23,8 +23,8 @@ freely, subject to the following restrictions: distribution. */ -#ifndef LODEPNG_H -#define LODEPNG_H +#ifndef spingle__lodepng_h +#define spingle__lodepng_h #include /*for size_t*/ @@ -769,7 +769,7 @@ TODO: [ ] allow user to give data (void*) to custom allocator */ -#endif /*LODEPNG_H inclusion guard*/ +#endif /* LodePNG Documentation diff --git a/source/mathlib.h b/source/mathlib.h index 2f9d5ac..3a2752d 100644 --- a/source/mathlib.h +++ b/source/mathlib.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __MATHLIB_H -#define __MATHLIB_H +#ifndef spingle__mathlib_h +#define spingle__mathlib_h // mathlib.h @@ -103,21 +103,11 @@ int32_t BoxOnPlaneSide(vec3_t emins, vec3_t emaxs, struct mplane_s *plane); float anglemod(float a); -#define BOX_ON_PLANE_SIDE(emins, emaxs, p) \ - (((p)->type < 3)? \ - ( \ - ((p)->dist <= (emins)[(p)->type])? \ - 1 \ - : \ - ( \ - ((p)->dist >= (emaxs)[(p)->type])?\ - 2 \ - : \ - 3 \ - ) \ - ) \ - : \ - BoxOnPlaneSide( (emins), (emaxs), (p))) - -#endif /* __MATHLIB_H */ +#define BOX_ON_PLANE_SIDE(emins, emaxs, p) \ + (((p)->type < 3) \ + ? (((p)->dist <= (emins)[(p)->type]) \ + ? 1 \ + : (((p)->dist >= (emaxs)[(p)->type]) ? 2 : 3)) \ + : BoxOnPlaneSide((emins), (emaxs), (p))) +#endif diff --git a/source/menu.h b/source/menu.h index cacadfa..19297e0 100644 --- a/source/menu.h +++ b/source/menu.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_MENU_H -#define _QUAKE_MENU_H +#ifndef spingle__menu_h +#define spingle__menu_h enum m_state_e { @@ -72,5 +72,4 @@ void M_DrawPic(int32_t x, int32_t y, qpic_t *pic); void M_DrawTransPic(int32_t x, int32_t y, qpic_t *pic); void M_DrawCheckbox(int32_t x, int32_t y, int32_t on); -#endif /* _QUAKE_MENU_H */ - +#endif diff --git a/source/modelgen.h b/source/modelgen.h index 6a8f163..054250d 100644 --- a/source/modelgen.h +++ b/source/modelgen.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _MODELGEN_H -#define _MODELGEN_H +#ifndef spingle__modelgen_h +#define spingle__modelgen_h // // modelgen.h: header file for model generation program @@ -36,12 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ALIAS_ONSEAM 0x0020 -// must match definition in spritegn.h -#ifndef SYNCTYPE_T -#define SYNCTYPE_T -typedef enum {ST_SYNC = 0, ST_RAND } synctype_t; -#endif - typedef enum { ALIAS_SINGLE = 0, ALIAS_GROUP } aliasframetype_t; typedef enum { ALIAS_SKIN_SINGLE = 0, ALIAS_SKIN_GROUP } aliasskintype_t; @@ -133,5 +127,4 @@ typedef struct #define IDPOLYHEADER (('O'<<24)+('P'<<16)+('D'<<8)+'I') // little-endian "IDPO" -#endif /* _MODELGEN_H */ - +#endif diff --git a/source/net.h b/source/net.h index 0ed947c..1327cd9 100644 --- a/source/net.h +++ b/source/net.h @@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. whole engine */ -#ifndef _QUAKE_NET_H -#define _QUAKE_NET_H +#ifndef spingle__quake_net_h +#define spingle__quake_net_h #define NET_NAMELEN 64 @@ -111,5 +111,4 @@ extern bool tcpipAvailable; extern char my_ipx_address[NET_NAMELEN]; extern char my_tcpip_address[NET_NAMELEN]; -#endif /* _QUAKE_NET_H */ - +#endif diff --git a/source/net_defs.h b/source/net_defs.h index 2fe7545..14d7959 100644 --- a/source/net_defs.h +++ b/source/net_defs.h @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __NET_DEFS_H -#define __NET_DEFS_H +#ifndef spingle__net_defs_h +#define spingle__net_defs_h struct qsockaddr { @@ -256,5 +256,4 @@ typedef struct _PollProcedure void SchedulePollProcedure(PollProcedure *pp, double timeOffset); -#endif /* __NET_DEFS_H */ - +#endif diff --git a/source/net_dgrm.h b/source/net_dgrm.h index 825cee2..141bfb4 100644 --- a/source/net_dgrm.h +++ b/source/net_dgrm.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __NET_DATAGRAM_H -#define __NET_DATAGRAM_H +#ifndef spingle__net_dgrm_h +#define spingle__net_dgrm_h int32_t Datagram_Init(void); void Datagram_Listen(bool state); @@ -35,5 +35,4 @@ bool Datagram_CanSendUnreliableMessage(qsocket_t *sock); void Datagram_Close(qsocket_t *sock); void Datagram_Shutdown(void); -#endif /* __NET_DATAGRAM_H */ - +#endif diff --git a/source/net_loop.h b/source/net_loop.h index 77d60cd..3f18280 100644 --- a/source/net_loop.h +++ b/source/net_loop.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __NET_LOOP_H -#define __NET_LOOP_H +#ifndef spingle__net_loop_h +#define spingle__net_loop_h // net_loop.h int32_t Loop_Init(void); @@ -36,5 +36,4 @@ bool Loop_CanSendUnreliableMessage(qsocket_t *sock); void Loop_Close(qsocket_t *sock); void Loop_Shutdown(void); -#endif /* __NET_LOOP_H */ - +#endif diff --git a/source/net_sys.h b/source/net_sys.h index 4aa2452..1bf4a98 100644 --- a/source/net_sys.h +++ b/source/net_sys.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __NET_SYS_H__ -#define __NET_SYS_H__ +#ifndef spingle__net_sys_h +#define spingle__net_sys_h #include #include @@ -127,5 +127,4 @@ _Static_assert(offsetof(struct sockaddr, sa_family) == SA_FAM_OFFSET, #endif /* MAXHOSTNAMELEN */ -#endif /* __NET_SYS_H__ */ - +#endif diff --git a/source/platform.h b/source/platform.h index 8123e5e..ae7ce2d 100644 --- a/source/platform.h +++ b/source/platform.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_PLATFORM_H -#define _QUAKE_PLATFORM_H +#ifndef spingle__platform_h +#define spingle__platform_h /* platform dependent way to set the window icon */ void PL_SetWindowIcon(void); @@ -36,5 +36,4 @@ char *PL_GetClipboardData(void); /* show an error dialog */ void PL_ErrorDialog(const char *text); -#endif /* _QUAKE_PLATFORM_H */ - +#endif diff --git a/source/pr_comp.h b/source/pr_comp.h index be77e57..8c9810b 100644 --- a/source/pr_comp.h +++ b/source/pr_comp.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PR_COMP_H -#define __PR_COMP_H +#ifndef spingle__pr_comp_h +#define spingle__pr_comp_h // this file is shared by quake and qcc @@ -192,5 +192,4 @@ typedef struct int32_t entityfields; } dprograms_t; -#endif /* __PR_COMP_H */ - +#endif diff --git a/source/progdefs.h b/source/progdefs.h index 29fb50f..6357160 100644 --- a/source/progdefs.h +++ b/source/progdefs.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PROGDEFS_H -#define __PROGDEFS_H +#ifndef spingle__progdefs_h +#define spingle__progdefs_h typedef struct { @@ -164,4 +164,4 @@ typedef struct #define PROGHEADER_CRC 5927 -#endif /* __PROGDEFS_H */ +#endif diff --git a/source/progs.h b/source/progs.h index ff4b1ce..0bc3bfa 100644 --- a/source/progs.h +++ b/source/progs.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_PROGS_H -#define _QUAKE_PROGS_H +#ifndef spingle__progs_h +#define spingle__progs_h #include "pr_comp.h" /* defs shared with qcc */ #include "progdefs.h" /* generated by program cdefs */ @@ -137,5 +137,4 @@ void ED_PrintNum(int32_t ent); eval_t *GetEdictFieldValue(edict_t *ed, const char *field); -#endif /* _QUAKE_PROGS_H */ - +#endif diff --git a/source/protocol.h b/source/protocol.h index 1a07024..af8c3a4 100644 --- a/source/protocol.h +++ b/source/protocol.h @@ -20,10 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_PROTOCOL_H -#define _QUAKE_PROTOCOL_H - -// protocol.h -- communications protocols +#ifndef spingle__protocol_h +#define spingle__protocol_h #define PROTOCOL_NETQUAKE 15 //johnfitz -- standard quake protocol #define PROTOCOL_FITZQUAKE 666 //johnfitz -- added new protocol for fitzquake 0.85 @@ -253,5 +251,4 @@ typedef struct float upmove; } usercmd_t; -#endif /* _QUAKE_PROTOCOL_H */ - +#endif diff --git a/source/q_ctype.h b/source/q_ctype.h index a6c3fce..2b62644 100644 --- a/source/q_ctype.h +++ b/source/q_ctype.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef Q_CTYPE_H -#define Q_CTYPE_H +#ifndef spingle__q_ctype_h +#define spingle__q_ctype_h static inline int32_t q_isascii(int32_t c) { @@ -101,4 +101,4 @@ static inline int32_t q_toupper(int32_t c) return ((q_islower(c)) ? (c & ~('a' - 'A')) : c); } -#endif /* Q_CTYPE_H */ +#endif diff --git a/source/q_sound.h b/source/q_sound.h index 90f12d4..9c95c9e 100644 --- a/source/q_sound.h +++ b/source/q_sound.h @@ -22,10 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // sound.h -- client sound i/o functions -#ifndef __QUAKE_SOUND__ -#define __QUAKE_SOUND__ +#ifndef spingle__q_sound_h +#define spingle__q_sound_h -/* !!! if this is changed, it must be changed in asm_i386.h too !!! */ typedef struct { int32_t left; @@ -186,5 +185,4 @@ wavinfo_t GetWavinfo(const char *name, byte *wav, int32_t wavlength); void SND_InitScaletable(void); -#endif /* __QUAKE_SOUND__ */ - +#endif diff --git a/source/q_stdinc.h b/source/q_stdinc.h index 1cf150a..d23c1a2 100644 --- a/source/q_stdinc.h +++ b/source/q_stdinc.h @@ -26,8 +26,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __QSTDINC_H -#define __QSTDINC_H +#ifndef spingle__q_stdinc_h +#define spingle__q_stdinc_h #include "arch_def.h" @@ -101,4 +101,4 @@ typedef vec_t vec5_t[5]; #define arraysizeof(a) (sizeof(a) / sizeof(*a)) #define strsizeof(a) (sizeof(a) - 1) -#endif /* __QSTDINC_H */ +#endif diff --git a/source/quakedef.h b/source/quakedef.h index f28975d..88e5853 100644 --- a/source/quakedef.h +++ b/source/quakedef.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef QUAKEDEFS_H -#define QUAKEDEFS_H +#ifndef spingle__quakedef_h +#define spingle__quakedef_h // quakedef.h -- primary header for client @@ -168,6 +168,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SOUND_CHANNELS 8 +typedef enum {ST_SYNC = 0, ST_RAND } synctype_t; + typedef struct { const char *basedir; @@ -287,5 +289,4 @@ extern int32_t current_skill; // skill level for currently loaded leve extern bool isDedicated; -#endif /* QUAKEDEFS_H */ - +#endif diff --git a/source/render.h b/source/render.h index 2d960ce..4e2b3e6 100644 --- a/source/render.h +++ b/source/render.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_RENDER_H -#define _QUAKE_RENDER_H +#ifndef spingle__render_h +#define spingle__render_h // refresh.h -- public interface to refresh functions @@ -174,5 +174,4 @@ void D_DeleteSurfaceCache(void); void D_InitCaches(void *buffer, int32_t size); void R_SetVrect(vrect_t *pvrect, vrect_t *pvrectin, int32_t lineadj); -#endif /* _QUAKE_RENDER_H */ - +#endif diff --git a/source/sbar.h b/source/sbar.h index ff88c0f..9b91fd5 100644 --- a/source/sbar.h +++ b/source/sbar.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_SBAR_H -#define _QUAKE_SBAR_H +#ifndef spingle__sbar_h +#define spingle__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. @@ -42,5 +42,4 @@ void Sbar_IntermissionOverlay(void); void Sbar_FinaleOverlay(void); -#endif /* _QUAKE_SBAR_H */ - +#endif diff --git a/source/screen.h b/source/screen.h index 8751e70..141af59 100644 --- a/source/screen.h +++ b/source/screen.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_SCREEN_H -#define _QUAKE_SCREEN_H +#ifndef spingle__screen_h +#define spingle__screen_h // screen.h @@ -81,5 +81,4 @@ extern cvar_t scr_crosshairscale; extern int32_t scr_tileclear_updates; //johnfitz -#endif /* _QUAKE_SCREEN_H */ - +#endif diff --git a/source/server.h b/source/server.h index 915e56c..d8fd282 100644 --- a/source/server.h +++ b/source/server.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_SERVER_H -#define _QUAKE_SERVER_H +#ifndef spingle__server_h +#define spingle__server_h // server.h @@ -228,5 +228,4 @@ void SV_RunClients(void); void SV_SaveSpawnparms(); void SV_SpawnServer(const char *server); -#endif /* _QUAKE_SERVER_H */ - +#endif diff --git a/source/snd_codec.h b/source/snd_codec.h index 8e595ad..ec898ad 100644 --- a/source/snd_codec.h +++ b/source/snd_codec.h @@ -23,8 +23,8 @@ * */ -#ifndef _SND_CODEC_H_ -#define _SND_CODEC_H_ +#ifndef spingle__snd_codec_h +#define spingle__snd_codec_h typedef struct snd_info_s { @@ -101,5 +101,4 @@ int32_t S_CodecIsAvailable(uint32_t type); /* return 1 if available, 0 if codec failed init * or -1 if no such codec is present. */ -#endif /* _SND_CODEC_H_ */ - +#endif diff --git a/source/snd_codeci.h b/source/snd_codeci.h index 1361a9a..0cc8da1 100644 --- a/source/snd_codeci.h +++ b/source/snd_codeci.h @@ -23,8 +23,8 @@ * */ -#ifndef _SND_CODECI_H_ -#define _SND_CODECI_H_ +#ifndef spingle__snd_codeci_h +#define spingle__snd_codeci_h /* Codec internals */ typedef bool (*CODEC_INIT)(void); @@ -51,5 +51,4 @@ struct snd_codec_s bool S_CodecForwardStream(snd_stream_t *stream, uint32_t type); /* Forward a stream to another codec of 'type' type. */ -#endif /* _SND_CODECI_H_ */ - +#endif diff --git a/source/snd_flac.h b/source/snd_flac.h index 8cb3183..33f7576 100644 --- a/source/snd_flac.h +++ b/source/snd_flac.h @@ -1,7 +1,7 @@ /* fLaC streaming music support. */ -#ifndef _SND_FLAC_H_ -#define _SND_FLAC_H_ 1 +#ifndef spingle__snd_flac_h +#define spingle__snd_flac_h #if defined(USE_CODEC_FLAC) @@ -9,5 +9,4 @@ extern snd_codec_t flac_codec; #endif /* USE_CODEC_FLAC */ -#endif /* ! _SND_FLAC_H_ */ - +#endif diff --git a/source/snd_mikmod.c b/source/snd_mikmod.c index 37d685f..5f5e720 100644 --- a/source/snd_mikmod.c +++ b/source/snd_mikmod.c @@ -35,10 +35,10 @@ #define S_MIKMOD_initlib(c) MikMod_Init(c) #endif -#ifndef DMODE_NOISEREDUCTION +#if !defined(DMODE_NOISEREDUCTION) #define DMODE_NOISEREDUCTION 0x1000 /* Low pass filtering */ #endif -#ifndef DMODE_SIMDMIXER +#if !defined(DMODE_SIMDMIXER) #define DMODE_SIMDMIXER 0x0800 /* enable SIMD mixing */ #endif diff --git a/source/snd_mikmod.h b/source/snd_mikmod.h index 6bdebb6..fd4b839 100644 --- a/source/snd_mikmod.h +++ b/source/snd_mikmod.h @@ -1,7 +1,7 @@ /* module tracker decoding support using libmikmod */ -#ifndef _SND_MIKMOD_H_ -#define _SND_MIKMOD_H_ +#ifndef spingle__snd_mikmod_h +#define spingle__snd_mikmod_h #if defined(USE_CODEC_MIKMOD) @@ -9,5 +9,4 @@ extern snd_codec_t mikmod_codec; #endif /* USE_CODEC_MIKMOD */ -#endif /* ! _SND_MIKMOD_H_ */ - +#endif diff --git a/source/snd_mp3.h b/source/snd_mp3.h index bd9ba06..362d742 100644 --- a/source/snd_mp3.h +++ b/source/snd_mp3.h @@ -1,7 +1,7 @@ /* MP3 decoding support using libmad or libmpg123. */ -#ifndef _SND_MP3_H_ -#define _SND_MP3_H_ +#ifndef spingle__snd_mp3_h +#define spingle__snd_mp3_h #if defined(USE_CODEC_MP3) @@ -9,5 +9,4 @@ extern snd_codec_t mp3_codec; #endif /* USE_CODEC_MP3 */ -#endif /* ! _SND_MP3_H_ */ - +#endif diff --git a/source/snd_opus.h b/source/snd_opus.h index 3d7e604..bec8485 100644 --- a/source/snd_opus.h +++ b/source/snd_opus.h @@ -1,7 +1,7 @@ /* Ogg/Opus streaming music support. */ -#ifndef _SND_OPUS_H_ -#define _SND_OPUS_H_ 1 +#ifndef spingle__snd_opus +#define spingle__snd_opus #if defined(USE_CODEC_OPUS) @@ -9,5 +9,4 @@ extern snd_codec_t opus_codec; #endif /* USE_CODEC_OPUS */ -#endif /* ! _SND_OPUS_H_ */ - +#endif diff --git a/source/snd_umx.h b/source/snd_umx.h index 9b96d01..aa1b9cc 100644 --- a/source/snd_umx.h +++ b/source/snd_umx.h @@ -1,8 +1,7 @@ /* Unreal UMX format support */ -#ifndef _SND_UMX_H_ -#define _SND_UMX_H_ +#ifndef spingle__snd_umx_h +#define spingle__snd_umx_h extern snd_codec_t umx_codec; -#endif /* ! _SND_UMX_H_ */ - +#endif diff --git a/source/snd_vorbis.c b/source/snd_vorbis.c index 2db01eb..9625ed5 100644 --- a/source/snd_vorbis.c +++ b/source/snd_vorbis.c @@ -152,7 +152,7 @@ static int32_t S_VORBIS_CodecReadStream(snd_stream_t *stream, int32_t bytes, voi * the channels are interleaved in the output buffer. */ res = ov_read((OggVorbis_File *)stream->priv, ptr, rem, -#ifndef VORBIS_USE_TREMOR +#if !defined(VORBIS_USE_TREMOR) host_bigendian, VORBIS_SAMPLEWIDTH, VORBIS_SIGNED_DATA, diff --git a/source/snd_vorbis.h b/source/snd_vorbis.h index cf6119b..7902578 100644 --- a/source/snd_vorbis.h +++ b/source/snd_vorbis.h @@ -1,7 +1,7 @@ /* Ogg/Vorbis streaming music support. */ -#ifndef _SND_VORBIS_H_ -#define _SND_VORBIS_H_ 1 +#ifndef spingle__snd_vorbis_h +#define spingle__snd_vorbis_h #if defined(USE_CODEC_VORBIS) @@ -9,5 +9,4 @@ extern snd_codec_t vorbis_codec; #endif /* USE_CODEC_VORBIS */ -#endif /* ! _SND_VORBIS_H_ */ - +#endif diff --git a/source/spritegn.h b/source/spritegn.h index 98b8b0e..4a173fd 100644 --- a/source/spritegn.h +++ b/source/spritegn.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __SPRITEGEN_H -#define __SPRITEGEN_H +#ifndef spingle__spritegn_h +#define spingle__spritegn_h // // spritegn.h: header file for sprite generation program @@ -49,12 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SPRITE_VERSION 1 -// must match definition in modelgen.h -#ifndef SYNCTYPE_T -#define SYNCTYPE_T -typedef enum {ST_SYNC = 0, ST_RAND } synctype_t; -#endif - // TODO: shorten these? typedef struct { @@ -102,5 +96,4 @@ typedef struct #define IDSPRITEHEADER (('P'<<24)+('S'<<16)+('D'<<8)+'I') // little-endian "IDSP" -#endif /* __SPRITEGEN_H */ - +#endif diff --git a/source/stb_image_write.h b/source/stb_image_write.h index 9e2ae80..d98e7f3 100644 --- a/source/stb_image_write.h +++ b/source/stb_image_write.h @@ -123,8 +123,8 @@ LICENSE */ -#ifndef INCLUDE_STB_IMAGE_WRITE_H -#define INCLUDE_STB_IMAGE_WRITE_H +#ifndef spingle__stb_image_write_h +#define spingle__stb_image_write_h #if defined(STB_IMAGE_WRITE_STATIC) #define STBIWDEF static @@ -142,7 +142,7 @@ typedef void stbi_write_func(void *context, void *data, int32_t size); STBIWDEF int32_t stbi_write_jpg_to_func(stbi_write_func *func, void *context, int32_t x, int32_t y, int32_t comp, const void *data, int32_t quality); #endif -#endif//INCLUDE_STB_IMAGE_WRITE_H +#endif #if defined(STB_IMAGE_WRITE_IMPLEMENTATION) diff --git a/source/strl_fn.h b/source/strl_fn.h index 4ef350f..55701c6 100644 --- a/source/strl_fn.h +++ b/source/strl_fn.h @@ -1,11 +1,10 @@ /* header file for BSD strlcat and strlcpy */ -#ifndef __STRLFUNCS_H -#define __STRLFUNCS_H +#ifndef spingle__strl_fn_h +#define spingle__strl_fn_h /* use our own copies of strlcpy and strlcat taken from OpenBSD */ extern size_t q_strlcpy(char *dst, const char *src, size_t size); extern size_t q_strlcat(char *dst, const char *src, size_t size); -#endif /* __STRLFUNCS_H */ - +#endif diff --git a/source/sys.h b/source/sys.h index 8ba7cc8..ec1805b 100644 --- a/source/sys.h +++ b/source/sys.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_SYS_H -#define _QUAKE_SYS_H +#ifndef spingle__sys_h +#define spingle__sys_h // sys.h -- non-portable functions @@ -62,5 +62,4 @@ void Sys_Sleep(uint32_t msecs); void Sys_SendKeyEvents(void); // Perform Key_Event () callbacks until the input que is empty -#endif /* _QUAKE_SYS_H */ - +#endif diff --git a/source/unix/net_udp.h b/source/unix/net_udp.h index 8d3bc19..46e48e7 100644 --- a/source/unix/net_udp.h +++ b/source/unix/net_udp.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __net_udp_h -#define __net_udp_h +#ifndef spingle__net_udp_h +#define spingle__net_udp_h sys_socket_t UDP_Init(void); void UDP_Shutdown(void); @@ -41,5 +41,4 @@ int32_t UDP_AddrCompare(struct qsockaddr *addr1, struct qsockaddr *addr2); int32_t UDP_GetSocketPort(struct qsockaddr *addr); int32_t UDP_SetSocketPort(struct qsockaddr *addr, int32_t port); -#endif /* __net_udp_h */ - +#endif diff --git a/source/vid.h b/source/vid.h index 908e3e3..40b414a 100644 --- a/source/vid.h +++ b/source/vid.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __VID_DEFS_H -#define __VID_DEFS_H +#ifndef spingle__vid_h +#define spingle__vid_h // vid.h -- video driver defs @@ -89,5 +89,4 @@ bool VID_HasMouseOrInputFocus(void); bool VID_IsMinimized(void); void VID_Lock(void); -#endif /* __VID_DEFS_H */ - +#endif diff --git a/source/view.h b/source/view.h index f34f6b6..b064317 100644 --- a/source/view.h +++ b/source/view.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_VIEW_H -#define _QUAKE_VIEW_H +#ifndef spingle__view_h +#define spingle__view_h extern cvar_t vid_gamma; extern cvar_t vid_contrast; @@ -35,5 +35,4 @@ void V_UpdateBlend(void); float V_CalcRoll(vec3_t angles, vec3_t velocity); //void V_UpdatePalette (void); //johnfitz -#endif /* _QUAKE_VIEW_H */ - +#endif diff --git a/source/wad.h b/source/wad.h index d06e68a..67677f2 100644 --- a/source/wad.h +++ b/source/wad.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_WAD_H -#define _QUAKE_WAD_H +#ifndef spingle__wad_h +#define spingle__wad_h //=============== // TYPES @@ -78,5 +78,4 @@ void *W_GetLumpNum(int32_t num); void SwapPic(qpic_t *pic); -#endif /* _QUAKE_WAD_H */ - +#endif diff --git a/source/windows/net_wins.h b/source/windows/net_wins.h index 172a40d..a65ddcb 100644 --- a/source/windows/net_wins.h +++ b/source/windows/net_wins.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __NET_WINSOCK_H -#define __NET_WINSOCK_H +#ifndef spingle__net_wins_h +#define spingle__net_wins_h sys_socket_t WINS_Init(void); void WINS_Shutdown(void); @@ -41,5 +41,4 @@ int32_t WINS_AddrCompare(struct qsockaddr *addr1, struct qsockaddr *addr2); int32_t WINS_GetSocketPort(struct qsockaddr *addr); int32_t WINS_SetSocketPort(struct qsockaddr *addr, int32_t port); -#endif /* __NET_WINSOCK_H */ - +#endif diff --git a/source/windows/net_wipx.h b/source/windows/net_wipx.h index 23522fd..098a7ae 100644 --- a/source/windows/net_wipx.h +++ b/source/windows/net_wipx.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __NET_WINIPX_H -#define __NET_WINIPX_H +#ifndef spingle__net_wipx_h +#define spingle__net_wipx_h sys_socket_t WIPX_Init(void); void WIPX_Shutdown(void); @@ -41,5 +41,4 @@ int32_t WIPX_AddrCompare(struct qsockaddr *addr1, struct qsockaddr *addr2); int32_t WIPX_GetSocketPort(struct qsockaddr *addr); int32_t WIPX_SetSocketPort(struct qsockaddr *addr, int32_t port); -#endif /* __NET_WINIPX_H */ - +#endif diff --git a/source/resource.h b/source/windows/resource.h similarity index 82% rename from source/resource.h rename to source/windows/resource.h index b9c5af9..f9a8868 100644 --- a/source/resource.h +++ b/source/windows/resource.h @@ -1,10 +1,9 @@ -#ifndef _QUAKE_RESOURCE_H -#define _QUAKE_RESOURCE_H +#ifndef spingle__resource_h +#define spingle__resource_h //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by winquake.rc -// #define IDS_STRING1 1 #define IDI_ICON2 1 #define IDD_DIALOG1 108 @@ -12,9 +11,8 @@ #define IDC_PROGRESS 1000 // Next default values for new objects -// #if defined(APSTUDIO_INVOKED) -#ifndef APSTUDIO_READONLY_SYMBOLS +#if !defined(APSTUDIO_READONLY_SYMBOLS) #define _APS_NEXT_RESOURCE_VALUE 113 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1004 @@ -22,5 +20,4 @@ #endif #endif -#endif /* _QUAKE_RESOURCE_H */ - +#endif diff --git a/source/windows/wsaerror.h b/source/windows/wsaerror.h index 1fc24b2..5c9afac 100644 --- a/source/windows/wsaerror.h +++ b/source/windows/wsaerror.h @@ -6,7 +6,7 @@ * http://www.sockets.com/err_lst1.htm */ -#ifndef __wsaerr_static +#if !defined(__wsaerr_static) #define __wsaerr_static static #endif /* static */ diff --git a/source/world.h b/source/world.h index dea0d23..a755eb2 100644 --- a/source/world.h +++ b/source/world.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _QUAKE_WORLD_H -#define _QUAKE_WORLD_H +#ifndef spingle__world_h +#define spingle__world_h typedef struct { @@ -83,5 +83,4 @@ trace_t SV_Move(vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int32_t type bool SV_RecursiveHullCheck(hull_t *hull, int32_t num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace); -#endif /* _QUAKE_WORLD_H */ - +#endif diff --git a/source/zone.h b/source/zone.h index e2d12da..ae214ea 100644 --- a/source/zone.h +++ b/source/zone.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __ZZONE_H -#define __ZZONE_H +#ifndef spingle__zone_h +#define spingle__zone_h /* memory allocation @@ -130,5 +130,4 @@ void *Cache_Alloc(cache_user_t *c, int32_t size, const char *name); void Cache_Report(void); -#endif /* __ZZONE_H */ - +#endif