marrub
/
spingle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix header defines

master
an 2019-12-02 10:00:56 -05:00
parent 55aef43175
commit 2473e7d835
66 changed files with 199 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

4
source/arch_def.h
View File

@ -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

7
source/bgmusic.h
View File

@ -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

7
source/bspfile.h
View File

@ -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

7
source/cdaudio.h
View File

@ -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

6
source/cfgfile.h
View File

@ -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

7
source/client.h
View File

@ -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

7
source/cmd.h
View File

@ -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

7
source/common.h
View File

@ -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

7
source/console.h
View File

@ -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

7
source/crc.h
View File

@ -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

7
source/cvar.h
View File

@ -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

7
source/draw.h
View File

@ -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

6
source/filenames.h
View File

@ -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 <string.h>
@ -80,4 +80,4 @@ static inline char *FIND_LAST_DIRSEP(const char *_the_path)
}
#endif
#endif /* FILENAMES_H */
#endif

6
source/gl_model.h
View File

@ -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

7
source/gl_texmgr.h
View File

@ -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

7
source/glquake.h
View File

@ -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

7
source/image.h
View File

@ -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

7
source/input.h
View File

@ -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

7
source/keys.h
View File

@ -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

6
source/lodepng.h
View File

@ -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 <string.h> /*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

28
source/mathlib.h
View File

@ -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

7
source/menu.h
View File

@ -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

13
source/modelgen.h
View File

@ -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

7
source/net.h
View File

@ -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

7
source/net_defs.h
View File

@ -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

7
source/net_dgrm.h
View File

@ -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

7
source/net_loop.h
View File

@ -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

7
source/net_sys.h
View File

@ -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 <sys/types.h>
#include <errno.h>
@ -127,5 +127,4 @@ _Static_assert(offsetof(struct sockaddr, sa_family) == SA_FAM_OFFSET,
#endif /* MAXHOSTNAMELEN */
#endif /* __NET_SYS_H__ */
#endif

7
source/platform.h
View File

@ -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

7
source/pr_comp.h
View File

@ -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

6
source/progdefs.h
View File

@ -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

7
source/progs.h
View File

@ -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

9
source/protocol.h
View File

@ -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

6
source/q_ctype.h
View File

@ -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

8
source/q_sound.h
View File

@ -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

6
source/q_stdinc.h
View File

@ -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

9
source/quakedef.h
View File

@ -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

7
source/render.h
View File

@ -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

7
source/sbar.h
View File

@ -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

7
source/screen.h
View File

@ -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

7
source/server.h
View File

@ -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

7
source/snd_codec.h
View File

@ -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

7
source/snd_codeci.h
View File

@ -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

7
source/snd_flac.h
View File

@ -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

4
source/snd_mikmod.c
View File

@ -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

7
source/snd_mikmod.h
View File

@ -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

7
source/snd_mp3.h
View File

@ -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

7
source/snd_opus.h
View File

@ -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

7
source/snd_umx.h
View File

@ -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

2
source/snd_vorbis.c
View File

@ -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,

7
source/snd_vorbis.h
View File

@ -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

13
source/spritegn.h
View File

@ -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

6
source/stb_image_write.h
View File

@ -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)

7
source/strl_fn.h
View File

@ -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

7
source/sys.h
View File

@ -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

7
source/unix/net_udp.h
View File

@ -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

7
source/vid.h
View File

@ -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

7
source/view.h
View File

@ -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

7
source/wad.h
View File

@ -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

7
source/windows/net_wins.h
View File

@ -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

7
source/windows/net_wipx.h
View File

@ -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

11
source/resource.h → source/windows/resource.h
View File

@ -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

2
source/windows/wsaerror.h
View File

@ -6,7 +6,7 @@
* http://www.sockets.com/err_lst1.htm
*/
#ifndef __wsaerr_static
#if !defined(__wsaerr_static)
#define __wsaerr_static static
#endif /* static */

7
source/world.h
View File

@ -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

7
source/zone.h
View File

@ -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