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

replace qboolean with stdbool

master
an 2019-11-25 18:28:38 -05:00
parent 5d5dc61d1b
commit 3a9d2a8db0
90 changed files with 361 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/bgmusic.c
View File

@ -29,10 +29,10 @@
#define MUSIC_DIRNAME "music" #define MUSIC_DIRNAME "music"
qboolean bgmloop; bool bgmloop;
cvar_t bgm_extmusic = {"bgm_extmusic", "1", CVAR_ARCHIVE}; cvar_t bgm_extmusic = {"bgm_extmusic", "1", CVAR_ARCHIVE};
static qboolean no_extmusic= false; static bool no_extmusic= false;
static float old_volume = -1.0f; static float old_volume = -1.0f;
typedef enum _bgm_player typedef enum _bgm_player
@ -123,7 +123,7 @@ static void BGM_Stop_f (void)
BGM_Stop(); BGM_Stop();
} }
qboolean BGM_Init (void) bool BGM_Init (void)
{ {
music_handler_t *handlers = NULL; music_handler_t *handlers = NULL;
int i; int i;
@ -278,7 +278,7 @@ void BGM_Play (const char *filename)
Con_Printf("Couldn't handle music file %s\n", filename); Con_Printf("Couldn't handle music file %s\n", filename);
} }
void BGM_PlayCDtrack (byte track, qboolean looping) void BGM_PlayCDtrack (byte track, bool looping)
{ {
/* instead of searching by the order of music_handlers, do so by /* instead of searching by the order of music_handlers, do so by
* the order of searchpath priority: the file from the searchpath * the order of searchpath priority: the file from the searchpath
@ -371,7 +371,7 @@ void BGM_Resume (void)
static void BGM_UpdateStream (void) static void BGM_UpdateStream (void)
{ {
qboolean did_rewind = false; bool did_rewind = false;
int res; /* Number of bytes read. */ int res; /* Number of bytes read. */
int bufferSamples; int bufferSamples;
int fileSamples; int fileSamples;

6
source/bgmusic.h
View File

@ -25,10 +25,10 @@
#ifndef _BGMUSIC_H_ #ifndef _BGMUSIC_H_
#define _BGMUSIC_H_ #define _BGMUSIC_H_
extern qboolean bgmloop; extern bool bgmloop;
extern cvar_t bgm_extmusic; extern cvar_t bgm_extmusic;
qboolean BGM_Init (void); bool BGM_Init (void);
void BGM_Shutdown (void); void BGM_Shutdown (void);
void BGM_Play (const char *filename); void BGM_Play (const char *filename);
@ -37,7 +37,7 @@ void BGM_Update (void);
void BGM_Pause (void); void BGM_Pause (void);
void BGM_Resume (void); void BGM_Resume (void);
void BGM_PlayCDtrack (byte track, qboolean looping); void BGM_PlayCDtrack (byte track, bool looping);
#endif /* _BGMUSIC_H_ */ #endif /* _BGMUSIC_H_ */

2
source/cd_null.c
View File

@ -20,7 +20,7 @@
#include "quakedef.h" #include "quakedef.h"
int CDAudio_Play(byte track, qboolean looping) int CDAudio_Play(byte track, bool looping)
{ {
(void)track, (void)looping; (void)track, (void)looping;
return -1; return -1;

20
source/cd_sdl.c
View File

@ -34,18 +34,18 @@
#include "quakedef.h" #include "quakedef.h"
#include "cdaudio.h" #include "cdaudio.h"
static qboolean cdValid = false; static bool cdValid = false;
static qboolean playing = false; static bool playing = false;
static qboolean wasPlaying = false; static bool wasPlaying = false;
static qboolean enabled = true; static bool enabled = true;
static qboolean playLooping = false; static bool playLooping = false;
static byte remap[100]; static byte remap[100];
static byte playTrack; static byte playTrack;
static double endOfTrack = -1.0, pausetime = -1.0; static double endOfTrack = -1.0, pausetime = -1.0;
static SDL_CD *cd_handle; static SDL_CD *cd_handle;
static int cd_dev = -1; static int cd_dev = -1;
static float old_cdvolume; static float old_cdvolume;
static qboolean hw_vol_works = true; static bool hw_vol_works = true;
static void CDAudio_Eject(void) static void CDAudio_Eject(void)
@ -75,7 +75,7 @@ static int CDAudio_GetAudioDiskInfo(void)
return 0; return 0;
} }
int CDAudio_Play(byte track, qboolean looping) int CDAudio_Play(byte track, bool looping)
{ {
int len_m, len_s, len_f; int len_m, len_s, len_f;
@ -361,21 +361,21 @@ static void CD_f (void)
Con_Printf ("cd: unknown command \"%s\"\n", command); Con_Printf ("cd: unknown command \"%s\"\n", command);
} }
static qboolean CD_GetVolume (void *unused) static bool CD_GetVolume (void *unused)
{ {
/* FIXME: write proper code in here when SDL /* FIXME: write proper code in here when SDL
supports cdrom volume control some day. */ supports cdrom volume control some day. */
return false; return false;
} }
static qboolean CD_SetVolume (void *unused) static bool CD_SetVolume (void *unused)
{ {
/* FIXME: write proper code in here when SDL /* FIXME: write proper code in here when SDL
supports cdrom volume control some day. */ supports cdrom volume control some day. */
return false; return false;
} }
static qboolean CDAudio_SetVolume (float value) static bool CDAudio_SetVolume (float value)
{ {
if (!cd_handle || !enabled) if (!cd_handle || !enabled)
return false; return false;

2
source/cdaudio.h
View File

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __CDAUDIO_H #define __CDAUDIO_H
int CDAudio_Init (void); int CDAudio_Init (void);
int CDAudio_Play (byte track, qboolean looping); int CDAudio_Play (byte track, bool looping);
/* returns 0 for success, -1 for failure. */ /* returns 0 for success, -1 for failure. */
void CDAudio_Stop (void); void CDAudio_Stop (void);
void CDAudio_Pause (void); void CDAudio_Pause (void);

2
source/cfgfile.c
View File

@ -154,7 +154,7 @@ int CFG_OpenConfig (const char *cfg_name)
{ {
FILE *f; FILE *f;
long length; long length;
qboolean pak; bool pak;
CFG_CloseConfig (); CFG_CloseConfig ();

2
source/cl_demo.c
View File

@ -383,7 +383,7 @@ void CL_PlayDemo_f (void)
{ {
char name[MAX_OSPATH]; char name[MAX_OSPATH];
int i, c; int i, c;
qboolean neg; bool neg;
if (cmd_source != src_command) if (cmd_source != src_command)
return; return;

2
source/cl_input.c
View File

@ -176,7 +176,7 @@ Returns 0.25 if a key was pressed and released during the frame,
float CL_KeyState (kbutton_t *key) float CL_KeyState (kbutton_t *key)
{ {
float val; float val;
qboolean impulsedown, impulseup, down; bool impulsedown, impulseup, down;
impulsedown = key->state & 2; impulsedown = key->state & 2;
impulseup = key->state & 4; impulseup = key->state & 4;

4
source/cl_parse.c
View File

@ -89,7 +89,7 @@ const char *svc_strings[] =
//johnfitz //johnfitz
}; };
qboolean warn_about_nehahra_protocol; //johnfitz bool warn_about_nehahra_protocol; //johnfitz
extern vec3_t v_punchangles[2]; //johnfitz extern vec3_t v_punchangles[2]; //johnfitz
@ -424,7 +424,7 @@ void CL_ParseUpdate (int bits)
int i; int i;
qmodel_t *model; qmodel_t *model;
int modnum; int modnum;
qboolean forcelink; bool forcelink;
entity_t *ent; entity_t *ent;
int num; int num;
int skin; int skin;

16
source/client.h
View File

@ -112,14 +112,14 @@ typedef struct
// demo recording info must be here, because record is started before // demo recording info must be here, because record is started before
// entering a map (and clearing client_state_t) // entering a map (and clearing client_state_t)
qboolean demorecording; bool demorecording;
qboolean demoplayback; bool demoplayback;
// did the user pause demo playback? (separate from cl.paused because we don't // did the user pause demo playback? (separate from cl.paused because we don't
// want a svc_setpause inside the demo to actually pause demo playback). // want a svc_setpause inside the demo to actually pause demo playback).
qboolean demopaused; bool demopaused;
qboolean timedemo; bool timedemo;
int forcetrack; // -1 = use normal cd track int forcetrack; // -1 = use normal cd track
FILE *demofile; FILE *demofile;
int td_lastframe; // to meter out one message a frame int td_lastframe; // to meter out one message a frame
@ -173,16 +173,16 @@ typedef struct
// pitch drifting vars // pitch drifting vars
float idealpitch; float idealpitch;
float pitchvel; float pitchvel;
qboolean nodrift; bool nodrift;
float driftmove; float driftmove;
double laststop; double laststop;
float viewheight; float viewheight;
float crouch; // local amount for smoothing stepups float crouch; // local amount for smoothing stepups
qboolean paused; // send over by server bool paused; // send over by server
qboolean onground; bool onground;
qboolean inwater; bool inwater;
int intermission; // don't change view angle, full screen, etc int intermission; // don't change view angle, full screen, etc
int completed_time; // latched at intermission start int completed_time; // latched at intermission start

4
source/cmd.c
View File

@ -39,7 +39,7 @@ typedef struct cmdalias_s
cmdalias_t *cmd_alias; cmdalias_t *cmd_alias;
qboolean cmd_wait; bool cmd_wait;
//============================================================================= //=============================================================================
@ -721,7 +721,7 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function)
Cmd_Exists Cmd_Exists
============ ============
*/ */
qboolean Cmd_Exists (const char *cmd_name) bool Cmd_Exists (const char *cmd_name)
{ {
cmd_function_t *cmd; cmd_function_t *cmd;

2
source/cmd.h
View File

@ -88,7 +88,7 @@ void Cmd_AddCommand (const char *cmd_name, xcommand_t function);
// register commands and functions to call for them. // register commands and functions to call for them.
// The cmd_name is referenced later, so it should not be in temp memory // The cmd_name is referenced later, so it should not be in temp memory
qboolean Cmd_Exists (const char *cmd_name); bool Cmd_Exists (const char *cmd_name);
// used by the cvar code to check for cvar / command name overlap // used by the cvar code to check for cvar / command name overlap
const char *Cmd_CompleteCommand (const char *partial); const char *Cmd_CompleteCommand (const char *partial);

16
source/common.c
View File

@ -34,9 +34,9 @@ int safemode;
cvar_t registered = {"registered","1",CVAR_ROM}; /* set to correct value in COM_CheckRegistered() */ cvar_t registered = {"registered","1",CVAR_ROM}; /* set to correct value in COM_CheckRegistered() */
cvar_t cmdline = {"cmdline","",CVAR_ROM/*|CVAR_SERVERINFO*/}; /* sending cmdline upon CCREQ_RULE_INFO is evil */ cvar_t cmdline = {"cmdline","",CVAR_ROM/*|CVAR_SERVERINFO*/}; /* sending cmdline upon CCREQ_RULE_INFO is evil */
static qboolean com_modified; // set true if using non-id files static bool com_modified; // set true if using non-id files
qboolean fitzmode; bool fitzmode;
static void COM_Path_f (void); static void COM_Path_f (void);
@ -56,7 +56,7 @@ char **com_argv;
#define CMDLINE_LENGTH 256 /* johnfitz -- mirrored in cmd.c */ #define CMDLINE_LENGTH 256 /* johnfitz -- mirrored in cmd.c */
char com_cmdline[CMDLINE_LENGTH]; char com_cmdline[CMDLINE_LENGTH];
qboolean standard_quake = true, rogue, hipnotic; bool standard_quake = true, rogue, hipnotic;
// this graphic needs to be in the pak file to use registered features // this graphic needs to be in the pak file to use registered features
static uint16_t pop[] = static uint16_t pop[] =
@ -555,7 +555,7 @@ float Q_atof (const char *str)
============================================================================ ============================================================================
*/ */
qboolean host_bigendian; bool host_bigendian;
int16_t (*BigShort) (int16_t l); int16_t (*BigShort) (int16_t l);
int16_t (*LittleShort) (int16_t l); int16_t (*LittleShort) (int16_t l);
@ -756,7 +756,7 @@ void MSG_WriteAngle16 (sizebuf_t *sb, float f, uint32_t flags)
// reading functions // reading functions
// //
int msg_readcount; int msg_readcount;
qboolean msg_badread; bool msg_badread;
void MSG_BeginReading (void) void MSG_BeginReading (void)
{ {
@ -1711,7 +1711,7 @@ COM_FileExists
Returns whether the file is found in the quake filesystem. Returns whether the file is found in the quake filesystem.
=========== ===========
*/ */
qboolean COM_FileExists (const char *filename, uint32_t *path_id) bool COM_FileExists (const char *filename, uint32_t *path_id)
{ {
int ret = COM_FindFile (filename, NULL, NULL, path_id); int ret = COM_FindFile (filename, NULL, NULL, path_id);
return (ret == -1) ? false : true; return (ret == -1) ? false : true;
@ -2026,7 +2026,7 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
searchpath_t *search; searchpath_t *search;
pack_t *pak, *qspak; pack_t *pak, *qspak;
char pakfile[MAX_OSPATH]; char pakfile[MAX_OSPATH];
qboolean been_here = false; bool been_here = false;
q_strlcpy (com_gamedir, va("%s/%s", base, dir), sizeof(com_gamedir)); q_strlcpy (com_gamedir, va("%s/%s", base, dir), sizeof(com_gamedir));
@ -2051,7 +2051,7 @@ _add_path:
if (i != 0 || path_id != 1 || fitzmode) if (i != 0 || path_id != 1 || fitzmode)
qspak = NULL; qspak = NULL;
else { else {
qboolean old = com_modified; bool old = com_modified;
if (been_here) base = host_parms->userdir; if (been_here) base = host_parms->userdir;
q_snprintf (pakfile, sizeof(pakfile), "%s/quakespasm.pak", base); q_snprintf (pakfile, sizeof(pakfile), "%s/quakespasm.pak", base);
qspak = COM_LoadPackFile (pakfile); qspak = COM_LoadPackFile (pakfile);

18
source/common.h
View File

@ -49,8 +49,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
typedef struct sizebuf_s typedef struct sizebuf_s
{ {
qboolean allowoverflow; // if false, do a Sys_Error bool allowoverflow; // if false, do a Sys_Error
qboolean overflowed; // set to true if the buffer size failed bool overflowed; // set to true if the buffer size failed
byte *data; byte *data;
int maxsize; int maxsize;
int cursize; int cursize;
@ -83,7 +83,7 @@ void InsertLinkAfter (link_t *l, link_t *after);
//============================================================================ //============================================================================
extern qboolean host_bigendian; extern bool host_bigendian;
extern int16_t (*BigShort) (int16_t l); extern int16_t (*BigShort) (int16_t l);
extern int16_t (*LittleShort) (int16_t l); extern int16_t (*LittleShort) (int16_t l);
@ -105,7 +105,7 @@ void MSG_WriteAngle (sizebuf_t *sb, float f, uint32_t flags);
void MSG_WriteAngle16 (sizebuf_t *sb, float f, uint32_t flags); //johnfitz void MSG_WriteAngle16 (sizebuf_t *sb, float f, uint32_t flags); //johnfitz
extern int msg_readcount; extern int msg_readcount;
extern qboolean msg_badread; // set if a read goes beyond end of message extern bool msg_badread; // set if a read goes beyond end of message
void MSG_BeginReading (void); void MSG_BeginReading (void);
int MSG_ReadChar (void); int MSG_ReadChar (void);
@ -155,7 +155,7 @@ extern int q_vsnprintf(char *str, size_t size, const char *format, va_list args)
//============================================================================ //============================================================================
extern char com_token[1024]; extern char com_token[1024];
extern qboolean com_eof; extern bool com_eof;
const char *COM_Parse (const char *data); const char *COM_Parse (const char *data);
@ -231,7 +231,7 @@ extern int file_from_pak; // global indicating that file came from a pak
void COM_WriteFile (const char *filename, const void *data, int len); void COM_WriteFile (const char *filename, const void *data, int len);
int COM_OpenFile (const char *filename, int *handle, uint32_t *path_id); int COM_OpenFile (const char *filename, int *handle, uint32_t *path_id);
int COM_FOpenFile (const char *filename, FILE **file, uint32_t *path_id); int COM_FOpenFile (const char *filename, FILE **file, uint32_t *path_id);
qboolean COM_FileExists (const char *filename, uint32_t *path_id); bool COM_FileExists (const char *filename, uint32_t *path_id);
void COM_CloseFile (int h); void COM_CloseFile (int h);
// these procedures open a file using COM_FindFile and loads it into a proper // these procedures open a file using COM_FindFile and loads it into a proper
@ -281,7 +281,7 @@ const char *COM_ParseStringNewline(const char *buffer);
typedef struct _fshandle_t typedef struct _fshandle_t
{ {
FILE *file; FILE *file;
qboolean pak; /* is the file read from a pak */ bool pak; /* is the file read from a pak */
long start; /* file or data start position */ long start; /* file or data start position */
long length; /* file or data size */ long length; /* file or data size */
long pos; /* current position relative to start */ long pos; /* current position relative to start */
@ -300,8 +300,8 @@ long FS_filelength (fshandle_t *fh);
extern struct cvar_s registered; extern struct cvar_s registered;
extern qboolean standard_quake, rogue, hipnotic; extern bool standard_quake, rogue, hipnotic;
extern qboolean fitzmode; extern bool fitzmode;
/* if true, run in fitzquake mode disabling custom quakespasm hacks */ /* if true, run in fitzquake mode disabling custom quakespasm hacks */
#endif /* _Q_COMMON_H */ #endif /* _Q_COMMON_H */

16
source/console.c
View File

@ -41,7 +41,7 @@ float con_cursorspeed = 4;
int con_buffersize; //johnfitz -- user can now override default int con_buffersize; //johnfitz -- user can now override default
qboolean con_forcedup; // because no entities to refresh bool con_forcedup; // because no entities to refresh
int con_totallines; // total lines in console scrollback int con_totallines; // total lines in console scrollback
int con_backscroll; // lines up from bottom to display int con_backscroll; // lines up from bottom to display
@ -60,9 +60,9 @@ float con_times[NUM_CON_TIMES]; // realtime time the line was generated
int con_vislines; int con_vislines;
qboolean con_debuglog = false; bool con_debuglog = false;
qboolean con_initialized; bool con_initialized;
/* /*
@ -373,7 +373,7 @@ static void Con_Print (const char *txt)
int c, l; int c, l;
static int cr; static int cr;
int mask; int mask;
qboolean boundary; bool boundary;
//con_backscroll = 0; //johnfitz -- better console scrolling //con_backscroll = 0; //johnfitz -- better console scrolling
@ -483,7 +483,7 @@ void Con_Printf (const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
char msg[MAXPRINTMSG]; char msg[MAXPRINTMSG];
static qboolean inupdate; static bool inupdate;
va_start (argptr, fmt); va_start (argptr, fmt);
q_vsnprintf (msg, sizeof(msg), fmt, argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
@ -716,7 +716,7 @@ typedef struct tab_s
tab_t *tablist; tab_t *tablist;
//defs from elsewhere //defs from elsewhere
extern qboolean keydown[256]; extern bool keydown[256];
typedef struct cmd_function_s typedef struct cmd_function_s
{ {
struct cmd_function_s *next; struct cmd_function_s *next;
@ -744,7 +744,7 @@ tablist is a doubly-linked loop, alphabetized by name
// bash_partial is the string that can be expanded, // bash_partial is the string that can be expanded,
// aka Linux Bash shell. -- S.A. // aka Linux Bash shell. -- S.A.
static char bash_partial[80]; static char bash_partial[80];
static qboolean bash_singlematch; static bool bash_singlematch;
void AddToTabList (const char *name, const char *type) void AddToTabList (const char *name, const char *type)
{ {
@ -1180,7 +1180,7 @@ Draws the console with the solid background
The typing input line at the bottom should only be drawn if typing is allowed The typing input line at the bottom should only be drawn if typing is allowed
================ ================
*/ */
void Con_DrawConsole (int lines, qboolean drawinput) void Con_DrawConsole (int lines, bool drawinput)
{ {
int i, x, y, j, sb, rows; int i, x, y, j, sb, rows;
const char *text; const char *text;

6
source/console.h
View File

@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
extern int con_totallines; extern int con_totallines;
extern int con_backscroll; extern int con_backscroll;
extern qboolean con_forcedup; // because no entities to refresh extern bool con_forcedup; // because no entities to refresh
extern qboolean con_initialized; extern bool con_initialized;
extern byte *con_chars; extern byte *con_chars;
extern char con_lastcenterstring[]; //johnfitz extern char con_lastcenterstring[]; //johnfitz
@ -38,7 +38,7 @@ void Con_DrawCharacter (int cx, int line, int num);
void Con_CheckResize (void); void Con_CheckResize (void);
void Con_Init (void); void Con_Init (void);
void Con_DrawConsole (int lines, qboolean drawinput); void Con_DrawConsole (int lines, bool drawinput);
void Con_Printf (const char *fmt, ...) FUNC_PRINTF(1,2); void Con_Printf (const char *fmt, ...) FUNC_PRINTF(1,2);
void Con_DWarning (const char *fmt, ...) FUNC_PRINTF(1,2); //ericw void Con_DWarning (const char *fmt, ...) FUNC_PRINTF(1,2); //ericw
void Con_Warning (const char *fmt, ...) FUNC_PRINTF(1,2); //johnfitz void Con_Warning (const char *fmt, ...) FUNC_PRINTF(1,2); //johnfitz

4
source/cvar.c
View File

@ -532,7 +532,7 @@ Adds a freestanding variable to the variable list.
void Cvar_RegisterVariable (cvar_t *variable) void Cvar_RegisterVariable (cvar_t *variable)
{ {
char value[512]; char value[512];
qboolean set_rom; bool set_rom;
cvar_t *cursor,*prev; //johnfitz -- sorted list insert cvar_t *cursor,*prev; //johnfitz -- sorted list insert
// first check to see if it has already been defined // first check to see if it has already been defined
@ -610,7 +610,7 @@ Cvar_Command
Handles variable inspection and changing from the console Handles variable inspection and changing from the console
============ ============
*/ */
qboolean Cvar_Command (void) bool Cvar_Command (void)
{ {
cvar_t *v; cvar_t *v;

2
source/cvar.h
View File

@ -117,7 +117,7 @@ float Cvar_VariableValue (const char *var_name);
const char *Cvar_VariableString (const char *var_name); const char *Cvar_VariableString (const char *var_name);
// returns an empty string if not defined // returns an empty string if not defined
qboolean Cvar_Command (void); bool Cvar_Command (void);
// called by Cmd_ExecuteString when Cmd_Argv(0) doesn't match a known // called by Cmd_ExecuteString when Cmd_Argv(0) doesn't match a known
// command. Returns true if the command was a variable reference that // command. Returns true if the command was a variable reference that
// was handled. (print or change) // was handled. (print or change)

2
source/gl_draw.c
View File

@ -136,7 +136,7 @@ byte menuplyr_pixels[4096];
int scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH]; int scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH];
byte scrap_texels[MAX_SCRAPS][BLOCK_WIDTH*BLOCK_HEIGHT]; //johnfitz -- removed *4 after BLOCK_HEIGHT byte scrap_texels[MAX_SCRAPS][BLOCK_WIDTH*BLOCK_HEIGHT]; //johnfitz -- removed *4 after BLOCK_HEIGHT
qboolean scrap_dirty; bool scrap_dirty;
gltexture_t *scrap_textures[MAX_SCRAPS]; //johnfitz gltexture_t *scrap_textures[MAX_SCRAPS]; //johnfitz

2
source/gl_mesh.c
View File

@ -35,7 +35,7 @@ ALIAS MODEL DISPLAY LIST GENERATION
qmodel_t *aliasmodel; qmodel_t *aliasmodel;
aliashdr_t *paliashdr; aliashdr_t *paliashdr;
int used[8192]; // qboolean int used[8192]; // bool
// the command list holds counts and s/t values that are valid for // the command list holds counts and s/t values that are valid for
// every frame // every frame

14
source/gl_model.c
View File

@ -32,7 +32,7 @@ char loadname[32]; // for hunk tags
void Mod_LoadSpriteModel (qmodel_t *mod, void *buffer); void Mod_LoadSpriteModel (qmodel_t *mod, void *buffer);
void Mod_LoadBrushModel (qmodel_t *mod, void *buffer); void Mod_LoadBrushModel (qmodel_t *mod, void *buffer);
void Mod_LoadAliasModel (qmodel_t *mod, void *buffer); void Mod_LoadAliasModel (qmodel_t *mod, void *buffer);
qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash); qmodel_t *Mod_LoadModel (qmodel_t *mod, bool crash);
cvar_t external_ents = {"external_ents", "1", CVAR_ARCHIVE}; cvar_t external_ents = {"external_ents", "1", CVAR_ARCHIVE};
@ -302,7 +302,7 @@ Mod_LoadModel
Loads a model into the cache Loads a model into the cache
================== ==================
*/ */
qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash) qmodel_t *Mod_LoadModel (qmodel_t *mod, bool crash)
{ {
byte *buf; byte *buf;
byte stackbuf[1024]; // avoid dirtying the cache heap byte stackbuf[1024]; // avoid dirtying the cache heap
@ -378,7 +378,7 @@ Mod_ForName
Loads in a model for the given name Loads in a model for the given name
================== ==================
*/ */
qmodel_t *Mod_ForName (const char *name, qboolean crash) qmodel_t *Mod_ForName (const char *name, bool crash)
{ {
qmodel_t *mod; qmodel_t *mod;
@ -403,7 +403,7 @@ byte *mod_base;
Mod_CheckFullbrights -- johnfitz Mod_CheckFullbrights -- johnfitz
================= =================
*/ */
qboolean Mod_CheckFullbrights (byte *pixels, int count) bool Mod_CheckFullbrights (byte *pixels, int count)
{ {
int i; int i;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
@ -1141,7 +1141,7 @@ void Mod_CalcSurfaceBounds (msurface_t *s)
Mod_LoadFaces Mod_LoadFaces
================= =================
*/ */
void Mod_LoadFaces (lump_t *l, qboolean bsp2) void Mod_LoadFaces (lump_t *l, bool bsp2)
{ {
dsface_t *ins; dsface_t *ins;
dlface_t *inl; dlface_t *inl;
@ -1609,7 +1609,7 @@ void Mod_LoadLeafs (lump_t *l, int bsp2)
Mod_LoadClipnodes Mod_LoadClipnodes
================= =================
*/ */
void Mod_LoadClipnodes (lump_t *l, qboolean bsp2) void Mod_LoadClipnodes (lump_t *l, bool bsp2)
{ {
dsclipnode_t *ins; dsclipnode_t *ins;
dlclipnode_t *inl; dlclipnode_t *inl;
@ -2449,7 +2449,7 @@ void Mod_CalcAliasBounds (aliashdr_t *a)
loadmodel->ymaxs[2] = loadmodel->maxs[2]; loadmodel->ymaxs[2] = loadmodel->maxs[2];
} }
static qboolean static bool
nameInList(const char *list, const char *name) nameInList(const char *list, const char *name)
{ {
const char *s; const char *s;

14
source/gl_model.h
View File

@ -89,7 +89,7 @@ typedef struct texture_s
struct gltexture_s *gltexture; //johnfitz -- pointer to gltexture struct gltexture_s *gltexture; //johnfitz -- pointer to gltexture
struct gltexture_s *fullbright; //johnfitz -- fullbright mask texture struct gltexture_s *fullbright; //johnfitz -- fullbright mask texture
struct gltexture_s *warpimage; //johnfitz -- for water animation struct gltexture_s *warpimage; //johnfitz -- for water animation
qboolean update_warp; //johnfitz -- update warp this frame bool update_warp; //johnfitz -- update warp this frame
struct msurface_s *texturechains[2]; // for texture chains struct msurface_s *texturechains[2]; // for texture chains
int anim_total; // total tenths in sequence ( 0 = no) int anim_total; // total tenths in sequence ( 0 = no)
int anim_min, anim_max; // time for this frame min <=time< max int anim_min, anim_max; // time for this frame min <=time< max
@ -141,7 +141,7 @@ typedef struct glpoly_s
typedef struct msurface_s typedef struct msurface_s
{ {
int visframe; // should be drawn when node is crossed int visframe; // should be drawn when node is crossed
qboolean culled; // johnfitz -- for frustum culling bool culled; // johnfitz -- for frustum culling
float mins[3]; // johnfitz -- for frustum culling float mins[3]; // johnfitz -- for frustum culling
float maxs[3]; // johnfitz -- for frustum culling float maxs[3]; // johnfitz -- for frustum culling
@ -171,7 +171,7 @@ typedef struct msurface_s
int lightmaptexturenum; int lightmaptexturenum;
byte styles[MAXLIGHTMAPS]; byte styles[MAXLIGHTMAPS];
int cached_light[MAXLIGHTMAPS]; // values currently used in lightmap int cached_light[MAXLIGHTMAPS]; // values currently used in lightmap
qboolean cached_dlight; // true if dynamic light in cache bool cached_dlight; // true if dynamic light in cache
byte *samples; // [numstyles*surfsize] byte *samples; // [numstyles*surfsize]
} msurface_t; } msurface_t;
@ -411,7 +411,7 @@ typedef struct qmodel_s
char name[MAX_QPATH]; char name[MAX_QPATH];
uint32_t path_id; // path id of the game directory uint32_t path_id; // path id of the game directory
// that this model came from // that this model came from
qboolean needload; // bmodels and sprites don't cache normally bool needload; // bmodels and sprites don't cache normally
modtype_t type; modtype_t type;
int numframes; int numframes;
@ -430,7 +430,7 @@ typedef struct qmodel_s
// //
// solid volume for clipping // solid volume for clipping
// //
qboolean clipbox; bool clipbox;
vec3_t clipmins, clipmaxs; vec3_t clipmins, clipmaxs;
// //
@ -480,7 +480,7 @@ typedef struct qmodel_s
byte *lightdata; byte *lightdata;
char *entities; char *entities;
qboolean viswarn; // for Mod_DecompressVis() bool viswarn; // for Mod_DecompressVis()
int bspversion; int bspversion;
@ -506,7 +506,7 @@ typedef struct qmodel_s
void Mod_Init (void); void Mod_Init (void);
void Mod_ClearAll (void); void Mod_ClearAll (void);
void Mod_ResetAll (void); // for gamedir changes (Host_Game_f) void Mod_ResetAll (void); // for gamedir changes (Host_Game_f)
qmodel_t *Mod_ForName (const char *name, qboolean crash); qmodel_t *Mod_ForName (const char *name, bool crash);
void *Mod_Extradata (qmodel_t *mod); // handles caching void *Mod_Extradata (qmodel_t *mod); // handles caching
void Mod_TouchModel (const char *name); void Mod_TouchModel (const char *name);

10
source/gl_rmain.c
View File

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h" #include "quakedef.h"
qboolean r_cache_thrash; // compatability bool r_cache_thrash; // compatability
vec3_t modelorg, r_entorigin; vec3_t modelorg, r_entorigin;
entity_t *currententity; entity_t *currententity;
@ -110,7 +110,7 @@ cvar_t r_slimealpha = {"r_slimealpha","0",CVAR_NONE};
float map_wateralpha, map_lavaalpha, map_telealpha, map_slimealpha; float map_wateralpha, map_lavaalpha, map_telealpha, map_slimealpha;
qboolean r_drawflat_cheatsafe, r_fullbright_cheatsafe, r_lightmap_cheatsafe, r_drawworld_cheatsafe; //johnfitz bool r_drawflat_cheatsafe, r_fullbright_cheatsafe, r_lightmap_cheatsafe, r_drawworld_cheatsafe; //johnfitz
cvar_t r_scale = {"r_scale", "1", CVAR_ARCHIVE}; cvar_t r_scale = {"r_scale", "1", CVAR_ARCHIVE};
@ -268,7 +268,7 @@ R_CullBox -- johnfitz -- replaced with new function from lordhavoc
Returns true if the box is completely outside the frustum Returns true if the box is completely outside the frustum
================= =================
*/ */
qboolean R_CullBox (vec3_t emins, vec3_t emaxs) bool R_CullBox (vec3_t emins, vec3_t emaxs)
{ {
int i; int i;
mplane_t *p; mplane_t *p;
@ -319,7 +319,7 @@ qboolean R_CullBox (vec3_t emins, vec3_t emaxs)
R_CullModelForEntity -- johnfitz -- uses correct bounds based on rotation R_CullModelForEntity -- johnfitz -- uses correct bounds based on rotation
=============== ===============
*/ */
qboolean R_CullModelForEntity (entity_t *e) bool R_CullModelForEntity (entity_t *e)
{ {
vec3_t mins, maxs; vec3_t mins, maxs;
@ -616,7 +616,7 @@ void R_SetupView (void)
R_DrawEntitiesOnList R_DrawEntitiesOnList
============= =============
*/ */
void R_DrawEntitiesOnList (qboolean alphapass) //johnfitz -- added parameter void R_DrawEntitiesOnList (bool alphapass) //johnfitz -- added parameter
{ {
int i; int i;

4
source/gl_rmisc.c
View File

@ -456,7 +456,7 @@ void D_FlushCaches (void)
static GLuint gl_programs[16]; static GLuint gl_programs[16];
static int gl_num_programs; static int gl_num_programs;
static qboolean GL_CheckShader (GLuint shader) static bool GL_CheckShader (GLuint shader)
{ {
GLint status; GLint status;
GL_GetShaderivFunc (shader, GL_COMPILE_STATUS, &status); GL_GetShaderivFunc (shader, GL_COMPILE_STATUS, &status);
@ -475,7 +475,7 @@ static qboolean GL_CheckShader (GLuint shader)
return true; return true;
} }
static qboolean GL_CheckProgram (GLuint program) static bool GL_CheckProgram (GLuint program)
{ {
GLint status; GLint status;
GL_GetProgramivFunc (program, GL_LINK_STATUS, &status); GL_GetProgramivFunc (program, GL_LINK_STATUS, &status);

10
source/gl_screen.c
View File

@ -101,7 +101,7 @@ cvar_t gl_triplebuffer = {"gl_triplebuffer", "1", CVAR_ARCHIVE};
extern cvar_t crosshair; extern cvar_t crosshair;
qboolean scr_initialized; // ready to draw bool scr_initialized; // ready to draw
qpic_t *scr_ram; qpic_t *scr_ram;
qpic_t *scr_net; qpic_t *scr_net;
@ -112,8 +112,8 @@ int clearnotify;
vrect_t scr_vrect; vrect_t scr_vrect;
qboolean scr_disabled_for_loading; bool scr_disabled_for_loading;
qboolean scr_drawloading; bool scr_drawloading;
float scr_disabled_time; float scr_disabled_time;
int scr_tileclear_updates = 0; //johnfitz int scr_tileclear_updates = 0; //johnfitz
@ -779,7 +779,7 @@ void SCR_ScreenShot_f (void)
char imagename[16]; //johnfitz -- was [80] char imagename[16]; //johnfitz -- was [80]
char checkname[MAX_OSPATH]; char checkname[MAX_OSPATH];
int i, quality; int i, quality;
qboolean ok; bool ok;
Q_strncpy (ext, "png", sizeof(ext)); Q_strncpy (ext, "png", sizeof(ext));
@ -898,7 +898,7 @@ void SCR_EndLoadingPlaque (void)
//============================================================================= //=============================================================================
const char *scr_notifystring; const char *scr_notifystring;
qboolean scr_drawdialog; bool scr_drawdialog;
void SCR_DrawNotifyString (void) void SCR_DrawNotifyString (void)
{ {

6
source/gl_sky.c
View File

@ -154,7 +154,7 @@ void Sky_LoadSkyBox (const char *name)
int i, mark, width, height; int i, mark, width, height;
char filename[MAX_OSPATH]; char filename[MAX_OSPATH];
byte *data; byte *data;
qboolean nonefound = true; bool nonefound = true;
if (strcmp(skybox_name, name) == 0) if (strcmp(skybox_name, name) == 0)
return; //no change return; //no change
@ -417,7 +417,7 @@ void Sky_ClipPoly (int nump, vec3_t vecs, int stage)
{ {
float *norm; float *norm;
float *v; float *v;
qboolean front, back; bool front, back;
float d, e; float d, e;
float dists[MAX_CLIP_VERTS]; float dists[MAX_CLIP_VERTS];
int sides[MAX_CLIP_VERTS]; int sides[MAX_CLIP_VERTS];
@ -566,7 +566,7 @@ void Sky_ProcessEntities (void)
glpoly_t *p; glpoly_t *p;
int i,j,k,mark; int i,j,k,mark;
float dot; float dot;
qboolean rotated; bool rotated;
vec3_t temp, forward, right, up; vec3_t temp, forward, right, up;
if (!r_drawentities.value) if (!r_drawentities.value)

8
source/gl_texmgr.c
View File

@ -349,7 +349,7 @@ gltexture_t *TexMgr_NewTexture (void)
static void GL_DeleteTexture (gltexture_t *texture); static void GL_DeleteTexture (gltexture_t *texture);
//ericw -- workaround for preventing TexMgr_FreeTexture during TexMgr_ReloadImages //ericw -- workaround for preventing TexMgr_FreeTexture during TexMgr_ReloadImages
static qboolean in_reload_images; static bool in_reload_images;
/* /*
================ ================
@ -753,7 +753,7 @@ static unsigned *TexMgr_MipMapH (unsigned *data, int width, int height)
TexMgr_ResampleTexture -- bilinear resample TexMgr_ResampleTexture -- bilinear resample
================ ================
*/ */
static unsigned *TexMgr_ResampleTexture (unsigned *in, int inwidth, int inheight, qboolean alpha) static unsigned *TexMgr_ResampleTexture (unsigned *in, int inwidth, int inheight, bool alpha)
{ {
byte *nwpx, *nepx, *swpx, *sepx, *dest; byte *nwpx, *nepx, *swpx, *sepx, *dest;
unsigned xfrac, yfrac, x, y, modx, mody, imodx, imody, injump, outjump; unsigned xfrac, yfrac, x, y, modx, mody, imodx, imody, injump, outjump;
@ -1084,7 +1084,7 @@ TexMgr_LoadImage8 -- handles 8bit source data, then passes it to LoadImage32
static void TexMgr_LoadImage8 (gltexture_t *glt, byte *data) static void TexMgr_LoadImage8 (gltexture_t *glt, byte *data)
{ {
extern cvar_t gl_fullbrights; extern cvar_t gl_fullbrights;
qboolean padw = false, padh = false; bool padw = false, padh = false;
byte padbyte; byte padbyte;
uint32_t *usepal; uint32_t *usepal;
int i; int i;
@ -1445,7 +1445,7 @@ void TexMgr_ReloadNobrightImages (void)
static GLuint currenttexture[3] = {GL_UNUSED_TEXTURE, GL_UNUSED_TEXTURE, GL_UNUSED_TEXTURE}; // to avoid unnecessary texture sets static GLuint currenttexture[3] = {GL_UNUSED_TEXTURE, GL_UNUSED_TEXTURE, GL_UNUSED_TEXTURE}; // to avoid unnecessary texture sets
static GLenum currenttarget = GL_TEXTURE0_ARB; static GLenum currenttarget = GL_TEXTURE0_ARB;
qboolean mtexenabled = false; bool mtexenabled = false;
/* /*
================ ================

54
source/gl_vidsdl.c
View File

@ -63,13 +63,13 @@ static char * gl_extensions_nice;
static vmode_t modelist[MAX_MODE_LIST]; static vmode_t modelist[MAX_MODE_LIST];
static int nummodes; static int nummodes;
static qboolean vid_initialized = false; static bool vid_initialized = false;
static SDL_Window *draw_context; static SDL_Window *draw_context;
static SDL_GLContext gl_context; static SDL_GLContext gl_context;
static qboolean vid_locked = false; //johnfitz static bool vid_locked = false; //johnfitz
static qboolean vid_changed = false; static bool vid_changed = false;
static void VID_Menu_Init (void); //johnfitz static void VID_Menu_Init (void); //johnfitz
static void VID_Menu_f (void); //johnfitz static void VID_Menu_f (void); //johnfitz
@ -82,20 +82,20 @@ static void GL_SetupState (void); //johnfitz
viddef_t vid; // global video state viddef_t vid; // global video state
modestate_t modestate = MS_UNINIT; modestate_t modestate = MS_UNINIT;
qboolean scr_skipupdate; bool scr_skipupdate;
qboolean gl_mtexable = false; bool gl_mtexable = false;
qboolean gl_texture_env_combine = false; //johnfitz bool gl_texture_env_combine = false; //johnfitz
qboolean gl_texture_env_add = false; //johnfitz bool gl_texture_env_add = false; //johnfitz
qboolean gl_swap_control = false; //johnfitz bool gl_swap_control = false; //johnfitz
qboolean gl_anisotropy_able = false; //johnfitz bool gl_anisotropy_able = false; //johnfitz
float gl_max_anisotropy; //johnfitz float gl_max_anisotropy; //johnfitz
qboolean gl_texture_NPOT = false; //ericw bool gl_texture_NPOT = false; //ericw
qboolean gl_vbo_able = false; //ericw bool gl_vbo_able = false; //ericw
qboolean gl_glsl_able = false; //ericw bool gl_glsl_able = false; //ericw
GLint gl_max_texture_units = 0; //ericw GLint gl_max_texture_units = 0; //ericw
qboolean gl_glsl_gamma_able = false; //ericw bool gl_glsl_gamma_able = false; //ericw
qboolean gl_glsl_alias_able = false; //ericw bool gl_glsl_alias_able = false; //ericw
int gl_stencilbits; int gl_stencilbits;
PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc = NULL; //johnfitz PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc = NULL; //johnfitz
@ -166,7 +166,7 @@ static uint16_t vid_sysgamma_green[256];
static uint16_t vid_sysgamma_blue[256]; static uint16_t vid_sysgamma_blue[256];
#endif #endif
static qboolean gammaworks = false; // whether hw-gamma works static bool gammaworks = false; // whether hw-gamma works
static int fsaa; static int fsaa;
/* /*
@ -343,7 +343,7 @@ VID_GetFullscreen
returns true if we are in regular fullscreen or "desktop fullscren" returns true if we are in regular fullscreen or "desktop fullscren"
==================== ====================
*/ */
static qboolean VID_GetFullscreen (void) static bool VID_GetFullscreen (void)
{ {
return (SDL_GetWindowFlags(draw_context) & SDL_WINDOW_FULLSCREEN) != 0; return (SDL_GetWindowFlags(draw_context) & SDL_WINDOW_FULLSCREEN) != 0;
} }
@ -355,7 +355,7 @@ VID_GetDesktopFullscreen
returns true if we are specifically in "desktop fullscreen" mode returns true if we are specifically in "desktop fullscreen" mode
==================== ====================
*/ */
static qboolean VID_GetDesktopFullscreen (void) static bool VID_GetDesktopFullscreen (void)
{ {
return (SDL_GetWindowFlags(draw_context) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP; return (SDL_GetWindowFlags(draw_context) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP;
} }
@ -365,7 +365,7 @@ static qboolean VID_GetDesktopFullscreen (void)
VID_GetVSync VID_GetVSync
==================== ====================
*/ */
static qboolean VID_GetVSync (void) static bool VID_GetVSync (void)
{ {
return SDL_GL_GetSwapInterval() == 1; return SDL_GL_GetSwapInterval() == 1;
} }
@ -387,7 +387,7 @@ void *VID_GetWindow (void)
VID_HasMouseOrInputFocus VID_HasMouseOrInputFocus
==================== ====================
*/ */
qboolean VID_HasMouseOrInputFocus (void) bool VID_HasMouseOrInputFocus (void)
{ {
return (SDL_GetWindowFlags(draw_context) & (SDL_WINDOW_MOUSE_FOCUS | SDL_WINDOW_INPUT_FOCUS)) != 0; return (SDL_GetWindowFlags(draw_context) & (SDL_WINDOW_MOUSE_FOCUS | SDL_WINDOW_INPUT_FOCUS)) != 0;
} }
@ -397,7 +397,7 @@ qboolean VID_HasMouseOrInputFocus (void)
VID_IsMinimized VID_IsMinimized
==================== ====================
*/ */
qboolean VID_IsMinimized (void) bool VID_IsMinimized (void)
{ {
return !(SDL_GetWindowFlags(draw_context) & SDL_WINDOW_SHOWN); return !(SDL_GetWindowFlags(draw_context) & SDL_WINDOW_SHOWN);
} }
@ -440,7 +440,7 @@ static SDL_DisplayMode *VID_SDL2_GetDisplayMode(int width, int height, int refre
VID_ValidMode VID_ValidMode
================ ================
*/ */
static qboolean VID_ValidMode (int width, int height, int refreshrate, int bpp, qboolean fullscreen) static bool VID_ValidMode (int width, int height, int refreshrate, int bpp, bool fullscreen)
{ {
// ignore width / height / bpp if vid_desktopfullscreen is enabled // ignore width / height / bpp if vid_desktopfullscreen is enabled
if (fullscreen && vid_desktopfullscreen.value) if (fullscreen && vid_desktopfullscreen.value)
@ -473,7 +473,7 @@ static qboolean VID_ValidMode (int width, int height, int refreshrate, int bpp,
VID_SetMode VID_SetMode
================ ================
*/ */
static qboolean VID_SetMode (int width, int height, int refreshrate, int bpp, qboolean fullscreen) static bool VID_SetMode (int width, int height, int refreshrate, int bpp, bool fullscreen)
{ {
int temp; int temp;
Uint32 flags; Uint32 flags;
@ -640,7 +640,7 @@ VID_Restart -- johnfitz -- change video modes on the fly
static void VID_Restart (void) static void VID_Restart (void)
{ {
int width, height, refreshrate, bpp; int width, height, refreshrate, bpp;
qboolean fullscreen; bool fullscreen;
if (vid_locked || !vid_changed) if (vid_locked || !vid_changed)
return; return;
@ -830,7 +830,7 @@ static void GL_Info_f (void)
GL_CheckExtensions GL_CheckExtensions
=============== ===============
*/ */
static qboolean GL_ParseExtensionList (const char *list, const char *name) static bool GL_ParseExtensionList (const char *list, const char *name)
{ {
const char *start; const char *start;
const char *where, *terminator; const char *where, *terminator;
@ -1362,7 +1362,7 @@ void VID_Init (void)
static char vid_center[] = "SDL_VIDEO_CENTERED=center"; static char vid_center[] = "SDL_VIDEO_CENTERED=center";
int p, width, height, refreshrate, bpp; int p, width, height, refreshrate, bpp;
int display_width, display_height, display_refreshrate, display_bpp; int display_width, display_height, display_refreshrate, display_bpp;
qboolean fullscreen; bool fullscreen;
const char *read_vars[] = { "vid_fullscreen", const char *read_vars[] = { "vid_fullscreen",
"vid_width", "vid_width",
"vid_height", "vid_height",
@ -1536,8 +1536,8 @@ void VID_Toggle (void)
// TODO: Clear out the dead code, reinstate the fast path using SDL_SetWindowFullscreen // TODO: Clear out the dead code, reinstate the fast path using SDL_SetWindowFullscreen
// inside VID_SetMode, check window size to fix WinXP issue. This will // inside VID_SetMode, check window size to fix WinXP issue. This will
// keep all the mode changing code in one place. // keep all the mode changing code in one place.
static qboolean vid_toggle_works = false; static bool vid_toggle_works = false;
qboolean toggleWorked; bool toggleWorked;
Uint32 flags = 0; Uint32 flags = 0;
S_ClearBuffer (); S_ClearBuffer ();

28
source/glquake.h
View File

@ -102,7 +102,7 @@ typedef struct particle_s
//==================================================== //====================================================
extern qboolean r_cache_thrash; // compatability extern bool r_cache_thrash; // compatability
extern vec3_t modelorg, r_entorigin; extern vec3_t modelorg, r_entorigin;
extern entity_t *currententity; extern entity_t *currententity;
extern int r_visframecount; // ??? what difs? extern int r_visframecount; // ??? what difs?
@ -158,8 +158,8 @@ extern float load_subdivide_size; //johnfitz -- remember what subdivide_size val
extern int gl_stencilbits; extern int gl_stencilbits;
// Multitexture // Multitexture
extern qboolean mtexenabled; extern bool mtexenabled;
extern qboolean gl_mtexable; extern bool gl_mtexable;
extern PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc; extern PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc;
extern PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc; extern PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc;
extern PFNGLCLIENTACTIVETEXTUREARBPROC GL_ClientActiveTextureFunc; extern PFNGLCLIENTACTIVETEXTUREARBPROC GL_ClientActiveTextureFunc;
@ -169,7 +169,7 @@ extern GLint gl_max_texture_units; //ericw
#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
extern float gl_max_anisotropy; extern float gl_max_anisotropy;
extern qboolean gl_anisotropy_able; extern bool gl_anisotropy_able;
//ericw -- VBO //ericw -- VBO
extern PFNGLBINDBUFFERARBPROC GL_BindBufferFunc; extern PFNGLBINDBUFFERARBPROC GL_BindBufferFunc;
@ -177,7 +177,7 @@ extern PFNGLBUFFERDATAARBPROC GL_BufferDataFunc;
extern PFNGLBUFFERSUBDATAARBPROC GL_BufferSubDataFunc; extern PFNGLBUFFERSUBDATAARBPROC GL_BufferSubDataFunc;
extern PFNGLDELETEBUFFERSARBPROC GL_DeleteBuffersFunc; extern PFNGLDELETEBUFFERSARBPROC GL_DeleteBuffersFunc;
extern PFNGLGENBUFFERSARBPROC GL_GenBuffersFunc; extern PFNGLGENBUFFERSARBPROC GL_GenBuffersFunc;
extern qboolean gl_vbo_able; extern bool gl_vbo_able;
//ericw //ericw
//ericw -- GLSL //ericw -- GLSL
@ -230,13 +230,13 @@ extern QS_PFNGLUNIFORM1IPROC GL_Uniform1iFunc;
extern QS_PFNGLUNIFORM1FPROC GL_Uniform1fFunc; extern QS_PFNGLUNIFORM1FPROC GL_Uniform1fFunc;
extern QS_PFNGLUNIFORM3FPROC GL_Uniform3fFunc; extern QS_PFNGLUNIFORM3FPROC GL_Uniform3fFunc;
extern QS_PFNGLUNIFORM4FPROC GL_Uniform4fFunc; extern QS_PFNGLUNIFORM4FPROC GL_Uniform4fFunc;
extern qboolean gl_glsl_able; extern bool gl_glsl_able;
extern qboolean gl_glsl_gamma_able; extern bool gl_glsl_gamma_able;
extern qboolean gl_glsl_alias_able; extern bool gl_glsl_alias_able;
// ericw -- // ericw --
//ericw -- NPOT texture support //ericw -- NPOT texture support
extern qboolean gl_texture_NPOT; extern bool gl_texture_NPOT;
//johnfitz -- polygon offset //johnfitz -- polygon offset
#define OFFSET_BMODEL 1 #define OFFSET_BMODEL 1
@ -259,8 +259,8 @@ void GL_PolygonOffset (int);
#define GL_SOURCE1_RGB_EXT 0x8581 #define GL_SOURCE1_RGB_EXT 0x8581
#define GL_SOURCE0_ALPHA_EXT 0x8588 #define GL_SOURCE0_ALPHA_EXT 0x8588
#define GL_SOURCE1_ALPHA_EXT 0x8589 #define GL_SOURCE1_ALPHA_EXT 0x8589
extern qboolean gl_texture_env_combine; extern bool gl_texture_env_combine;
extern qboolean gl_texture_env_add; // for GL_EXT_texture_env_add extern bool gl_texture_env_add; // for GL_EXT_texture_env_add
//johnfitz -- rendering statistics //johnfitz -- rendering statistics
extern int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys; extern int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys;
@ -297,7 +297,7 @@ extern gltexture_t *lightmap_textures[MAX_LIGHTMAPS]; //johnfitz -- changed to a
extern int gl_warpimagesize; //johnfitz -- for water warp extern int gl_warpimagesize; //johnfitz -- for water warp
extern qboolean r_drawflat_cheatsafe, r_fullbright_cheatsafe, r_lightmap_cheatsafe, r_drawworld_cheatsafe; //johnfitz extern bool r_drawflat_cheatsafe, r_fullbright_cheatsafe, r_lightmap_cheatsafe, r_drawworld_cheatsafe; //johnfitz
typedef struct glsl_attrib_binding_s { typedef struct glsl_attrib_binding_s {
const char *name; const char *name;
@ -324,9 +324,9 @@ void R_NewGame (void);
void R_AnimateLight (void); void R_AnimateLight (void);
void R_MarkSurfaces (void); void R_MarkSurfaces (void);
void R_CullSurfaces (void); void R_CullSurfaces (void);
qboolean R_CullBox (vec3_t emins, vec3_t emaxs); bool R_CullBox (vec3_t emins, vec3_t emaxs);
void R_StoreEfrags (efrag_t **ppefrag); void R_StoreEfrags (efrag_t **ppefrag);
qboolean R_CullModelForEntity (entity_t *e); bool R_CullModelForEntity (entity_t *e);
void R_RotateForEntity (vec3_t origin, vec3_t angles); void R_RotateForEntity (vec3_t origin, vec3_t angles);
void R_MarkLights (dlight_t *light, int num, mnode_t *node); void R_MarkLights (dlight_t *light, int num, mnode_t *node);

12
source/host.c
View File

@ -39,7 +39,7 @@ Memory is cleared / released when a server or client begins, not when they end.
quakeparms_t *host_parms; quakeparms_t *host_parms;
qboolean host_initialized; // true if into command execution bool host_initialized; // true if into command execution
double host_frametime; double host_frametime;
double realtime; // without any filtering or bounding double realtime; // without any filtering or bounding
@ -150,7 +150,7 @@ void Host_Error (const char *error, ...)
{ {
va_list argptr; va_list argptr;
char string[1024]; char string[1024];
static qboolean inerror = false; static bool inerror = false;
if (inerror) if (inerror)
Sys_Error ("Host_Error: recursively entered"); Sys_Error ("Host_Error: recursively entered");
@ -403,7 +403,7 @@ Called when the player is getting totally kicked off the host
if (crash = true), don't bother sending signofs if (crash = true), don't bother sending signofs
===================== =====================
*/ */
void SV_DropClient (qboolean crash) void SV_DropClient (bool crash)
{ {
int saveSelf; int saveSelf;
int i; int i;
@ -465,7 +465,7 @@ Host_ShutdownServer
This only happens at the end of a game, not between levels This only happens at the end of a game, not between levels
================== ==================
*/ */
void Host_ShutdownServer(qboolean crash) void Host_ShutdownServer(bool crash)
{ {
int i; int i;
int count; int count;
@ -564,7 +564,7 @@ Host_FilterTime
Returns false if the time is too short to run a frame Returns false if the time is too short to run a frame
=================== ===================
*/ */
qboolean Host_FilterTime (float time) bool Host_FilterTime (float time)
{ {
float maxfps; //johnfitz float maxfps; //johnfitz
@ -901,7 +901,7 @@ to run quit through here before the final handoff to the sys code.
*/ */
void Host_Shutdown(void) void Host_Shutdown(void)
{ {
static qboolean isdown = false; static bool isdown = false;
if (isdown) if (isdown)
{ {

12
source/host_cmd.c
View File

@ -561,7 +561,7 @@ void Host_Notarget_f (void)
//johnfitz //johnfitz
} }
qboolean noclip_anglehack; bool noclip_anglehack;
/* /*
================== ==================
@ -1310,15 +1310,15 @@ void Host_Name_f (void)
MSG_WriteString (&sv.reliable_datagram, host_client->name); MSG_WriteString (&sv.reliable_datagram, host_client->name);
} }
void Host_Say(qboolean teamonly) void Host_Say(bool teamonly)
{ {
int j; int j;
client_t *client; client_t *client;
client_t *save; client_t *save;
const char *p; const char *p;
char text[MAXCMDLINE], *p2; char text[MAXCMDLINE], *p2;
qboolean quoted; bool quoted;
qboolean fromServer = false; bool fromServer = false;
if (cmd_source == src_command) if (cmd_source == src_command)
{ {
@ -1407,7 +1407,7 @@ void Host_Tell_f(void)
client_t *save; client_t *save;
const char *p; const char *p;
char text[MAXCMDLINE], *p2; char text[MAXCMDLINE], *p2;
qboolean quoted; bool quoted;
if (cmd_source == src_command) if (cmd_source == src_command)
{ {
@ -1762,7 +1762,7 @@ void Host_Kick_f (void)
const char *message = NULL; const char *message = NULL;
client_t *save; client_t *save;
int i; int i;
qboolean byNumber = false; bool byNumber = false;
if (cmd_source == src_command) if (cmd_source == src_command)
{ {

8
source/image.c
View File

@ -144,7 +144,7 @@ returns true if successful
TODO: support BGRA and BGR formats (since opengl can return them, and we don't have to swap) TODO: support BGRA and BGR formats (since opengl can return them, and we don't have to swap)
============ ============
*/ */
qboolean Image_WriteTGA (const char *name, byte *data, int width, int height, int bpp, qboolean upsidedown) bool Image_WriteTGA (const char *name, byte *data, int width, int height, int bpp, bool upsidedown)
{ {
int handle, i, size, temp, bytes; int handle, i, size, temp, bytes;
char pathname[MAX_OSPATH]; char pathname[MAX_OSPATH];
@ -195,7 +195,7 @@ byte *Image_LoadTGA (FILE *fin, int *width, int *height)
int row, column; int row, column;
byte *targa_rgba; byte *targa_rgba;
int realrow; //johnfitz -- fix for upside-down targas int realrow; //johnfitz -- fix for upside-down targas
qboolean upside_down; //johnfitz -- fix for upside-down targas bool upside_down; //johnfitz -- fix for upside-down targas
stdio_buffer_t *buf; stdio_buffer_t *buf;
targa_header.id_length = fgetc(fin); targa_header.id_length = fgetc(fin);
@ -509,7 +509,7 @@ Image_WriteJPG -- writes using stb_image_write
returns true if successful returns true if successful
============ ============
*/ */
qboolean Image_WriteJPG (const char *name, byte *data, int width, int height, int bpp, int quality, qboolean upsidedown) bool Image_WriteJPG (const char *name, byte *data, int width, int height, int bpp, int quality, bool upsidedown)
{ {
unsigned error; unsigned error;
char pathname[MAX_OSPATH]; char pathname[MAX_OSPATH];
@ -540,7 +540,7 @@ qboolean Image_WriteJPG (const char *name, byte *data, int width, int height, in
return (error != 0); return (error != 0);
} }
qboolean Image_WritePNG (const char *name, byte *data, int width, int height, int bpp, qboolean upsidedown) bool Image_WritePNG (const char *name, byte *data, int width, int height, int bpp, bool upsidedown)
{ {
unsigned error; unsigned error;
char pathname[MAX_OSPATH]; char pathname[MAX_OSPATH];

6
source/image.h
View File

@ -30,9 +30,9 @@ byte *Image_LoadTGA (FILE *f, int *width, int *height);
byte *Image_LoadPCX (FILE *f, int *width, int *height); byte *Image_LoadPCX (FILE *f, int *width, int *height);
byte *Image_LoadImage (const char *name, int *width, int *height); byte *Image_LoadImage (const char *name, int *width, int *height);
qboolean Image_WriteTGA (const char *name, byte *data, int width, int height, int bpp, qboolean upsidedown); bool Image_WriteTGA (const char *name, byte *data, int width, int height, int bpp, bool upsidedown);
qboolean Image_WritePNG (const char *name, byte *data, int width, int height, int bpp, qboolean upsidedown); bool Image_WritePNG (const char *name, byte *data, int width, int height, int bpp, bool upsidedown);
qboolean Image_WriteJPG (const char *name, byte *data, int width, int height, int bpp, int quality, qboolean upsidedown); bool Image_WriteJPG (const char *name, byte *data, int width, int height, int bpp, int quality, bool upsidedown);
#endif /* GL_IMAGE_H */ #endif /* GL_IMAGE_H */

18
source/in_sdl.c
View File

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h" #include "quakedef.h"
#include <SDL.h> #include <SDL.h>
static qboolean textmode; static bool textmode;
static cvar_t in_debugkeys = {"in_debugkeys", "0", CVAR_NONE}; static cvar_t in_debugkeys = {"in_debugkeys", "0", CVAR_NONE};
@ -54,7 +54,7 @@ cvar_t joy_enable = { "joy_enable", "1", CVAR_ARCHIVE };
static SDL_JoystickID joy_active_instaceid = -1; static SDL_JoystickID joy_active_instaceid = -1;
static SDL_GameController *joy_active_controller = NULL; static SDL_GameController *joy_active_controller = NULL;
static qboolean no_mouse = false; static bool no_mouse = false;
static int buttonremap[] = static int buttonremap[] =
{ {
@ -197,7 +197,7 @@ void IN_Activate (void)
total_dy = 0; total_dy = 0;
} }
void IN_Deactivate (qboolean free_cursor) void IN_Deactivate (bool free_cursor)
{ {
if (no_mouse) if (no_mouse)
return; return;
@ -336,7 +336,7 @@ typedef struct joyaxis_s
typedef struct joy_buttonstate_s typedef struct joy_buttonstate_s
{ {
qboolean buttondown[SDL_CONTROLLER_BUTTON_MAX]; bool buttondown[SDL_CONTROLLER_BUTTON_MAX];
} joybuttonstate_t; } joybuttonstate_t;
typedef struct axisstate_s typedef struct axisstate_s
@ -481,7 +481,7 @@ and generates key repeats if the button is held down.
Adapted from DarkPlaces by lordhavoc Adapted from DarkPlaces by lordhavoc
================ ================
*/ */
static void IN_JoyKeyEvent(qboolean wasdown, qboolean isdown, int key, double *timer) static void IN_JoyKeyEvent(bool wasdown, bool isdown, int key, double *timer)
{ {
// we can't use `realtime` for key repeats because it is not monotomic // we can't use `realtime` for key repeats because it is not monotomic
const double currenttime = Sys_DoubleTime(); const double currenttime = Sys_DoubleTime();
@ -535,8 +535,8 @@ void IN_Commands (void)
// emit key events for controller buttons // emit key events for controller buttons
for (i = 0; i < SDL_CONTROLLER_BUTTON_MAX; i++) for (i = 0; i < SDL_CONTROLLER_BUTTON_MAX; i++)
{ {
qboolean newstate = SDL_GameControllerGetButton(joy_active_controller, (SDL_GameControllerButton)i); bool newstate = SDL_GameControllerGetButton(joy_active_controller, (SDL_GameControllerButton)i);
qboolean oldstate = joy_buttonstate.buttondown[i]; bool oldstate = joy_buttonstate.buttondown[i];
joy_buttonstate.buttondown[i] = newstate; joy_buttonstate.buttondown[i] = newstate;
@ -676,7 +676,7 @@ void IN_ClearStates (void)
void IN_UpdateInputMode (void) void IN_UpdateInputMode (void)
{ {
qboolean want_textmode = Key_TextEntry(); bool want_textmode = Key_TextEntry();
if (textmode != want_textmode) if (textmode != want_textmode)
{ {
textmode = want_textmode; textmode = want_textmode;
@ -835,7 +835,7 @@ void IN_SendKeyEvents (void)
{ {
SDL_Event event; SDL_Event event;
int key; int key;
qboolean down; bool down;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {

2
source/input.h
View File

@ -51,7 +51,7 @@ void IN_ClearStates (void);
void IN_Activate (); void IN_Activate ();
// called when the app becomes inactive // called when the app becomes inactive
void IN_Deactivate (qboolean free_cursor); void IN_Deactivate (bool free_cursor);
#endif /* _QUAKE_INPUT_H */ #endif /* _QUAKE_INPUT_H */

18
source/keys.c
View File

@ -40,9 +40,9 @@ int history_line = 0;
keydest_t key_dest; keydest_t key_dest;
char *keybindings[MAX_KEYS]; char *keybindings[MAX_KEYS];
qboolean consolekeys[MAX_KEYS]; // if true, can't be rebound while in console bool consolekeys[MAX_KEYS]; // if true, can't be rebound while in console
qboolean menubound[MAX_KEYS]; // if true, can't be rebound while in menu bool menubound[MAX_KEYS]; // if true, can't be rebound while in menu
qboolean keydown[MAX_KEYS]; bool keydown[MAX_KEYS];
typedef struct typedef struct
{ {
@ -449,7 +449,7 @@ void Char_Console (int key)
if (key_linepos < MAXCMDLINE-1) if (key_linepos < MAXCMDLINE-1)
{ {
qboolean endpos = !workline[key_linepos]; bool endpos = !workline[key_linepos];
key_tabpartial[0] = 0; //johnfitz key_tabpartial[0] = 0; //johnfitz
// if inserting, move the text to the right // if inserting, move the text to the right
@ -475,7 +475,7 @@ void Char_Console (int key)
//============================================================================ //============================================================================
qboolean chat_team = false; bool chat_team = false;
static char chat_buffer[MAXCMDLINE]; static char chat_buffer[MAXCMDLINE];
static int chat_bufferlen = 0; static int chat_bufferlen = 0;
@ -883,7 +883,7 @@ void Key_Init (void)
} }
static struct { static struct {
qboolean active; bool active;
int lastkey; int lastkey;
int lastchar; int lastchar;
} key_inputgrab = { false, -1, -1 }; } key_inputgrab = { false, -1, -1 };
@ -939,7 +939,7 @@ Called by the system between frames for both key up and key down events
Should NOT be called during an interrupt! Should NOT be called during an interrupt!
=================== ===================
*/ */
void Key_Event (int key, qboolean down) void Key_Event (int key, bool down)
{ {
char *kb; char *kb;
char cmd[1024]; char cmd[1024];
@ -1124,7 +1124,7 @@ void Char_Event (int key)
Key_TextEntry Key_TextEntry
=================== ===================
*/ */
qboolean Key_TextEntry (void) bool Key_TextEntry (void)
{ {
if (key_inputgrab.active) if (key_inputgrab.active)
return true; return true;
@ -1169,7 +1169,7 @@ Key_UpdateForDest
*/ */
void Key_UpdateForDest (void) void Key_UpdateForDest (void)
{ {
static qboolean forced = false; static bool forced = false;
if (cls.state == ca_dedicated) if (cls.state == ca_dedicated)
return; return;

6
source/keys.h
View File

@ -171,7 +171,7 @@ extern int key_linepos;
extern int key_insert; extern int key_insert;
extern double key_blinktime; extern double key_blinktime;
extern qboolean chat_team; extern bool chat_team;
void Key_Init (void); void Key_Init (void);
void Key_ClearStates (void); void Key_ClearStates (void);
@ -181,9 +181,9 @@ void Key_BeginInputGrab (void);
void Key_EndInputGrab (void); void Key_EndInputGrab (void);
void Key_GetGrabbedInput (int *lastkey, int *lastchar); void Key_GetGrabbedInput (int *lastkey, int *lastchar);
void Key_Event (int key, qboolean down); void Key_Event (int key, bool down);
void Char_Event (int key); void Char_Event (int key);
qboolean Key_TextEntry (void); bool Key_TextEntry (void);
void Key_SetBinding (int keynum, const char *binding); void Key_SetBinding (int keynum, const char *binding);
const char *Key_KeynumToString (int keynum); const char *Key_KeynumToString (int keynum);

24
source/menu.c
View File

@ -80,12 +80,12 @@ void M_Main_Key (int key);
void M_Help_Key (int key); void M_Help_Key (int key);
void M_Quit_Key (int key); void M_Quit_Key (int key);
qboolean m_entersound; // play after drawing a frame, so caching bool m_entersound; // play after drawing a frame, so caching
// won't disrupt the sound // won't disrupt the sound
qboolean m_recursiveDraw; bool m_recursiveDraw;
enum m_state_e m_return_state; enum m_state_e m_return_state;
qboolean m_return_onerror; bool m_return_onerror;
char m_return_reason [32]; char m_return_reason [32];
#define StartingGame (m_multiplayer_cursor == 1) #define StartingGame (m_multiplayer_cursor == 1)
@ -855,7 +855,7 @@ void M_Setup_Char (int k)
} }
qboolean M_Setup_TextEntry (void) bool M_Setup_TextEntry (void)
{ {
return (setup_cursor == 0 || setup_cursor == 1); return (setup_cursor == 0 || setup_cursor == 1);
} }
@ -1359,7 +1359,7 @@ const char *bindnames[][2] =
#define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0])) #define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0]))
static int keys_cursor; static int keys_cursor;
static qboolean bind_grab; static bool bind_grab;
void M_Menu_Keys_f (void) void M_Menu_Keys_f (void)
{ {
@ -1607,7 +1607,7 @@ void M_Help_Key (int key)
int msgNumber; int msgNumber;
enum m_state_e m_quit_prevstate; enum m_state_e m_quit_prevstate;
qboolean wasInMenus; bool wasInMenus;
void M_Menu_Quit_f (void) void M_Menu_Quit_f (void)
{ {
@ -1675,7 +1675,7 @@ void M_Quit_Char (int key)
} }
qboolean M_Quit_TextEntry (void) bool M_Quit_TextEntry (void)
{ {
return true; return true;
} }
@ -1923,7 +1923,7 @@ void M_LanConfig_Char (int key)
} }
qboolean M_LanConfig_TextEntry (void) bool M_LanConfig_TextEntry (void)
{ {
return (lanConfig_cursor == 0 || lanConfig_cursor == 2); return (lanConfig_cursor == 0 || lanConfig_cursor == 2);
} }
@ -2078,7 +2078,7 @@ episode_t rogueepisodes[] =
int startepisode; int startepisode;
int startlevel; int startlevel;
int maxplayers; int maxplayers;
qboolean m_serverInfoMessage = false; bool m_serverInfoMessage = false;
double m_serverInfoMessageTime; double m_serverInfoMessageTime;
void M_Menu_GameOptions_f (void) void M_Menu_GameOptions_f (void)
@ -2385,7 +2385,7 @@ void M_GameOptions_Key (int key)
//============================================================================= //=============================================================================
/* SEARCH MENU */ /* SEARCH MENU */
qboolean searchComplete = false; bool searchComplete = false;
double searchCompleteTime; double searchCompleteTime;
void M_Menu_Search_f (void) void M_Menu_Search_f (void)
@ -2448,7 +2448,7 @@ void M_Search_Key (int key)
/* SLIST MENU */ /* SLIST MENU */
int slist_cursor; int slist_cursor;
qboolean slist_sorted; bool slist_sorted;
void M_Menu_ServerList_f (void) void M_Menu_ServerList_f (void)
{ {
@ -2756,7 +2756,7 @@ void M_Charinput (int key)
} }
qboolean M_TextEntry (void) bool M_TextEntry (void)
{ {
switch (m_state) switch (m_state)
{ {

4
source/menu.h
View File

@ -46,7 +46,7 @@ enum m_state_e {
extern enum m_state_e m_state; extern enum m_state_e m_state;
extern enum m_state_e m_return_state; extern enum m_state_e m_return_state;
extern qboolean m_entersound; extern bool m_entersound;
// //
// menus // menus
@ -54,7 +54,7 @@ extern qboolean m_entersound;
void M_Init (void); void M_Init (void);
void M_Keydown (int key); void M_Keydown (int key);
void M_Charinput (int key); void M_Charinput (int key);
qboolean M_TextEntry (void); bool M_TextEntry (void);
void M_ToggleMenu_f (void); void M_ToggleMenu_f (void);
void M_Menu_Main_f (void); void M_Menu_Main_f (void);

12
source/net.h
View File

@ -58,7 +58,7 @@ struct qsocket_s *NET_Connect (const char *host);
double NET_QSocketGetTime (const struct qsocket_s *sock); double NET_QSocketGetTime (const struct qsocket_s *sock);
const char *NET_QSocketGetAddressString (const struct qsocket_s *sock); const char *NET_QSocketGetAddressString (const struct qsocket_s *sock);
qboolean NET_CanSendMessage (struct qsocket_s *sock); bool NET_CanSendMessage (struct qsocket_s *sock);
// Returns true or false if the given qsocket can currently accept a // Returns true or false if the given qsocket can currently accept a
// message to be transmitted. // message to be transmitted.
@ -92,9 +92,9 @@ void NET_Poll (void);
// Server list related globals: // Server list related globals:
extern qboolean slistInProgress; extern bool slistInProgress;
extern qboolean slistSilent; extern bool slistSilent;
extern qboolean slistLocal; extern bool slistLocal;
extern int hostCacheCount; extern int hostCacheCount;
@ -106,8 +106,8 @@ const char *NET_SlistPrintServerName (int n);
/* FIXME: driver related, but public: /* FIXME: driver related, but public:
*/ */
extern qboolean ipxAvailable; extern bool ipxAvailable;
extern qboolean tcpipAvailable; extern bool tcpipAvailable;
extern char my_ipx_address[NET_NAMELEN]; extern char my_ipx_address[NET_NAMELEN];
extern char my_tcpip_address[NET_NAMELEN]; extern char my_tcpip_address[NET_NAMELEN];

20
source/net_defs.h
View File

@ -134,9 +134,9 @@ typedef struct qsocket_s
double lastMessageTime; double lastMessageTime;
double lastSendTime; double lastSendTime;
qboolean disconnected; bool disconnected;
qboolean canSend; bool canSend;
qboolean sendNext; bool sendNext;
int driver; int driver;
int landriver; int landriver;
@ -166,11 +166,11 @@ extern int net_numsockets;
typedef struct typedef struct
{ {
const char *name; const char *name;
qboolean initialized; bool initialized;
sys_socket_t controlSock; sys_socket_t controlSock;
sys_socket_t (*Init) (void); sys_socket_t (*Init) (void);
void (*Shutdown) (void); void (*Shutdown) (void);
void (*Listen) (qboolean state); void (*Listen) (bool state);
sys_socket_t (*Open_Socket) (int port); sys_socket_t (*Open_Socket) (int port);
int (*Close_Socket) (sys_socket_t socketid); int (*Close_Socket) (sys_socket_t socketid);
int (*Connect) (sys_socket_t socketid, struct qsockaddr *addr); int (*Connect) (sys_socket_t socketid, struct qsockaddr *addr);
@ -195,17 +195,17 @@ extern const int net_numlandrivers;
typedef struct typedef struct
{ {
const char *name; const char *name;
qboolean initialized; bool initialized;
int (*Init) (void); int (*Init) (void);
void (*Listen) (qboolean state); void (*Listen) (bool state);
void (*SearchForHosts) (qboolean xmit); void (*SearchForHosts) (bool xmit);
qsocket_t *(*Connect) (const char *host); qsocket_t *(*Connect) (const char *host);
qsocket_t *(*CheckNewConnections) (void); qsocket_t *(*CheckNewConnections) (void);
int (*QGetMessage) (qsocket_t *sock); int (*QGetMessage) (qsocket_t *sock);
int (*QSendMessage) (qsocket_t *sock, sizebuf_t *data); int (*QSendMessage) (qsocket_t *sock, sizebuf_t *data);
int (*SendUnreliableMessage) (qsocket_t *sock, sizebuf_t *data); int (*SendUnreliableMessage) (qsocket_t *sock, sizebuf_t *data);
qboolean (*CanSendMessage) (qsocket_t *sock); bool (*CanSendMessage) (qsocket_t *sock);
qboolean (*CanSendUnreliableMessage) (qsocket_t *sock); bool (*CanSendUnreliableMessage) (qsocket_t *sock);
void (*Close) (qsocket_t *sock); void (*Close) (qsocket_t *sock);
void (*Shutdown) (void); void (*Shutdown) (void);
} net_driver_t; } net_driver_t;

16
source/net_dgrm.c
View File

@ -52,7 +52,7 @@ static struct
static int myDriverLevel; static int myDriverLevel;
extern qboolean m_return_onerror; extern bool m_return_onerror;
extern char m_return_reason[32]; extern char m_return_reason[32];
@ -242,7 +242,7 @@ static int ReSendMessage (qsocket_t *sock)
} }
qboolean Datagram_CanSendMessage (qsocket_t *sock) bool Datagram_CanSendMessage (qsocket_t *sock)
{ {
if (sock->sendNext) if (sock->sendNext)
SendMessageNext (sock); SendMessageNext (sock);
@ -251,7 +251,7 @@ qboolean Datagram_CanSendMessage (qsocket_t *sock)
} }
qboolean Datagram_CanSendUnreliableMessage (qsocket_t *sock) bool Datagram_CanSendUnreliableMessage (qsocket_t *sock)
{ {
(void)sock; (void)sock;
return true; return true;
@ -515,7 +515,7 @@ static const char *Strip_Port (const char *host)
} }
static qboolean testInProgress = false; static bool testInProgress = false;
static int testPollCount; static int testPollCount;
static int testDriver; static int testDriver;
static sys_socket_t testSocket; static sys_socket_t testSocket;
@ -651,7 +651,7 @@ JustDoIt:
} }
static qboolean test2InProgress = false; static bool test2InProgress = false;
static int test2Driver; static int test2Driver;
static sys_socket_t test2Socket; static sys_socket_t test2Socket;
@ -847,7 +847,7 @@ void Datagram_Close (qsocket_t *sock)
} }
void Datagram_Listen (qboolean state) void Datagram_Listen (bool state)
{ {
int i; int i;
@ -1121,7 +1121,7 @@ qsocket_t *Datagram_CheckNewConnections (void)
} }
static void _Datagram_SearchForHosts (qboolean xmit) static void _Datagram_SearchForHosts (bool xmit)
{ {
int ret; int ret;
int n; int n;
@ -1223,7 +1223,7 @@ static void _Datagram_SearchForHosts (qboolean xmit)
} }
} }
void Datagram_SearchForHosts (qboolean xmit) void Datagram_SearchForHosts (bool xmit)
{ {
for (net_landriverlevel = 0; net_landriverlevel < net_numlandrivers; net_landriverlevel++) for (net_landriverlevel = 0; net_landriverlevel < net_numlandrivers; net_landriverlevel++)
{ {

8
source/net_dgrm.h
View File

@ -23,15 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __NET_DATAGRAM_H #define __NET_DATAGRAM_H
int Datagram_Init (void); int Datagram_Init (void);
void Datagram_Listen (qboolean state); void Datagram_Listen (bool state);
void Datagram_SearchForHosts (qboolean xmit); void Datagram_SearchForHosts (bool xmit);
qsocket_t *Datagram_Connect (const char *host); qsocket_t *Datagram_Connect (const char *host);
qsocket_t *Datagram_CheckNewConnections (void); qsocket_t *Datagram_CheckNewConnections (void);
int Datagram_GetMessage (qsocket_t *sock); int Datagram_GetMessage (qsocket_t *sock);
int Datagram_SendMessage (qsocket_t *sock, sizebuf_t *data); int Datagram_SendMessage (qsocket_t *sock, sizebuf_t *data);
int Datagram_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data); int Datagram_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data);
qboolean Datagram_CanSendMessage (qsocket_t *sock); bool Datagram_CanSendMessage (qsocket_t *sock);
qboolean Datagram_CanSendUnreliableMessage (qsocket_t *sock); bool Datagram_CanSendUnreliableMessage (qsocket_t *sock);
void Datagram_Close (qsocket_t *sock); void Datagram_Close (qsocket_t *sock);
void Datagram_Shutdown (void); void Datagram_Shutdown (void);

10
source/net_loop.c
View File

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "net_defs.h" #include "net_defs.h"
#include "net_loop.h" #include "net_loop.h"
static qboolean localconnectpending = false; static bool localconnectpending = false;
static qsocket_t *loop_client = NULL; static qsocket_t *loop_client = NULL;
static qsocket_t *loop_server = NULL; static qsocket_t *loop_server = NULL;
@ -43,13 +43,13 @@ void Loop_Shutdown (void)
} }
void Loop_Listen (qboolean state) void Loop_Listen (bool state)
{ {
(void)state; (void)state;
} }
void Loop_SearchForHosts (qboolean xmit) void Loop_SearchForHosts (bool xmit)
{ {
(void)xmit; (void)xmit;
@ -224,7 +224,7 @@ int Loop_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data)
} }
qboolean Loop_CanSendMessage (qsocket_t *sock) bool Loop_CanSendMessage (qsocket_t *sock)
{ {
if (!sock->driverdata) if (!sock->driverdata)
return false; return false;
@ -232,7 +232,7 @@ qboolean Loop_CanSendMessage (qsocket_t *sock)
} }
qboolean Loop_CanSendUnreliableMessage (qsocket_t *sock) bool Loop_CanSendUnreliableMessage (qsocket_t *sock)
{ {
(void)sock; (void)sock;
return true; return true;

8
source/net_loop.h
View File

@ -24,15 +24,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// net_loop.h // net_loop.h
int Loop_Init (void); int Loop_Init (void);
void Loop_Listen (qboolean state); void Loop_Listen (bool state);
void Loop_SearchForHosts (qboolean xmit); void Loop_SearchForHosts (bool xmit);
qsocket_t *Loop_Connect (const char *host); qsocket_t *Loop_Connect (const char *host);
qsocket_t *Loop_CheckNewConnections (void); qsocket_t *Loop_CheckNewConnections (void);
int Loop_GetMessage (qsocket_t *sock); int Loop_GetMessage (qsocket_t *sock);
int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data); int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data);
int Loop_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data); int Loop_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data);
qboolean Loop_CanSendMessage (qsocket_t *sock); bool Loop_CanSendMessage (qsocket_t *sock);
qboolean Loop_CanSendUnreliableMessage (qsocket_t *sock); bool Loop_CanSendUnreliableMessage (qsocket_t *sock);
void Loop_Close (qsocket_t *sock); void Loop_Close (qsocket_t *sock);
void Loop_Shutdown (void); void Loop_Shutdown (void);

18
source/net_main.c
View File

@ -29,8 +29,8 @@ qsocket_t *net_activeSockets = NULL;
qsocket_t *net_freeSockets = NULL; qsocket_t *net_freeSockets = NULL;
int net_numsockets = 0; int net_numsockets = 0;
qboolean ipxAvailable = false; bool ipxAvailable = false;
qboolean tcpipAvailable = false; bool tcpipAvailable = false;
int net_hostport; int net_hostport;
int DEFAULTnet_hostport = 26000; int DEFAULTnet_hostport = 26000;
@ -38,11 +38,11 @@ int DEFAULTnet_hostport = 26000;
char my_ipx_address[NET_NAMELEN]; char my_ipx_address[NET_NAMELEN];
char my_tcpip_address[NET_NAMELEN]; char my_tcpip_address[NET_NAMELEN];
static qboolean listening = false; static bool listening = false;
qboolean slistInProgress = false; bool slistInProgress = false;
qboolean slistSilent = false; bool slistSilent = false;
qboolean slistLocal = true; bool slistLocal = true;
static double slistStartTime; static double slistStartTime;
static int slistLastShown; static int slistLastShown;
@ -660,7 +660,7 @@ Returns true or false if the given qsocket can currently accept a
message to be transmitted. message to be transmitted.
================== ==================
*/ */
qboolean NET_CanSendMessage (qsocket_t *sock) bool NET_CanSendMessage (qsocket_t *sock)
{ {
if (!sock) if (!sock)
return false; return false;
@ -679,8 +679,8 @@ int NET_SendToAll (sizebuf_t *data, double blocktime)
double start; double start;
int i; int i;
int count = 0; int count = 0;
qboolean msg_init[MAX_SCOREBOARD]; /* did we write the message to the client's connection */ bool msg_init[MAX_SCOREBOARD]; /* did we write the message to the client's connection */
qboolean msg_sent[MAX_SCOREBOARD]; /* did the msg arrive its destination (canSend state). */ bool msg_sent[MAX_SCOREBOARD]; /* did the msg arrive its destination (canSend state). */
for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++) for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++)
{ {

2
source/pr_cmds.c
View File

@ -166,7 +166,7 @@ static void PF_setorigin (void)
} }
static void SetMinMaxSize (edict_t *e, float *minvec, float *maxvec, qboolean rotate) static void SetMinMaxSize (edict_t *e, float *minvec, float *maxvec, bool rotate)
{ {
float *angles; float *angles;
vec3_t rmin, rmax; vec3_t rmin, rmax;

8
source/pr_edict.c
View File

@ -34,7 +34,7 @@ static int pr_numknownstrings;
static ddef_t *pr_fielddefs; static ddef_t *pr_fielddefs;
static ddef_t *pr_globaldefs; static ddef_t *pr_globaldefs;
qboolean pr_alpha_supported; //johnfitz bool pr_alpha_supported; //johnfitz
dstatement_t *pr_statements; dstatement_t *pr_statements;
globalvars_t *pr_global_struct; globalvars_t *pr_global_struct;
@ -55,7 +55,7 @@ int type_size[8] = {
}; };
static ddef_t *ED_FieldAtOfs (int ofs); static ddef_t *ED_FieldAtOfs (int ofs);
static qboolean ED_ParseEpair (void *base, ddef_t *key, const char *s); static bool ED_ParseEpair (void *base, ddef_t *key, const char *s);
#define MAX_FIELD_LEN 64 #define MAX_FIELD_LEN 64
#define GEFV_CACHESIZE 2 #define GEFV_CACHESIZE 2
@ -771,7 +771,7 @@ Can parse either fields or globals
returns false if error returns false if error
============= =============
*/ */
static qboolean ED_ParseEpair (void *base, ddef_t *key, const char *s) static bool ED_ParseEpair (void *base, ddef_t *key, const char *s)
{ {
int i; int i;
char string[128]; char string[128];
@ -863,7 +863,7 @@ const char *ED_ParseEdict (const char *data, edict_t *ent)
{ {
ddef_t *key; ddef_t *key;
char keyname[256]; char keyname[256];
qboolean anglehack, init; bool anglehack, init;
int n; int n;
init = false; init = false;

2
source/pr_exec.c
View File

@ -35,7 +35,7 @@ static int pr_depth;
static int localstack[LOCALSTACK_SIZE]; static int localstack[LOCALSTACK_SIZE];
static int localstack_used; static int localstack_used;
qboolean pr_trace; bool pr_trace;
dfunction_t *pr_xfunction; dfunction_t *pr_xfunction;
int pr_xstatement; int pr_xstatement;
int pr_argc; int pr_argc;

6
source/progs.h
View File

@ -39,7 +39,7 @@ typedef union eval_s
#define MAX_ENT_LEAFS 32 #define MAX_ENT_LEAFS 32
typedef struct edict_s typedef struct edict_s
{ {
qboolean free; bool free;
link_t area; /* linked to a division node or leaf */ link_t area; /* linked to a division node or leaf */
int num_leafs; int num_leafs;
@ -47,7 +47,7 @@ typedef struct edict_s
entity_state_t baseline; entity_state_t baseline;
uint8_t alpha; /* johnfitz -- hack to support alpha since it's not part of entvars_t */ uint8_t alpha; /* johnfitz -- hack to support alpha since it's not part of entvars_t */
qboolean sendinterval; /* johnfitz -- send time until nextthink to client for better lerp timing */ bool sendinterval; /* johnfitz -- send time until nextthink to client for better lerp timing */
float freetime; /* sv.time when the object was freed */ float freetime; /* sv.time when the object was freed */
entvars_t v; /* C exported fields from progs */ entvars_t v; /* C exported fields from progs */
@ -124,7 +124,7 @@ extern int pr_numbuiltins;
extern int pr_argc; extern int pr_argc;
extern qboolean pr_trace; extern bool pr_trace;
extern dfunction_t *pr_xfunction; extern dfunction_t *pr_xfunction;
extern int pr_xstatement; extern int pr_xstatement;

4
source/q_sound.h
View File

@ -95,7 +95,7 @@ void S_Shutdown (void);
void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation); void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation);
void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation); void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation);
void S_StopSound (int entnum, int entchannel); void S_StopSound (int entnum, int entchannel);
void S_StopAllSounds(qboolean clear); void S_StopAllSounds(bool clear);
void S_ClearBuffer (void); void S_ClearBuffer (void);
void S_Update (vec3_t origin, vec3_t forward, vec3_t right, vec3_t up); void S_Update (vec3_t origin, vec3_t forward, vec3_t right, vec3_t up);
void S_ExtraUpdate (void); void S_ExtraUpdate (void);
@ -122,7 +122,7 @@ void S_RawSamples(int samples, int rate, int width, int channels, byte * data, f
/* Expects data in signed 16 bit, or unsigned 8 bit format. */ /* Expects data in signed 16 bit, or unsigned 8 bit format. */
/* initializes cycling through a DMA buffer and returns information on it */ /* initializes cycling through a DMA buffer and returns information on it */
qboolean SNDDMA_Init(dma_t *dma); bool SNDDMA_Init(dma_t *dma);
/* gets the current DMA position */ /* gets the current DMA position */
int SNDDMA_GetDMAPos(void); int SNDDMA_GetDMAPos(void);

18
source/q_stdinc.h
View File

@ -31,6 +31,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
#include <stdbool.h>
#include <limits.h> #include <limits.h>
#ifndef _WIN32 /* others we support without sys/param.h? */ #ifndef _WIN32 /* others we support without sys/param.h? */
#include <sys/param.h> #include <sys/param.h>
@ -67,29 +68,20 @@
/*==========================================================================*/ /*==========================================================================*/
/* Make sure the types really have the right
* sizes: These macros are from SDL headers.
*/
_Static_assert(sizeof(char) == 1, "char not correct size");
_Static_assert(sizeof(float) == 4, "float not correct size"); _Static_assert(sizeof(float) == 4, "float not correct size");
_Static_assert(sizeof(long) >= 4, "long not correct size"); _Static_assert(sizeof(long) >= 4, "long not correct size");
_Static_assert(sizeof(int) == 4, "int not correct size"); _Static_assert(sizeof(int) == 4, "int not correct size");
/* make sure enums are the size of ints for structure packing */ /* make sure enums are the size of ints for structure packing */
typedef enum { enum dummy_enum {
THE_DUMMY_VALUE dummy_value
} THE_DUMMY_ENUM; };
_Static_assert(sizeof(THE_DUMMY_ENUM) == sizeof(int), "enum not sizeof(int)"); _Static_assert(sizeof(enum dummy_enum) == sizeof(int), "enum not sizeof(int)");
/*==========================================================================*/ /*==========================================================================*/
typedef uint8_t byte; typedef uint8_t byte;
typedef enum {
false = 0,
true = 1
} qboolean;
/*==========================================================================*/ /*==========================================================================*/
/* math */ /* math */

8
source/quakedef.h
View File

@ -239,7 +239,7 @@ typedef struct
// command line parms passed to the program, and the amount of memory // command line parms passed to the program, and the amount of memory
// available for the program to use // available for the program to use
extern qboolean noclip_anglehack; extern bool noclip_anglehack;
// //
// host // host
@ -252,7 +252,7 @@ extern cvar_t sys_nostdout;
extern cvar_t developer; extern cvar_t developer;
extern cvar_t max_edicts; //johnfitz extern cvar_t max_edicts; //johnfitz
extern qboolean host_initialized; // true if into command execution extern bool host_initialized; // true if into command execution
extern double host_frametime; extern double host_frametime;
extern byte *host_colormap; extern byte *host_colormap;
extern int host_framecount; // incremented every frame, never reset extern int host_framecount; // incremented every frame, never reset
@ -284,7 +284,7 @@ FUNC_NORETURN void Host_EndGame (const char *message, ...) FUNC_PRINTF(1,2);
void Host_Frame (float time); void Host_Frame (float time);
void Host_Quit_f (void); void Host_Quit_f (void);
void Host_ClientCommands (const char *fmt, ...) FUNC_PRINTF(1,2); void Host_ClientCommands (const char *fmt, ...) FUNC_PRINTF(1,2);
void Host_ShutdownServer (qboolean crash); void Host_ShutdownServer (bool crash);
void Host_WriteConfiguration (void); void Host_WriteConfiguration (void);
void ExtraMaps_Init (void); void ExtraMaps_Init (void);
@ -297,7 +297,7 @@ extern int current_skill; // skill level for currently loaded level (in case
// the user changes the cvar while the level is // the user changes the cvar while the level is
// running, this reflects the level actually in use) // running, this reflects the level actually in use)
extern qboolean isDedicated; extern bool isDedicated;
extern int minimum_memory; extern int minimum_memory;

8
source/r_alias.c
View File

@ -52,9 +52,9 @@ vec3_t shadevector;
float entalpha; //johnfitz float entalpha; //johnfitz
qboolean overbright; //johnfitz bool overbright; //johnfitz
qboolean shading = true; //johnfitz -- if false, disable vertex shading for various reasons (fullbright, r_lightmap, showtris, etc) bool shading = true; //johnfitz -- if false, disable vertex shading for various reasons (fullbright, r_lightmap, showtris, etc)
//johnfitz -- struct for passing lerp information to drawing functions //johnfitz -- struct for passing lerp information to drawing functions
typedef struct { typedef struct {
@ -305,7 +305,7 @@ void GL_DrawAliasFrame (aliashdr_t *paliashdr, lerpdata_t lerpdata)
int count; int count;
float u,v; float u,v;
float blend, iblend; float blend, iblend;
qboolean lerping; bool lerping;
if (lerpdata.pose1 != lerpdata.pose2) if (lerpdata.pose1 != lerpdata.pose2)
{ {
@ -628,7 +628,7 @@ void R_DrawAliasModel (entity_t *e)
int i, anim, skinnum; int i, anim, skinnum;
gltexture_t *tx, *fb; gltexture_t *tx, *fb;
lerpdata_t lerpdata; lerpdata_t lerpdata;
qboolean alphatest = !!(e->model->flags & MF_HOLEY); bool alphatest = !!(e->model->flags & MF_HOLEY);
// //
// setup pose/lerp data -- do it first so we don't miss updates due to culling // setup pose/lerp data -- do it first so we don't miss updates due to culling

2
source/r_brush.c
View File

@ -42,7 +42,7 @@ typedef struct glRect_s {
} glRect_t; } glRect_t;
glpoly_t *lightmap_polys[MAX_LIGHTMAPS]; glpoly_t *lightmap_polys[MAX_LIGHTMAPS];
qboolean lightmap_modified[MAX_LIGHTMAPS]; bool lightmap_modified[MAX_LIGHTMAPS];
glRect_t lightmap_rectchange[MAX_LIGHTMAPS]; glRect_t lightmap_rectchange[MAX_LIGHTMAPS];
int allocated[MAX_LIGHTMAPS][BLOCK_WIDTH]; int allocated[MAX_LIGHTMAPS][BLOCK_WIDTH];

16
source/r_world.c
View File

@ -82,7 +82,7 @@ void R_MarkSurfaces (void)
mnode_t *node; mnode_t *node;
msurface_t *surf, **mark; msurface_t *surf, **mark;
int i, j; int i, j;
qboolean nearwaterportal; bool nearwaterportal;
// clear lightmap chains // clear lightmap chains
memset (lightmap_polys, 0, sizeof(lightmap_polys)); memset (lightmap_polys, 0, sizeof(lightmap_polys));
@ -169,7 +169,7 @@ void R_MarkSurfaces (void)
R_BackFaceCull -- johnfitz -- returns true if the surface is facing away from vieworg R_BackFaceCull -- johnfitz -- returns true if the surface is facing away from vieworg
================ ================
*/ */
qboolean R_BackFaceCull (msurface_t *surf) bool R_BackFaceCull (msurface_t *surf)
{ {
double dot; double dot;
@ -397,7 +397,7 @@ void R_DrawTextureChains_Glow (qmodel_t *model, entity_t *ent, texchain_t chain)
msurface_t *s; msurface_t *s;
texture_t *t; texture_t *t;
gltexture_t *glt; gltexture_t *glt;
qboolean bound; bool bound;
for (i=0 ; i<model->numtextures ; i++) for (i=0 ; i<model->numtextures ; i++)
{ {
@ -515,7 +515,7 @@ void R_DrawTextureChains_Multitexture (qmodel_t *model, entity_t *ent, texchain_
msurface_t *s; msurface_t *s;
texture_t *t; texture_t *t;
float *v; float *v;
qboolean bound; bool bound;
for (i=0 ; i<model->numtextures ; i++) for (i=0 ; i<model->numtextures ; i++)
{ {
@ -569,7 +569,7 @@ void R_DrawTextureChains_NoTexture (qmodel_t *model, texchain_t chain)
int i; int i;
msurface_t *s; msurface_t *s;
texture_t *t; texture_t *t;
qboolean bound; bool bound;
for (i=0 ; i<model->numtextures ; i++) for (i=0 ; i<model->numtextures ; i++)
{ {
@ -604,7 +604,7 @@ void R_DrawTextureChains_TextureOnly (qmodel_t *model, entity_t *ent, texchain_t
int i; int i;
msurface_t *s; msurface_t *s;
texture_t *t; texture_t *t;
qboolean bound; bool bound;
for (i=0 ; i<model->numtextures ; i++) for (i=0 ; i<model->numtextures ; i++)
{ {
@ -664,7 +664,7 @@ void R_DrawTextureChains_Water (qmodel_t *model, entity_t *ent, texchain_t chain
msurface_t *s; msurface_t *s;
texture_t *t; texture_t *t;
glpoly_t *p; glpoly_t *p;
qboolean bound; bool bound;
float entalpha; float entalpha;
if (r_drawflat_cheatsafe || r_lightmap_cheatsafe) // ericw -- !r_drawworld_cheatsafe check moved to R_DrawWorld_Water () if (r_drawflat_cheatsafe || r_lightmap_cheatsafe) // ericw -- !r_drawworld_cheatsafe check moved to R_DrawWorld_Water ()
@ -906,7 +906,7 @@ void R_DrawTextureChains_GLSL (qmodel_t *model, entity_t *ent, texchain_t chain)
int i; int i;
msurface_t *s; msurface_t *s;
texture_t *t; texture_t *t;
qboolean bound; bool bound;
int lastlightmap; int lastlightmap;
gltexture_t *fullbright = NULL; gltexture_t *fullbright = NULL;
float entalpha; float entalpha;

4
source/render.h
View File

@ -48,7 +48,7 @@ typedef struct efrag_s
typedef struct entity_s typedef struct entity_s
{ {
qboolean forcelink; // model changed bool forcelink; // model changed
int update_type; int update_type;
@ -166,7 +166,7 @@ void R_PushDlights (void);
// surface cache related // surface cache related
// //
extern int reinit_surfcache; // if 1, surface cache is currently empty and extern int reinit_surfcache; // if 1, surface cache is currently empty and
extern qboolean r_cache_thrash; // set if thrashing the surface cache extern bool r_cache_thrash; // set if thrashing the surface cache
int D_SurfaceCacheForRes (int width, int height); int D_SurfaceCacheForRes (int width, int height);
void D_FlushCaches (void); void D_FlushCaches (void);

2
source/sbar.c
View File

@ -46,7 +46,7 @@ qpic_t *sb_face_quad;
qpic_t *sb_face_invuln; qpic_t *sb_face_invuln;
qpic_t *sb_face_invis_invuln; qpic_t *sb_face_invis_invuln;
qboolean sb_showscores; bool sb_showscores;
int sb_lines; // scan lines to draw int sb_lines; // scan lines to draw

4
source/screen.h
View File

@ -47,8 +47,8 @@ extern float scr_conlines; // lines of console to display
extern int sb_lines; extern int sb_lines;
extern int clearnotify; // set to 0 whenever notify text is drawn extern int clearnotify; // set to 0 whenever notify text is drawn
extern qboolean scr_disabled_for_loading; extern bool scr_disabled_for_loading;
extern qboolean scr_skipupdate; extern bool scr_skipupdate;
extern cvar_t scr_viewsize; extern cvar_t scr_viewsize;

22
source/server.h
View File

@ -31,7 +31,7 @@ typedef struct
int maxclientslimit; int maxclientslimit;
struct client_s *clients; // [maxclients] struct client_s *clients; // [maxclients]
int serverflags; // episode completion information int serverflags; // episode completion information
qboolean changelevel_issued; // cleared when at SV_SpawnServer bool changelevel_issued; // cleared when at SV_SpawnServer
} server_static_t; } server_static_t;
//============================================================================= //=============================================================================
@ -40,10 +40,10 @@ typedef enum {ss_loading, ss_active} server_state_t;
typedef struct typedef struct
{ {
qboolean active; // false if only a net client bool active; // false if only a net client
qboolean paused; bool paused;
qboolean loadgame; // handle connections specially bool loadgame; // handle connections specially
double time; double time;
@ -83,10 +83,10 @@ typedef struct
typedef struct client_s typedef struct client_s
{ {
qboolean active; // false = client is free bool active; // false = client is free
qboolean spawned; // false = don't send datagrams bool spawned; // false = don't send datagrams
qboolean dropasap; // has been told to go to another level bool dropasap; // has been told to go to another level
qboolean sendsignon; // only valid before spawned bool sendsignon; // only valid before spawned
double last_message; // reliable messages must be sent double last_message; // reliable messages must be sent
// periodically // periodically
@ -197,7 +197,7 @@ void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count);
void SV_StartSound (edict_t *entity, int channel, const char *sample, int volume, void SV_StartSound (edict_t *entity, int channel, const char *sample, int volume,
float attenuation); float attenuation);
void SV_DropClient (qboolean crash); void SV_DropClient (bool crash);
void SV_SendClientMessages (void); void SV_SendClientMessages (void);
void SV_ClearDatagram (void); void SV_ClearDatagram (void);
@ -216,8 +216,8 @@ void SV_BroadcastPrintf (const char *fmt, ...) FUNC_PRINTF(1,2);
void SV_Physics (void); void SV_Physics (void);
qboolean SV_CheckBottom (edict_t *ent); bool SV_CheckBottom (edict_t *ent);
qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink); bool SV_movestep (edict_t *ent, vec3_t move, bool relink);
void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg); void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg);

4
source/snd_codec.c
View File

@ -225,7 +225,7 @@ snd_stream_t *S_CodecOpenStreamAny (const char *filename)
} }
} }
qboolean S_CodecForwardStream (snd_stream_t *stream, uint32_t type) bool S_CodecForwardStream (snd_stream_t *stream, uint32_t type)
{ {
snd_codec_t *codec = codecs; snd_codec_t *codec = codecs;
@ -262,7 +262,7 @@ snd_stream_t *S_CodecUtilOpen(const char *filename, snd_codec_t *codec)
{ {
snd_stream_t *stream; snd_stream_t *stream;
FILE *handle; FILE *handle;
qboolean pak; bool pak;
long length; long length;
/* Try to open the file */ /* Try to open the file */

2
source/snd_codec.h
View File

@ -49,7 +49,7 @@ typedef struct snd_codec_s snd_codec_t;
typedef struct snd_stream_s typedef struct snd_stream_s
{ {
fshandle_t fh; fshandle_t fh;
qboolean pak; bool pak;
char name[MAX_QPATH]; /* name of the source file */ char name[MAX_QPATH]; /* name of the source file */
snd_info_t info; snd_info_t info;
stream_status_t status; stream_status_t status;

8
source/snd_codeci.h
View File

@ -27,9 +27,9 @@
#define _SND_CODECI_H_ #define _SND_CODECI_H_
/* Codec internals */ /* Codec internals */
typedef qboolean (*CODEC_INIT)(void); typedef bool (*CODEC_INIT)(void);
typedef void (*CODEC_SHUTDOWN)(void); typedef void (*CODEC_SHUTDOWN)(void);
typedef qboolean (*CODEC_OPEN)(snd_stream_t *stream); typedef bool (*CODEC_OPEN)(snd_stream_t *stream);
typedef int (*CODEC_READ)(snd_stream_t *stream, int bytes, void *buffer); typedef int (*CODEC_READ)(snd_stream_t *stream, int bytes, void *buffer);
typedef int (*CODEC_REWIND)(snd_stream_t *stream); typedef int (*CODEC_REWIND)(snd_stream_t *stream);
typedef void (*CODEC_CLOSE)(snd_stream_t *stream); typedef void (*CODEC_CLOSE)(snd_stream_t *stream);
@ -37,7 +37,7 @@ typedef void (*CODEC_CLOSE)(snd_stream_t *stream);
struct snd_codec_s struct snd_codec_s
{ {
uint32_t type; /* handled data type. (1U << n) */ uint32_t type; /* handled data type. (1U << n) */
qboolean initialized; /* init succeedded */ bool initialized; /* init succeedded */
const char *ext; /* expected extension */ const char *ext; /* expected extension */
CODEC_INIT initialize; CODEC_INIT initialize;
CODEC_SHUTDOWN shutdown; CODEC_SHUTDOWN shutdown;
@ -48,7 +48,7 @@ struct snd_codec_s
snd_codec_t *next; snd_codec_t *next;
}; };
qboolean S_CodecForwardStream (snd_stream_t *stream, uint32_t type); bool S_CodecForwardStream (snd_stream_t *stream, uint32_t type);
/* Forward a stream to another codec of 'type' type. */ /* Forward a stream to another codec of 'type' type. */
#endif /* _SND_CODECI_H_ */ #endif /* _SND_CODECI_H_ */

8
source/snd_dma.c
View File

@ -32,7 +32,7 @@ static void S_Play (void);
static void S_PlayVol (void); static void S_PlayVol (void);
static void S_SoundList (void); static void S_SoundList (void);
static void S_Update_ (void); static void S_Update_ (void);
void S_StopAllSounds (qboolean clear); void S_StopAllSounds (bool clear);
static void S_StopAllSoundsC (void); static void S_StopAllSoundsC (void);
// ======================================================================= // =======================================================================
@ -43,7 +43,7 @@ channel_t snd_channels[MAX_CHANNELS];
int total_channels; int total_channels;
static int snd_blocked = 0; static int snd_blocked = 0;
static qboolean snd_initialized = false; static bool snd_initialized = false;
static dma_t sn; static dma_t sn;
volatile dma_t *shm = NULL; volatile dma_t *shm = NULL;
@ -68,7 +68,7 @@ static int num_sfx;
static sfx_t *ambient_sfx[NUM_AMBIENTS]; static sfx_t *ambient_sfx[NUM_AMBIENTS];
static qboolean sound_started = false; static bool sound_started = false;
cvar_t bgmvolume = {"bgmvolume", "1", CVAR_ARCHIVE}; cvar_t bgmvolume = {"bgmvolume", "1", CVAR_ARCHIVE};
cvar_t sfxvolume = {"volume", "0.7", CVAR_ARCHIVE}; cvar_t sfxvolume = {"volume", "0.7", CVAR_ARCHIVE};
@ -532,7 +532,7 @@ void S_StopSound (int entnum, int entchannel)
} }
} }
void S_StopAllSounds (qboolean clear) void S_StopAllSounds (bool clear)
{ {
int i; int i;

4
source/snd_flac.c
View File

@ -232,7 +232,7 @@ flac_meta_func (const FLAC__StreamDecoder *decoder,
} }
static qboolean S_FLAC_CodecInitialize (void) static bool S_FLAC_CodecInitialize (void)
{ {
return true; return true;
} }
@ -241,7 +241,7 @@ static void S_FLAC_CodecShutdown (void)
{ {
} }
static qboolean S_FLAC_CodecOpenStream (snd_stream_t *stream) static bool S_FLAC_CodecOpenStream (snd_stream_t *stream)
{ {
flacfile_t *ff; flacfile_t *ff;
int rc; int rc;

4
source/snd_mikmod.c
View File

@ -78,7 +78,7 @@ static BOOL MIK_Eof (MREADER *r)
return FS_feof(((mik_priv_t *)r)->fh); return FS_feof(((mik_priv_t *)r)->fh);
} }
static qboolean S_MIKMOD_CodecInitialize (void) static bool S_MIKMOD_CodecInitialize (void)
{ {
if (mikmod_codec.initialized) if (mikmod_codec.initialized)
return true; return true;
@ -126,7 +126,7 @@ static void S_MIKMOD_CodecShutdown (void)
} }
} }
static qboolean S_MIKMOD_CodecOpenStream (snd_stream_t *stream) static bool S_MIKMOD_CodecOpenStream (snd_stream_t *stream)
{ {
mik_priv_t *priv; mik_priv_t *priv;

12
source/snd_mp3.c
View File

@ -67,7 +67,7 @@ typedef struct _mp3_priv_t
/* This function merges the functions tagtype() and id3_tag_query() /* This function merges the functions tagtype() and id3_tag_query()
* from MAD's libid3tag, so we don't have to link to it * from MAD's libid3tag, so we don't have to link to it
* Returns 0 if the frame is not an ID3 tag, tag length if it is */ * Returns 0 if the frame is not an ID3 tag, tag length if it is */
static inline qboolean tag_is_id3v1(const uint8_t *data, size_t length) static inline bool tag_is_id3v1(const uint8_t *data, size_t length)
{ {
if (length >= 3 && if (length >= 3 &&
data[0] == 'T' && data[1] == 'A' && data[2] == 'G') data[0] == 'T' && data[1] == 'A' && data[2] == 'G')
@ -77,7 +77,7 @@ static inline qboolean tag_is_id3v1(const uint8_t *data, size_t length)
return false; return false;
} }
static inline qboolean tag_is_id3v2(const uint8_t *data, size_t length) static inline bool tag_is_id3v2(const uint8_t *data, size_t length)
{ {
if (length >= 10 && if (length >= 10 &&
(data[0] == 'I' && data[1] == 'D' && data[2] == '3') && (data[0] == 'I' && data[1] == 'D' && data[2] == '3') &&
@ -93,7 +93,7 @@ static inline qboolean tag_is_id3v2(const uint8_t *data, size_t length)
* http://wiki.hydrogenaud.io/index.php?title=APEv2_specification * http://wiki.hydrogenaud.io/index.php?title=APEv2_specification
* Detect an APEv2 tag. (APEv1 has no header, so no luck.) * Detect an APEv2 tag. (APEv1 has no header, so no luck.)
*/ */
static inline qboolean tag_is_apetag(const uint8_t *data, size_t length) static inline bool tag_is_apetag(const uint8_t *data, size_t length)
{ {
uint32_t v; uint32_t v;
@ -394,7 +394,7 @@ static int mp3_madseek(snd_stream_t *stream, unsigned long offset)
size_t initial_bitrate = p->Frame.header.bitrate; size_t initial_bitrate = p->Frame.header.bitrate;
size_t tagsize = 0, consumed = 0; size_t tagsize = 0, consumed = 0;
int vbr = 0; /* Variable Bit Rate, bool */ int vbr = 0; /* Variable Bit Rate, bool */
qboolean depadded = false; bool depadded = false;
unsigned long to_skip_samples = 0; unsigned long to_skip_samples = 0;
/* Reset all */ /* Reset all */
@ -509,7 +509,7 @@ static int mp3_madseek(snd_stream_t *stream, unsigned long offset)
return -1; return -1;
} }
static qboolean S_MP3_CodecInitialize (void) static bool S_MP3_CodecInitialize (void)
{ {
return true; return true;
} }
@ -518,7 +518,7 @@ static void S_MP3_CodecShutdown (void)
{ {
} }
static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream) static bool S_MP3_CodecOpenStream (snd_stream_t *stream)
{ {
int err; int err;

4
source/snd_mpg123.c
View File

@ -61,7 +61,7 @@ static off_t mp3_seek (void *f, off_t offset, int whence)
return (off_t) FS_ftell((fshandle_t *)f); return (off_t) FS_ftell((fshandle_t *)f);
} }
static qboolean S_MP3_CodecInitialize (void) static bool S_MP3_CodecInitialize (void)
{ {
if (!mp3_codec.initialized) if (!mp3_codec.initialized)
{ {
@ -86,7 +86,7 @@ static void S_MP3_CodecShutdown (void)
} }
} }
static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream) static bool S_MP3_CodecOpenStream (snd_stream_t *stream)
{ {
long rate = 0; long rate = 0;
int encoding = 0, channels = 0; int encoding = 0, channels = 0;

4
source/snd_opus.c
View File

@ -75,7 +75,7 @@ static const OpusFileCallbacks opc_qfs =
(int (*)(void *)) opc_fclose (int (*)(void *)) opc_fclose
}; };
static qboolean S_OPUS_CodecInitialize (void) static bool S_OPUS_CodecInitialize (void)
{ {
return true; return true;
} }
@ -84,7 +84,7 @@ static void S_OPUS_CodecShutdown (void)
{ {
} }
static qboolean S_OPUS_CodecOpenStream (snd_stream_t *stream) static bool S_OPUS_CodecOpenStream (snd_stream_t *stream)
{ {
OggOpusFile *opFile; OggOpusFile *opFile;
const OpusHead *op_info; const OpusHead *op_info;

2
source/snd_sdl.c
View File

@ -72,7 +72,7 @@ static void SDLCALL paint_audio (void *unused, Uint8 *stream, int len)
shm->samplepos = 0; shm->samplepos = 0;
} }
qboolean SNDDMA_Init (dma_t *dma) bool SNDDMA_Init (dma_t *dma)
{ {
SDL_AudioSpec desired, obtained; SDL_AudioSpec desired, obtained;
int tmp, val; int tmp, val;

4
source/snd_umx.c
View File

@ -334,7 +334,7 @@ static int process_upkg (fshandle_t *f, int32_t *ofs, int32_t *objsize)
return probe_umx(f, (struct upkg_hdr *)header, ofs, objsize); return probe_umx(f, (struct upkg_hdr *)header, ofs, objsize);
} }
static qboolean S_UMX_CodecInitialize (void) static bool S_UMX_CodecInitialize (void)
{ {
return true; return true;
} }
@ -343,7 +343,7 @@ static void S_UMX_CodecShutdown (void)
{ {
} }
static qboolean S_UMX_CodecOpenStream (snd_stream_t *stream) static bool S_UMX_CodecOpenStream (snd_stream_t *stream)
{ {
int type; int type;
int32_t ofs = 0, size = 0; int32_t ofs = 0, size = 0;

4
source/snd_vorbis.c
View File

@ -65,7 +65,7 @@ static ov_callbacks ovc_qfs =
(long (*)(void *)) FS_ftell (long (*)(void *)) FS_ftell
}; };
static qboolean S_VORBIS_CodecInitialize (void) static bool S_VORBIS_CodecInitialize (void)
{ {
return true; return true;
} }
@ -74,7 +74,7 @@ static void S_VORBIS_CodecShutdown (void)
{ {
} }
static qboolean S_VORBIS_CodecOpenStream (snd_stream_t *stream) static bool S_VORBIS_CodecOpenStream (snd_stream_t *stream)
{ {
OggVorbis_File *ovFile; OggVorbis_File *ovFile;
vorbis_info *ovf_info; vorbis_info *ovf_info;

6
source/sv_main.c
View File

@ -30,7 +30,7 @@ static char localmodels[MAX_MODELS][8]; // inline model names for precache
int sv_protocol = PROTOCOL_FITZQUAKE; //johnfitz int sv_protocol = PROTOCOL_FITZQUAKE; //johnfitz
extern qboolean pr_alpha_supported; //johnfitz extern bool pr_alpha_supported; //johnfitz
//============================================================================ //============================================================================
@ -530,7 +530,7 @@ SV_VisibleToClient -- johnfitz
PVS test encapsulated in a nice function PVS test encapsulated in a nice function
============= =============
*/ */
qboolean SV_VisibleToClient (edict_t *client, edict_t *test, qmodel_t *worldmodel) bool SV_VisibleToClient (edict_t *client, edict_t *test, qmodel_t *worldmodel)
{ {
byte *pvs; byte *pvs;
vec3_t org; vec3_t org;
@ -951,7 +951,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
SV_SendClientDatagram SV_SendClientDatagram
======================= =======================
*/ */
qboolean SV_SendClientDatagram (client_t *client) bool SV_SendClientDatagram (client_t *client)
{ {
byte buf[MAX_DATAGRAM]; byte buf[MAX_DATAGRAM];
sizebuf_t msg; sizebuf_t msg;

8
source/sv_move.c
View File

@ -36,7 +36,7 @@ is not a staircase.
*/ */
int c_yes, c_no; int c_yes, c_no;
qboolean SV_CheckBottom (edict_t *ent) bool SV_CheckBottom (edict_t *ent)
{ {
vec3_t mins, maxs, start, stop; vec3_t mins, maxs, start, stop;
trace_t trace; trace_t trace;
@ -109,7 +109,7 @@ possible, no move is done, false is returned, and
pr_global_struct->trace_normal is set to the normal of the blocking wall pr_global_struct->trace_normal is set to the normal of the blocking wall
============= =============
*/ */
qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink) bool SV_movestep (edict_t *ent, vec3_t move, bool relink)
{ {
float dz; float dz;
vec3_t oldorg, neworg, end; vec3_t oldorg, neworg, end;
@ -232,7 +232,7 @@ facing it.
====================== ======================
*/ */
void PF_changeyaw (void); void PF_changeyaw (void);
qboolean SV_StepDirection (edict_t *ent, float yaw, float dist) bool SV_StepDirection (edict_t *ent, float yaw, float dist)
{ {
vec3_t move, oldorigin; vec3_t move, oldorigin;
float delta; float delta;
@ -372,7 +372,7 @@ SV_CloseEnough
====================== ======================
*/ */
qboolean SV_CloseEnough (edict_t *ent, edict_t *goal, float dist) bool SV_CloseEnough (edict_t *ent, edict_t *goal, float dist)
{ {
int i; int i;

6
source/sv_phys.c
View File

@ -120,7 +120,7 @@ in a frame. Not used for pushmove objects, because they must be exact.
Returns false if the entity removed itself. Returns false if the entity removed itself.
============= =============
*/ */
qboolean SV_RunThink (edict_t *ent) bool SV_RunThink (edict_t *ent)
{ {
float thinktime; float thinktime;
float oldframe; //johnfitz float oldframe; //johnfitz
@ -673,7 +673,7 @@ void SV_CheckStuck (edict_t *ent)
SV_CheckWater SV_CheckWater
============= =============
*/ */
qboolean SV_CheckWater (edict_t *ent) bool SV_CheckWater (edict_t *ent)
{ {
vec3_t point; vec3_t point;
int cont; int cont;
@ -1133,7 +1133,7 @@ will fall if the floor is pulled out from under them.
*/ */
void SV_Physics_Step (edict_t *ent) void SV_Physics_Step (edict_t *ent)
{ {
qboolean hitsound; bool hitsound;
// freefall if not onground // freefall if not onground
if ( ! ((int)ent->v.flags & (FL_ONGROUND | FL_FLY | FL_SWIM) ) ) if ( ! ((int)ent->v.flags & (FL_ONGROUND | FL_FLY | FL_SWIM) ) )

4
source/sv_user.c
View File

@ -36,7 +36,7 @@ float *angles;
float *origin; float *origin;
float *velocity; float *velocity;
qboolean onground; bool onground;
usercmd_t cmd; usercmd_t cmd;
@ -479,7 +479,7 @@ SV_ReadClientMessage
Returns false if the client should be killed Returns false if the client should be killed
=================== ===================
*/ */
qboolean SV_ReadClientMessage (void) bool SV_ReadClientMessage (void)
{ {
int ret; int ret;
int ccmd; int ccmd;

2
source/unix/net_udp.c
View File

@ -116,7 +116,7 @@ void UDP_Shutdown (void)
//============================================================================= //=============================================================================
void UDP_Listen (qboolean state) void UDP_Listen (bool state)
{ {
// enable listening // enable listening
if (state) if (state)

2
source/unix/net_udp.h
View File

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
sys_socket_t UDP_Init (void); sys_socket_t UDP_Init (void);
void UDP_Shutdown (void); void UDP_Shutdown (void);
void UDP_Listen (qboolean state); void UDP_Listen (bool state);
sys_socket_t UDP_OpenSocket (int port); sys_socket_t UDP_OpenSocket (int port);
int UDP_CloseSocket (sys_socket_t socketid); int UDP_CloseSocket (sys_socket_t socketid);
int UDP_Connect (sys_socket_t socketid, struct qsockaddr *addr); int UDP_Connect (sys_socket_t socketid, struct qsockaddr *addr);

2
source/unix/sys_sdl_unix.c
View File

@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <SDL.h> #include <SDL.h>
qboolean isDedicated; bool isDedicated;
cvar_t sys_throttle = {"sys_throttle", "0.02", CVAR_ARCHIVE}; cvar_t sys_throttle = {"sys_throttle", "0.02", CVAR_ARCHIVE};
#define MAX_HANDLES 32 /* johnfitz -- was 10 */ #define MAX_HANDLES 32 /* johnfitz -- was 10 */

4
source/vid.h
View File

@ -85,8 +85,8 @@ void VID_SyncCvars (void);
void VID_Toggle (void); void VID_Toggle (void);
void *VID_GetWindow (void); void *VID_GetWindow (void);
qboolean VID_HasMouseOrInputFocus (void); bool VID_HasMouseOrInputFocus (void);
qboolean VID_IsMinimized (void); bool VID_IsMinimized (void);
void VID_Lock (void); void VID_Lock (void);
#endif /* __VID_DEFS_H */ #endif /* __VID_DEFS_H */

2
source/view.c
View File

@ -486,7 +486,7 @@ V_UpdateBlend -- johnfitz -- V_UpdatePalette cleaned up and renamed
void V_UpdateBlend (void) void V_UpdateBlend (void)
{ {
int i, j; int i, j;
qboolean blend_changed; bool blend_changed;
V_CalcPowerupCshift (); V_CalcPowerupCshift ();

2
source/windows/net_wins.c
View File

@ -194,7 +194,7 @@ void WINS_Shutdown (void)
//============================================================================= //=============================================================================
void WINS_Listen (qboolean state) void WINS_Listen (bool state)
{ {
// enable listening // enable listening
if (state) if (state)

2
source/windows/net_wins.h
View File

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
sys_socket_t WINS_Init (void); sys_socket_t WINS_Init (void);
void WINS_Shutdown (void); void WINS_Shutdown (void);
void WINS_Listen (qboolean state); void WINS_Listen (bool state);
sys_socket_t WINS_OpenSocket (int port); sys_socket_t WINS_OpenSocket (int port);
int WINS_CloseSocket (sys_socket_t socketid); int WINS_CloseSocket (sys_socket_t socketid);
int WINS_Connect (sys_socket_t socketid, struct qsockaddr *addr); int WINS_Connect (sys_socket_t socketid, struct qsockaddr *addr);

4
source/windows/net_wipx.c
View File

@ -36,7 +36,7 @@ static sys_socket_t net_controlsocket;
static struct sockaddr_ipx broadcastaddr; static struct sockaddr_ipx broadcastaddr;
/* externs from net_wins.c: */ /* externs from net_wins.c: */
extern qboolean winsock_initialized; extern bool winsock_initialized;
extern WSADATA winsockdata; extern WSADATA winsockdata;
extern const char *__WSAE_StrError (int); extern const char *__WSAE_StrError (int);
@ -120,7 +120,7 @@ void WIPX_Shutdown (void)
//============================================================================= //=============================================================================
void WIPX_Listen (qboolean state) void WIPX_Listen (bool state)
{ {
// enable listening // enable listening
if (state) if (state)

2
source/windows/net_wipx.h
View File

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
sys_socket_t WIPX_Init (void); sys_socket_t WIPX_Init (void);
void WIPX_Shutdown (void); void WIPX_Shutdown (void);
void WIPX_Listen (qboolean state); void WIPX_Listen (bool state);
sys_socket_t WIPX_OpenSocket (int port); sys_socket_t WIPX_OpenSocket (int port);
int WIPX_CloseSocket (sys_socket_t socketid); int WIPX_CloseSocket (sys_socket_t socketid);
int WIPX_Connect (sys_socket_t socketid, struct qsockaddr *addr); int WIPX_Connect (sys_socket_t socketid, struct qsockaddr *addr);

4
source/windows/sys_sdl_win.c
View File

@ -36,8 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <SDL.h> #include <SDL.h>
qboolean isDedicated; bool isDedicated;
qboolean Win95, Win95old, WinNT, WinVista; bool Win95, Win95old, WinNT, WinVista;
cvar_t sys_throttle = {"sys_throttle", "0.02", CVAR_ARCHIVE}; cvar_t sys_throttle = {"sys_throttle", "0.02", CVAR_ARCHIVE};
static HANDLE hinput, houtput; static HANDLE hinput, houtput;

4
source/world.c
View File

@ -429,7 +429,7 @@ SV_LinkEdict
=============== ===============
*/ */
void SV_LinkEdict (edict_t *ent, qboolean touch_triggers) void SV_LinkEdict (edict_t *ent, bool touch_triggers)
{ {
areanode_t *node; areanode_t *node;
@ -603,7 +603,7 @@ SV_RecursiveHullCheck
================== ==================
*/ */
qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace) bool SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
{ {
mclipnode_t *node; //johnfitz -- was dclipnode_t mclipnode_t *node; //johnfitz -- was dclipnode_t
mplane_t *plane; mplane_t *plane;

10
source/world.h
View File

@ -31,9 +31,9 @@ typedef struct
typedef struct typedef struct
{ {
qboolean allsolid; // if true, plane is not valid bool allsolid; // if true, plane is not valid
qboolean startsolid; // if true, the initial point was in a solid area bool startsolid; // if true, the initial point was in a solid area
qboolean inopen, inwater; bool inopen, inwater;
float fraction; // time completed, 1.0 = didn't hit anything float fraction; // time completed, 1.0 = didn't hit anything
vec3_t endpos; // final position vec3_t endpos; // final position
plane_t plane; // surface normal at impact plane_t plane; // surface normal at impact
@ -54,7 +54,7 @@ void SV_UnlinkEdict (edict_t *ent);
// so it doesn't clip against itself // so it doesn't clip against itself
// flags ent->v.modified // flags ent->v.modified
void SV_LinkEdict (edict_t *ent, qboolean touch_triggers); void SV_LinkEdict (edict_t *ent, bool touch_triggers);
// Needs to be called any time an entity changes origin, mins, maxs, or solid // Needs to be called any time an entity changes origin, mins, maxs, or solid
// flags ent->v.modified // flags ent->v.modified
// sets ent->v.absmin and ent->v.absmax // sets ent->v.absmin and ent->v.absmax
@ -81,7 +81,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
// passedict is explicitly excluded from clipping checks (normally NULL) // passedict is explicitly excluded from clipping checks (normally NULL)
qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace); bool SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace);
#endif /* _QUAKE_WORLD_H */ #endif /* _QUAKE_WORLD_H */

10
source/zone.c
View File

@ -300,7 +300,7 @@ int hunk_size;
int hunk_low_used; int hunk_low_used;
int hunk_high_used; int hunk_high_used;
qboolean hunk_tempactive; bool hunk_tempactive;
int hunk_tempmark; int hunk_tempmark;
/* /*
@ -332,7 +332,7 @@ If "all" is specified, every single allocation is printed.
Otherwise, allocations with the same name will be totaled up before printing. Otherwise, allocations with the same name will be totaled up before printing.
============== ==============
*/ */
void Hunk_Print (qboolean all) void Hunk_Print (bool all)
{ {
hunk_t *h, *next, *endlow, *starthigh, *endhigh; hunk_t *h, *next, *endlow, *starthigh, *endhigh;
int count, sum; int count, sum;
@ -601,7 +601,7 @@ typedef struct cache_system_s
struct cache_system_s *lru_prev, *lru_next; // for LRU flushing struct cache_system_s *lru_prev, *lru_next; // for LRU flushing
} cache_system_t; } cache_system_t;
cache_system_t *Cache_TryAlloc (int size, qboolean nobottom); cache_system_t *Cache_TryAlloc (int size, bool nobottom);
cache_system_t cache_head; cache_system_t cache_head;
@ -715,7 +715,7 @@ Looks for a free block of memory between the high and low hunk marks
Size should already include the header and padding Size should already include the header and padding
============ ============
*/ */
cache_system_t *Cache_TryAlloc (int size, qboolean nobottom) cache_system_t *Cache_TryAlloc (int size, bool nobottom)
{ {
cache_system_t *cs, *new_cs; cache_system_t *cs, *new_cs;
@ -848,7 +848,7 @@ Cache_Free
Frees the memory and removes it from the LRU list Frees the memory and removes it from the LRU list
============== ==============
*/ */
void Cache_Free (cache_user_t *c, qboolean freetextures) //johnfitz -- added second argument void Cache_Free (cache_user_t *c, bool freetextures) //johnfitz -- added second argument
{ {
cache_system_t *cs; cache_system_t *cs;

2
source/zone.h
View File

@ -122,7 +122,7 @@ void *Cache_Check (cache_user_t *c);
// returns the cached data, and moves to the head of the LRU list // returns the cached data, and moves to the head of the LRU list
// if present, otherwise returns NULL // if present, otherwise returns NULL
void Cache_Free (cache_user_t *c, qboolean freetextures); //johnfitz -- added second argument void Cache_Free (cache_user_t *c, bool freetextures); //johnfitz -- added second argument
void *Cache_Alloc (cache_user_t *c, int size, const char *name); void *Cache_Alloc (cache_user_t *c, int size, const char *name);
// Returns NULL if all purgable data was tossed and there still // Returns NULL if all purgable data was tossed and there still