qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Massive whitespace cleanup.

Browse source 
Lots of trailing whitespace and otherwise blank lines.
This commit is contained in:
Bill Currie 2012-05-22 08:23:22 +09:00
parent 01773c7cd3
commit 23a38738fc
254 changed files with 1793 additions and 1793 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/QF/GL/ati.h
View file

@ -7,7 +7,7 @@
#define GL_ELEMENT_ARRAY_ATI 0x8768
#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769
#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A
typedef GLvoid (GLAPIENTRY *QF_PFNGLELEMENTPOINTERATIPROC)
(GLenum type, const GLvoid *pointer);
typedef GLvoid (GLAPIENTRY *QF_PFNGLDRAWELEMENTARRAYATIPROC)
@ -186,10 +186,10 @@ typedef GLvoid (GLAPIENTRY *QF_PFNGLALPHAFRAGMENTOP3ATIPROC)
GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
typedef GLvoid (GLAPIENTRY *QF_PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)
(GLuint dst, const GLfloat *value);
#endif // GL_ATI_fragment_shader
// GL_ATI_pn_triangles (Supported on R200+)
#ifndef GL_ATI_pn_triangles
#define GL_ATI_pn_triangles 1
@ -265,7 +265,7 @@ typedef GLvoid (GLAPIENTRY *QF_PFNGLGETVARIANTARRAYOBJECTIVATIPROC)
// GL_ATI_vertex_streams (Rage 128 & R100+)
#ifndef GL_ATI_vertex_streams
#define GL_ATI_vertex_streams 1
#define GL_MAX_VERTEX_STREAMS_ATI 0x876B
#define GL_VERTEX_SOURCE_ATI 0x876C
#define GL_VERTEX_STREAM0_ATI 0x876D
@ -276,7 +276,7 @@ typedef GLvoid (GLAPIENTRY *QF_PFNGLGETVARIANTARRAYOBJECTIVATIPROC)
#define GL_VERTEX_STREAM5_ATI 0x8772
#define GL_VERTEX_STREAM6_ATI 0x8773
#define GL_VERTEX_STREAM7_ATI 0x8774
typedef GLvoid (GLAPIENTRY *QF_PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)
(GLenum stream);
typedef GLvoid (GLAPIENTRY *QF_PFNGLVERTEXBLENDENVIATIPROC)
@ -359,7 +359,7 @@ typedef GLvoid (GLAPIENTRY *QF_PFNGLNORMALSTREAM3DVATIPROC)
// GL_ATIX_point_sprites (R100)
#ifndef GL_ATIX_point_sprites
#define GL_ATIX_point_sprites 1
#define GL_TEXTURE_POINT_MODE_ATIX 0x60b0
#define GL_TEXTURE_POINT_ONE_COORD_ATIX 0x60b1
#define GL_TEXTURE_POINT_SPRITE_ATIX 0x60b2
@ -373,29 +373,29 @@ typedef GLvoid (GLAPIENTRY *QF_PFNGLNORMALSTREAM3DVATIPROC)
// GL_ATIX_texture_env_combine3 (R100)
#ifndef GL_ATIX_texture_env_combine3
#define GL_ATIX_texture_env_combine3
#define GL_MODULATE_ADD_ATIX 0x8744
#define GL_MODULATE_SIGNED_ADD_ATIX 0x8745
#define GL_MODULATE_SUBTRACT_ATIX 0x8746
#endif // GL_ATIX_texture_env_combine3
// GL_ATIX_texture_env_route (R100)
#ifndef GL_ATIX_texture_env_route
#define GL_ATIX_texture_env_route 1
#define GL_SECONDARY_COLOR_ATIX 0x8747
#define GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748
#define GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749
#endif // GL_ATIX_texture_env_route
// GL_ATIX_vertex_shader_output_point_size (Rage 128 (sw), R100 (sw) & Chaplin)
#ifndef GL_ATIX_vertex_shader_output_point_size
#define GL_ATIX_vertex_shader_output_point_size 1
#define GL_OUTPUT_POINT_SIZE_ATIX 0x610E
#endif // GL_ATIX_vertex_shader_output_point_size

2
include/QF/GL/defines.h
View file

@ -741,7 +741,7 @@
#define GL_FUNC_REVERSE_SUBTRACT 0x800B
#define GL_BLEND_COLOR 0x8005
/* glPush/PopAttrib bits */
/* glPush/PopAttrib bits */
#define GL_CURRENT_BIT 0x00000001
#define GL_POINT_BIT 0x00000002
#define GL_LINE_BIT 0x00000004

8
include/QF/cbuf.h
View file

@ -51,10 +51,10 @@ typedef struct cbuf_args_s {
typedef struct cbuf_s {
cbuf_args_t *args;
struct cbuf_interpreter_s *interpreter;
struct cbuf_interpreter_s *interpreter;
struct cbuf_s *up, *down; // The stack
enum {
CBUF_STATE_NORMAL = 0, // Normal condition
CBUF_STATE_WAIT, // Buffer is stalled until next frame
@ -63,11 +63,11 @@ typedef struct cbuf_s {
CBUF_STATE_STACK, // A buffer has been added to the stack
CBUF_STATE_JUNK // Buffer can be freed or reused
} state;
int (*unknown_command)(void); // handle unkown commands. !0 = handled
qboolean strict; // Should we tolerate unknown commands?
double resumetime; // Time when stack can be executed again
void *data; // Pointer to interpreter data
} cbuf_t;

2
include/QF/classes/List.h
View file

@ -38,7 +38,7 @@ classDecl (List, Collection,
qboolean methodDecl (List, set, unsigned int index, Object *o);
Object * methodDecl (List, get, unsigned int index);
qboolean methodDecl (List, insertAt, unsigned int index, Object *o);
Object * methodDecl (List, removeAt, unsigned int index);
Object * methodDecl (List, removeAt, unsigned int index);
);
#define LIST(o) ((List *)(o))

2
include/QF/classes/String.h
View file

@ -33,7 +33,7 @@
#include "QF/object.h"
classDecl (String, Object,
classDecl (String, Object,
const char *str;
);
#define STRING(o) ((String *)(o))

2
include/QF/cvar.h
View file

@ -42,7 +42,7 @@ typedef struct cvar_s {
const char *default_string; ///< The default value of the cvar.
int flags; ///< Cvar flags
/** Callback for when the cvar value changes.
This allows for more flexibility in what happens when a cvar is
nodifed than can be achieved with flags alone. While a similar could
be done using commands, a cvar with a callback and CVAR_ARCHIVE set

2
include/QF/dstring.h
View file

@ -101,7 +101,7 @@ void dstring_replace (dstring_t *dstr, unsigned int pos, unsigned int rlen,
null terminated.
*/
char *dstring_freeze (dstring_t *dstr);
// String-specific functions
//@{
/** Allocate a new dstring pre-initialized as a null terminated string. size

2
include/QF/hash.h
View file

@ -174,7 +174,7 @@ void Hash_Free (hashtab_t *tab, void *ele);
/** hash a string.
\param str the string to hash
\return the hash value of the string.
this is the same function as used internally.
*/
unsigned long Hash_String (const char *str);

2
include/QF/keys.h
View file

@ -79,7 +79,7 @@ typedef enum {
QFK_GREATER = 62,
QFK_QUESTION = 63,
QFK_AT = 64,
/*
/*
Skip uppercase letters
*/
QFK_LEFTBRACKET = 91,

4
include/QF/modelgen.h
View file

@ -73,7 +73,7 @@ typedef struct {
typedef struct {
float st[2];
} tex_coord_t;
} tex_coord_t;
typedef struct {
int onseam;
@ -135,7 +135,7 @@ typedef struct {
// little-endian "IDPO"
#define IDHEADER_MDL (('O'<<24)+('P'<<16)+('D'<<8)+'I')
// little-endian "MD16" -- 16 bit vertices
#define HEADER_MDL16 (('6'<<24)+('1'<<16)+('D'<<8)+'M')

2
include/QF/pcx.h
View file

@ -53,7 +53,7 @@ typedef struct
\param data A pointer to the buffer containing the source image
\param width The width, in pixels, of the source image
\param height The height, in pixels, of the source image
\param rowbytes The number of bytes in a row of an image (usually the same
\param rowbytes The number of bytes in a row of an image (usually the same
as the width)
\param palette The palette in use for the texture.
\param flip If true, flip the order of lines output.

2
include/QF/plugin/snd_render.h
View file

@ -67,7 +67,7 @@ typedef struct snd_render_funcs_s {
P_S_LocalSound pS_LocalSound;
P_S_BlockSound pS_BlockSound;
P_S_UnblockSound pS_UnblockSound;
P_S_LoadSound pS_LoadSound;
P_S_LoadSound pS_LoadSound;
P_S_AllocChannel pS_AllocChannel;
P_S_ChannelStop pS_ChannelStop;
} snd_render_funcs_t;

24
include/QF/pr_comp.h
View file

@ -76,19 +76,19 @@ typedef enum {
OP_ADD_V,
OP_SUB_F,
OP_SUB_V,
OP_EQ_F,
OP_EQ_V,
OP_EQ_S,
OP_EQ_E,
OP_EQ_FN,
OP_NE_F,
OP_NE_V,
OP_NE_S,
OP_NE_E,
OP_NE_FN,
OP_LE_F,
OP_GE_F,
OP_LT_F,
@ -138,7 +138,7 @@ typedef enum {
OP_GOTO,
OP_AND,
OP_OR,
OP_BITAND,
OP_BITOR,
@ -331,12 +331,12 @@ typedef struct dfunction_s {
pr_int_t first_statement; // negative numbers are builtins
pr_int_t parm_start;
pr_int_t locals; // total ints of parms + locals
pr_int_t profile; // runtime
pr_int_t s_name;
pr_int_t s_file; // source file defined in
pr_int_t numparms;
uint8_t parm_size[MAX_PARMS];
} dfunction_t;
@ -368,25 +368,25 @@ typedef struct pr_va_list_s {
typedef struct dprograms_s {
pr_uint_t version;
pr_uint_t crc; // check of header file
pr_uint_t ofs_statements;
pr_uint_t numstatements; // statement 0 is an error
pr_uint_t ofs_globaldefs;
pr_uint_t numglobaldefs;
pr_uint_t ofs_fielddefs;
pr_uint_t numfielddefs;
pr_uint_t ofs_functions;
pr_int_t numfunctions; // function 0 is an empty
pr_uint_t ofs_strings;
pr_int_t numstrings; // first string is a null string
pr_uint_t ofs_globals;
pr_uint_t numglobals;
pr_uint_t entityfields;
} dprograms_t;

2
include/QF/progs.h
View file

@ -175,7 +175,7 @@ void PR_AddLoadFunc (progs_t *pr, pr_load_func_t *func);
/** Register a secondary function to be called after the progs code has been
loaded. These functions will be forgotten after each load. They will be
called in \e reverse order of being registered.
called in \e reverse order of being registered.
\param pr pointer to ::progs_t VM struct
\param func function to call
*/

2
include/QF/qfplist.h
View file

@ -54,7 +54,7 @@ typedef enum {
typedef struct plitem_s plitem_t;
/** Create an in-memory representation of the contents of a property list.
\param string the saved plist, as read from a file.
\return Returns an object equivalent to the passed-in string.

2
include/QF/quakefs.h
View file

@ -152,7 +152,7 @@ QFile *QFS_WOpen (const char *path, int zip);
/** Write a block of data to a file.
This is a convenience wrapper for QFS_Open().
This is a convenience wrapper for QFS_Open().
\param filename Path name of file to open, relative to ::qfs_userpath.
\param data Pointer to the block of data to be written.

4
include/QF/render.h
View file

@ -103,7 +103,7 @@ typedef struct entity_s {
int fullbright;
float min_light;
// FIXME: could turn these into a union
int trivial_accept;
struct mnode_s *topnode; // for bmodels, first world node that
@ -135,7 +135,7 @@ typedef struct
// right and bottom edges, for clamping
float fvrectright; // rightmost edge, for Alias clamping
float fvrectbottom; // bottommost edge, for Alias clamping
float horizontalFieldOfView; // at Z = 1.0, this many X is visible
float horizontalFieldOfView; // at Z = 1.0, this many X is visible
// 2.0 = 90 degrees
float xOrigin; // should probably always be 0.5
float yOrigin; // between be around 0.3 to 0.5

2
include/QF/screen.h
View file

@ -60,7 +60,7 @@ extern qboolean hudswap;
extern struct cvar_s *scr_fov;
extern struct cvar_s *scr_viewsize;
// only the refresh window will be updated unless these variables are flagged
// only the refresh window will be updated unless these variables are flagged
extern struct qpic_s *scr_ram;
extern struct qpic_s *scr_net;

2
include/QF/vid.h
View file

@ -48,7 +48,7 @@ typedef struct {
unsigned int *colormap32; // 256 * VID_GRADES size
int fullbright; // index of first fullbright color
unsigned int rowbytes; // may be > width if displayed in a window
unsigned int width;
unsigned int width;
unsigned int height;
float aspect; // width / height -- < 1 is taller than wide
int numpages;

2
include/QF/view.h
View file

@ -39,7 +39,7 @@
/** Control the positioning of a view within its parent. The directions are
the standard compass rose (north, east, south, west in clockwise order)
with north at the top.
The origin of the view is taken to be the point corresponding point on the
edge of the view (eg, southeast is bottom right), or the view's center for
center gravity. When the relative coordinates of the view are (0,0), the

2
include/anorm_dots.h
View file

@ -157,7 +157,7 @@
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00
},
{

324
include/anorms.h
View file

@ -27,165 +27,165 @@
#if defined(_WIN32) && !defined(__GNUC__)
# pragma warning(disable:4305)
#endif
{-0.525731, 0.000000, 0.850651},
{-0.442863, 0.238856, 0.864188},
{-0.295242, 0.000000, 0.955423},
{-0.309017, 0.500000, 0.809017},
{-0.162460, 0.262866, 0.951056},
{0.000000, 0.000000, 1.000000},
{0.000000, 0.850651, 0.525731},
{-0.147621, 0.716567, 0.681718},
{0.147621, 0.716567, 0.681718},
{0.000000, 0.525731, 0.850651},
{0.309017, 0.500000, 0.809017},
{0.525731, 0.000000, 0.850651},
{0.295242, 0.000000, 0.955423},
{0.442863, 0.238856, 0.864188},
{0.162460, 0.262866, 0.951056},
{-0.681718, 0.147621, 0.716567},
{-0.809017, 0.309017, 0.500000},
{-0.587785, 0.425325, 0.688191},
{-0.850651, 0.525731, 0.000000},
{-0.864188, 0.442863, 0.238856},
{-0.716567, 0.681718, 0.147621},
{-0.688191, 0.587785, 0.425325},
{-0.500000, 0.809017, 0.309017},
{-0.238856, 0.864188, 0.442863},
{-0.425325, 0.688191, 0.587785},
{-0.716567, 0.681718, -0.147621},
{-0.500000, 0.809017, -0.309017},
{-0.525731, 0.850651, 0.000000},
{0.000000, 0.850651, -0.525731},
{-0.238856, 0.864188, -0.442863},
{0.000000, 0.955423, -0.295242},
{-0.262866, 0.951056, -0.162460},
{0.000000, 1.000000, 0.000000},
{0.000000, 0.955423, 0.295242},
{-0.262866, 0.951056, 0.162460},
{0.238856, 0.864188, 0.442863},
{0.262866, 0.951056, 0.162460},
{0.500000, 0.809017, 0.309017},
{0.238856, 0.864188, -0.442863},
{0.262866, 0.951056, -0.162460},
{0.500000, 0.809017, -0.309017},
{0.850651, 0.525731, 0.000000},
{0.716567, 0.681718, 0.147621},
{0.716567, 0.681718, -0.147621},
{0.525731, 0.850651, 0.000000},
{0.425325, 0.688191, 0.587785},
{0.864188, 0.442863, 0.238856},
{0.688191, 0.587785, 0.425325},
{0.809017, 0.309017, 0.500000},
{0.681718, 0.147621, 0.716567},
{0.587785, 0.425325, 0.688191},
{0.955423, 0.295242, 0.000000},
{1.000000, 0.000000, 0.000000},
{0.951056, 0.162460, 0.262866},
{0.850651, -0.525731, 0.000000},
{0.955423, -0.295242, 0.000000},
{0.864188, -0.442863, 0.238856},
{0.951056, -0.162460, 0.262866},
{0.809017, -0.309017, 0.500000},
{0.681718, -0.147621, 0.716567},
{0.850651, 0.000000, 0.525731},
{0.864188, 0.442863, -0.238856},
{0.809017, 0.309017, -0.500000},
{0.951056, 0.162460, -0.262866},
{0.525731, 0.000000, -0.850651},
{0.681718, 0.147621, -0.716567},
{0.681718, -0.147621, -0.716567},
{0.850651, 0.000000, -0.525731},
{0.809017, -0.309017, -0.500000},
{0.864188, -0.442863, -0.238856},
{0.951056, -0.162460, -0.262866},
{0.147621, 0.716567, -0.681718},
{0.309017, 0.500000, -0.809017},
{0.425325, 0.688191, -0.587785},
{0.442863, 0.238856, -0.864188},
{0.587785, 0.425325, -0.688191},
{0.688191, 0.587785, -0.425325},
{-0.147621, 0.716567, -0.681718},
{-0.309017, 0.500000, -0.809017},
{0.000000, 0.525731, -0.850651},
{-0.525731, 0.000000, -0.850651},
{-0.442863, 0.238856, -0.864188},
{-0.295242, 0.000000, -0.955423},
{-0.162460, 0.262866, -0.951056},
{0.000000, 0.000000, -1.000000},
{0.295242, 0.000000, -0.955423},
{0.162460, 0.262866, -0.951056},
{-0.442863, -0.238856, -0.864188},
{-0.309017, -0.500000, -0.809017},
{-0.162460, -0.262866, -0.951056},
{0.000000, -0.850651, -0.525731},
{-0.147621, -0.716567, -0.681718},
{0.147621, -0.716567, -0.681718},
{0.000000, -0.525731, -0.850651},
{0.309017, -0.500000, -0.809017},
{0.442863, -0.238856, -0.864188},
{0.162460, -0.262866, -0.951056},
{0.238856, -0.864188, -0.442863},
{0.500000, -0.809017, -0.309017},
{0.425325, -0.688191, -0.587785},
{0.716567, -0.681718, -0.147621},
{0.688191, -0.587785, -0.425325},
{0.587785, -0.425325, -0.688191},
{0.000000, -0.955423, -0.295242},
{0.000000, -1.000000, 0.000000},
{0.262866, -0.951056, -0.162460},
{0.000000, -0.850651, 0.525731},
{0.000000, -0.955423, 0.295242},
{0.238856, -0.864188, 0.442863},
{0.262866, -0.951056, 0.162460},
{0.500000, -0.809017, 0.309017},
{0.716567, -0.681718, 0.147621},
{0.525731, -0.850651, 0.000000},
{-0.238856, -0.864188, -0.442863},
{-0.500000, -0.809017, -0.309017},
{-0.262866, -0.951056, -0.162460},
{-0.850651, -0.525731, 0.000000},
{-0.716567, -0.681718, -0.147621},
{-0.716567, -0.681718, 0.147621},
{-0.525731, -0.850651, 0.000000},
{-0.500000, -0.809017, 0.309017},
{-0.238856, -0.864188, 0.442863},
{-0.262866, -0.951056, 0.162460},
{-0.864188, -0.442863, 0.238856},
{-0.809017, -0.309017, 0.500000},
{-0.688191, -0.587785, 0.425325},
{-0.681718, -0.147621, 0.716567},
{-0.442863, -0.238856, 0.864188},
{-0.587785, -0.425325, 0.688191},
{-0.309017, -0.500000, 0.809017},
{-0.147621, -0.716567, 0.681718},
{-0.425325, -0.688191, 0.587785},
{-0.162460, -0.262866, 0.951056},
{0.442863, -0.238856, 0.864188},
{0.162460, -0.262866, 0.951056},
{0.309017, -0.500000, 0.809017},
{0.147621, -0.716567, 0.681718},
{0.000000, -0.525731, 0.850651},
{0.425325, -0.688191, 0.587785},
{0.587785, -0.425325, 0.688191},
{0.688191, -0.587785, 0.425325},
{-0.955423, 0.295242, 0.000000},
{-0.951056, 0.162460, 0.262866},
{-1.000000, 0.000000, 0.000000},
{-0.850651, 0.000000, 0.525731},
{-0.955423, -0.295242, 0.000000},
{-0.951056, -0.162460, 0.262866},
{-0.864188, 0.442863, -0.238856},
{-0.951056, 0.162460, -0.262866},
{-0.809017, 0.309017, -0.500000},
{-0.864188, -0.442863, -0.238856},
{-0.951056, -0.162460, -0.262866},
{-0.809017, -0.309017, -0.500000},
{-0.681718, 0.147621, -0.716567},
{-0.681718, -0.147621, -0.716567},
{-0.850651, 0.000000, -0.525731},
{-0.688191, 0.587785, -0.425325},
{-0.587785, 0.425325, -0.688191},
{-0.425325, 0.688191, -0.587785},
{-0.425325, -0.688191, -0.587785},
{-0.587785, -0.425325, -0.688191},
{-0.688191, -0.587785, -0.425325},
{-0.525731, 0.000000, 0.850651},
{-0.442863, 0.238856, 0.864188},
{-0.295242, 0.000000, 0.955423},
{-0.309017, 0.500000, 0.809017},
{-0.162460, 0.262866, 0.951056},
{0.000000, 0.000000, 1.000000},
{0.000000, 0.850651, 0.525731},
{-0.147621, 0.716567, 0.681718},
{0.147621, 0.716567, 0.681718},
{0.000000, 0.525731, 0.850651},
{0.309017, 0.500000, 0.809017},
{0.525731, 0.000000, 0.850651},
{0.295242, 0.000000, 0.955423},
{0.442863, 0.238856, 0.864188},
{0.162460, 0.262866, 0.951056},
{-0.681718, 0.147621, 0.716567},
{-0.809017, 0.309017, 0.500000},
{-0.587785, 0.425325, 0.688191},
{-0.850651, 0.525731, 0.000000},
{-0.864188, 0.442863, 0.238856},
{-0.716567, 0.681718, 0.147621},
{-0.688191, 0.587785, 0.425325},
{-0.500000, 0.809017, 0.309017},
{-0.238856, 0.864188, 0.442863},
{-0.425325, 0.688191, 0.587785},
{-0.716567, 0.681718, -0.147621},
{-0.500000, 0.809017, -0.309017},
{-0.525731, 0.850651, 0.000000},
{0.000000, 0.850651, -0.525731},
{-0.238856, 0.864188, -0.442863},
{0.000000, 0.955423, -0.295242},
{-0.262866, 0.951056, -0.162460},
{0.000000, 1.000000, 0.000000},
{0.000000, 0.955423, 0.295242},
{-0.262866, 0.951056, 0.162460},
{0.238856, 0.864188, 0.442863},
{0.262866, 0.951056, 0.162460},
{0.500000, 0.809017, 0.309017},
{0.238856, 0.864188, -0.442863},
{0.262866, 0.951056, -0.162460},
{0.500000, 0.809017, -0.309017},
{0.850651, 0.525731, 0.000000},
{0.716567, 0.681718, 0.147621},
{0.716567, 0.681718, -0.147621},
{0.525731, 0.850651, 0.000000},
{0.425325, 0.688191, 0.587785},
{0.864188, 0.442863, 0.238856},
{0.688191, 0.587785, 0.425325},
{0.809017, 0.309017, 0.500000},
{0.681718, 0.147621, 0.716567},
{0.587785, 0.425325, 0.688191},
{0.955423, 0.295242, 0.000000},
{1.000000, 0.000000, 0.000000},
{0.951056, 0.162460, 0.262866},
{0.850651, -0.525731, 0.000000},
{0.955423, -0.295242, 0.000000},
{0.864188, -0.442863, 0.238856},
{0.951056, -0.162460, 0.262866},
{0.809017, -0.309017, 0.500000},
{0.681718, -0.147621, 0.716567},
{0.850651, 0.000000, 0.525731},
{0.864188, 0.442863, -0.238856},
{0.809017, 0.309017, -0.500000},
{0.951056, 0.162460, -0.262866},
{0.525731, 0.000000, -0.850651},
{0.681718, 0.147621, -0.716567},
{0.681718, -0.147621, -0.716567},
{0.850651, 0.000000, -0.525731},
{0.809017, -0.309017, -0.500000},
{0.864188, -0.442863, -0.238856},
{0.951056, -0.162460, -0.262866},
{0.147621, 0.716567, -0.681718},
{0.309017, 0.500000, -0.809017},
{0.425325, 0.688191, -0.587785},
{0.442863, 0.238856, -0.864188},
{0.587785, 0.425325, -0.688191},
{0.688191, 0.587785, -0.425325},
{-0.147621, 0.716567, -0.681718},
{-0.309017, 0.500000, -0.809017},
{0.000000, 0.525731, -0.850651},
{-0.525731, 0.000000, -0.850651},
{-0.442863, 0.238856, -0.864188},
{-0.295242, 0.000000, -0.955423},
{-0.162460, 0.262866, -0.951056},
{0.000000, 0.000000, -1.000000},
{0.295242, 0.000000, -0.955423},
{0.162460, 0.262866, -0.951056},
{-0.442863, -0.238856, -0.864188},
{-0.309017, -0.500000, -0.809017},
{-0.162460, -0.262866, -0.951056},
{0.000000, -0.850651, -0.525731},
{-0.147621, -0.716567, -0.681718},
{0.147621, -0.716567, -0.681718},
{0.000000, -0.525731, -0.850651},
{0.309017, -0.500000, -0.809017},
{0.442863, -0.238856, -0.864188},
{0.162460, -0.262866, -0.951056},
{0.238856, -0.864188, -0.442863},
{0.500000, -0.809017, -0.309017},
{0.425325, -0.688191, -0.587785},
{0.716567, -0.681718, -0.147621},
{0.688191, -0.587785, -0.425325},
{0.587785, -0.425325, -0.688191},
{0.000000, -0.955423, -0.295242},
{0.000000, -1.000000, 0.000000},
{0.262866, -0.951056, -0.162460},
{0.000000, -0.850651, 0.525731},
{0.000000, -0.955423, 0.295242},
{0.238856, -0.864188, 0.442863},
{0.262866, -0.951056, 0.162460},
{0.500000, -0.809017, 0.309017},
{0.716567, -0.681718, 0.147621},
{0.525731, -0.850651, 0.000000},
{-0.238856, -0.864188, -0.442863},
{-0.500000, -0.809017, -0.309017},
{-0.262866, -0.951056, -0.162460},
{-0.850651, -0.525731, 0.000000},
{-0.716567, -0.681718, -0.147621},
{-0.716567, -0.681718, 0.147621},
{-0.525731, -0.850651, 0.000000},
{-0.500000, -0.809017, 0.309017},
{-0.238856, -0.864188, 0.442863},
{-0.262866, -0.951056, 0.162460},
{-0.864188, -0.442863, 0.238856},
{-0.809017, -0.309017, 0.500000},
{-0.688191, -0.587785, 0.425325},
{-0.681718, -0.147621, 0.716567},
{-0.442863, -0.238856, 0.864188},
{-0.587785, -0.425325, 0.688191},
{-0.309017, -0.500000, 0.809017},
{-0.147621, -0.716567, 0.681718},
{-0.425325, -0.688191, 0.587785},
{-0.162460, -0.262866, 0.951056},
{0.442863, -0.238856, 0.864188},
{0.162460, -0.262866, 0.951056},
{0.309017, -0.500000, 0.809017},
{0.147621, -0.716567, 0.681718},
{0.000000, -0.525731, 0.850651},
{0.425325, -0.688191, 0.587785},
{0.587785, -0.425325, 0.688191},
{0.688191, -0.587785, 0.425325},
{-0.955423, 0.295242, 0.000000},
{-0.951056, 0.162460, 0.262866},
{-1.000000, 0.000000, 0.000000},
{-0.850651, 0.000000, 0.525731},
{-0.955423, -0.295242, 0.000000},
{-0.951056, -0.162460, 0.262866},
{-0.864188, 0.442863, -0.238856},
{-0.951056, 0.162460, -0.262866},
{-0.809017, 0.309017, -0.500000},
{-0.864188, -0.442863, -0.238856},
{-0.951056, -0.162460, -0.262866},
{-0.809017, -0.309017, -0.500000},
{-0.681718, 0.147621, -0.716567},
{-0.681718, -0.147621, -0.716567},
{-0.850651, 0.000000, -0.525731},
{-0.688191, 0.587785, -0.425325},
{-0.587785, 0.425325, -0.688191},
{-0.425325, 0.688191, -0.587785},
{-0.425325, -0.688191, -0.587785},
{-0.587785, -0.425325, -0.688191},
{-0.688191, -0.587785, -0.425325},

2
include/asm_draw.h
View file

@ -61,7 +61,7 @@
#define spanpackage_t_tfrac 20
#define spanpackage_t_light 24
#define spanpackage_t_zi 28
#define spanpackage_t_size 32
#define spanpackage_t_size 32
// edge_t structure
// !!! if this is changed, it must be changed in r_shared.h too !!!

4
include/d_iface.h
View file

@ -126,7 +126,7 @@ typedef struct {
typedef struct
{
int nump;
emitpoint_t *pverts; // there's room for an extra element at [nump],
emitpoint_t *pverts; // there's room for an extra element at [nump],
// if the driver wants to duplicate element [0] at
// element [nump] to avoid dealing with wrapping
mspriteframe_t *pspriteframe;
@ -155,7 +155,7 @@ extern qboolean r_recursiveaffinetriangles; // true if a driver wants to use
// recursive triangular subdivison
// and vertex drawing via
// D_PolysetDrawFinalVerts() past
// a certain distance (normally
// a certain distance (normally
// used only by the software
// driver)
extern int r_pixbytes;

2
include/exp.h
View file

@ -24,7 +24,7 @@
typedef enum {TOKEN_GENERIC, TOKEN_NUM, TOKEN_OP, TOKEN_FUNC, TOKEN_OPAREN, TOKEN_CPAREN, TOKEN_COMMA}
token_type;
typedef enum {EXP_E_NORMAL = 0, EXP_E_PARSE, EXP_E_INVOP, EXP_E_PAREN,
typedef enum {EXP_E_NORMAL = 0, EXP_E_PARSE, EXP_E_INVOP, EXP_E_PAREN,
EXP_E_INVPARAM, EXP_E_SYNTAX} exp_error_t;
typedef double (*opfunc) (double op1, double op2);
typedef double (*funcfunc) (double *oplist, unsigned int numops);

2
include/gib_buffer.h
View file

@ -25,7 +25,7 @@
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifndef __gib_buffer_h

2
include/mod_internal.h
View file

@ -54,7 +54,7 @@ void sw_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
void Mod_LoadIQM (model_t *mod, void *buffer);
void Mod_FreeIQM (iqm_t *iqm);
iqmblend_t *Mod_IQMBuildBlendPalette (iqm_t *iqm, int *size);
void Mod_LoadAliasModel (model_t *mod, void *buffer,
void Mod_LoadAliasModel (model_t *mod, void *buffer,
cache_allocator_t allocator);
void Mod_LoadSpriteModel (model_t *mod, void *buffer);

2
include/netmain.h
View file

@ -170,7 +170,7 @@ typedef struct qsocket_s {
qboolean canSend; ///< Socket can send a message.
qboolean sendNext;
//@}
/// \name socket drivers
//@{
int driver; ///< Net driver used by this socket.

2
include/quakeasm.h
View file

@ -215,7 +215,7 @@
.extern fp_64k
.extern fp_1m
.extern fp_1m_minus_1
.extern fp_8
.extern fp_8
.extern entryvec_table
.extern advancetable
.extern sstep

2
include/qw/protocol.h
View file

@ -106,7 +106,7 @@
#define svc_updateuserinfo 40 // [byte] slot [long] uid [string] userinfo
#define svc_download 41 // [short] size [size bytes]
#define svc_playerinfo 42 // variable
#define svc_nails 43 // [byte] num [48 bits] xyzpy 12 12 12 4 8
#define svc_nails 43 // [byte] num [48 bits] xyzpy 12 12 12 4 8
#define svc_chokecount 44 // [byte] packets choked
#define svc_modellist 45 // [strings]
#define svc_soundlist 46 // [strings]

36
include/regex.h
View file

@ -42,7 +42,7 @@ typedef unsigned reg_syntax_t;
#define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
/* If this bit is not set, then + and ? are operators, and \+ and \? are
literals.
literals.
If set, then \+ and \? are operators and + and ? are literals. */
#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
@ -58,7 +58,7 @@ typedef unsigned reg_syntax_t;
^ is an anchor if it is at the beginning of a regular
expression or after an open-group or an alternation operator;
$ is an anchor if it is at the end of a regular expression, or
before a close-group or an alternation operator.
before a close-group or an alternation operator.
This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
POSIX draft 11.2 says that * etc. in leading positions is undefined.
@ -69,7 +69,7 @@ typedef unsigned reg_syntax_t;
/* If this bit is set, then special characters are always special
regardless of where they are in the pattern.
If this bit is not set, then special characters are special only in
some contexts; otherwise they are ordinary. Specifically,
some contexts; otherwise they are ordinary. Specifically,
* + ? and intervals are only special when not after the beginning,
open-group, or alternation operator. */
#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
@ -91,7 +91,7 @@ typedef unsigned reg_syntax_t;
#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
/* If this bit is set, either \{...\} or {...} defines an
interval, depending on RE_NO_BK_BRACES.
interval, depending on RE_NO_BK_BRACES.
If not set, \{, \}, {, and } are literals. */
#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
@ -116,7 +116,7 @@ typedef unsigned reg_syntax_t;
If not set, then \<digit> is a back-reference. */
#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
/* If this bit is set, then | is an alternation operator, and \| is literal.
/* If this bit is set, then | is an alternation operator, and \| is literal.
If not set, then \| is an alternation operator, and | is literal. */
#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
@ -135,10 +135,10 @@ typedef unsigned reg_syntax_t;
stored in the pattern buffer, so changing this does not affect
already-compiled regexps. */
extern reg_syntax_t re_syntax_options;
/* Define combinations of the above bits for the standard possibilities.
(The [[[ comments delimit what gets put into the Texinfo file, so
don't delete them!) */
don't delete them!) */
/* [[[begin syntaxes]]] */
#define RE_SYNTAX_EMACS 0
@ -198,14 +198,14 @@ extern reg_syntax_t re_syntax_options;
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
| RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD)
/* [[[end syntaxes]]] */
/* Maximum number of duplicates an interval can allow. Some systems
(erroneously) define this in other header files, but we want our
value, so remove any previous define. */
#ifdef RE_DUP_MAX
#undef RE_DUP_MAX
#endif
#define RE_DUP_MAX ((1 << 15) - 1)
#define RE_DUP_MAX ((1 << 15) - 1)
/* POSIX `cflags' bits (i.e., information for `regcomp'). */
@ -217,7 +217,7 @@ extern reg_syntax_t re_syntax_options;
/* If this bit is set, then ignore case when matching.
If not set, then case is significant. */
#define REG_ICASE (REG_EXTENDED << 1)
/* If this bit is set, then anchors do not match at newline
characters in the string.
If not set, then anchors do match at newlines. */
@ -256,7 +256,7 @@ typedef enum
REG_EESCAPE, /* Trailing backslash. */
REG_ESUBREG, /* Invalid back reference. */
REG_EBRACK, /* Unmatched left bracket. */
REG_EPAREN, /* Parenthesis imbalance. */
REG_EPAREN, /* Parenthesis imbalance. */
REG_EBRACE, /* Unmatched \{. */
REG_BADBR, /* Invalid contents of \{\}. */
REG_ERANGE, /* Invalid range end. */
@ -268,7 +268,7 @@ typedef enum
REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */
REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */
} reg_errcode_t;
/* This data structure represents a compiled pattern. Before calling
the pattern compiler, the fields `buffer', `allocated', `fastmap',
`translate', and `no_sub' can be set. After the pattern has been
@ -287,7 +287,7 @@ struct re_pattern_buffer
unsigned long allocated;
/* Number of bytes actually used in `buffer'. */
unsigned long used;
unsigned long used;
/* Syntax setting with which the pattern was compiled. */
reg_syntax_t syntax;
@ -331,7 +331,7 @@ struct re_pattern_buffer
unsigned no_sub : 1;
/* If set, a beginning-of-line anchor doesn't match at the
beginning of the string. */
beginning of the string. */
unsigned not_bol : 1;
/* Similarly for an end-of-line anchor. */
@ -349,7 +349,7 @@ typedef struct re_pattern_buffer regex_t;
/* search.c (search_buffer) in Emacs needs this one opcode value. It is
defined both in `regex.c' and here. */
#define RE_EXACTN_VALUE 1
/* Type for byte offsets within the string. POSIX mandates this. */
typedef int regoff_t;
@ -380,7 +380,7 @@ typedef struct
regoff_t rm_so; /* Byte offset from string's start to substring's start. */
regoff_t rm_eo; /* Byte offset from string's start to substring's end. */
} regmatch_t;
/* Declarations for routines. */
/* To avoid duplicating every routine declaration -- once with a
@ -443,7 +443,7 @@ extern int re_match
/* Relates to `re_match' as `re_search_2' relates to `re_search'. */
extern int re_match_2
extern int re_match_2
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
int length1, const char *string2, int length2,
int start, struct re_registers *regs, int stop));
@ -480,7 +480,7 @@ extern size_t regerror
extern void regfree _RE_ARGS ((regex_t *preg));
#endif /* not __REGEXP_LIBRARY_H__ */
/*
Local variables:
make-backup-files: t

2
include/skin_stencil.h
View file

@ -4,7 +4,7 @@
Stencil for determining fullbright pixels in a skin
Derived from base.pcx, Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2

4
include/snd_internal.h
View file

@ -246,7 +246,7 @@ extern portable_samplepair_t snd_paintbuffer[PAINTBUFFER_SIZE * 2];
\param info
\param loader
*/
void SND_SFX_Cache (sfx_t *sfx, char *realname, wavinfo_t info,
void SND_SFX_Cache (sfx_t *sfx, char *realname, wavinfo_t info,
cache_loader_t loader);
/** Stream sound data. Initializes streaming fields of sfx.
@ -255,7 +255,7 @@ void SND_SFX_Cache (sfx_t *sfx, char *realname, wavinfo_t info,
\param info
\param open
*/
void SND_SFX_Stream (sfx_t *sfx, char *realname, wavinfo_t info,
void SND_SFX_Stream (sfx_t *sfx, char *realname, wavinfo_t info,
sfx_t *(*open) (sfx_t *sfx));
/** Open a stream for playback.

16
include/vgamodes.h
View file

@ -541,14 +541,14 @@ vmode_t vgavidmodes[] = {
NULL,
"360x200", NULL, 360, 200, (200.0/360.0)*(320.0/240.0),
384, 1, 1, &extra360x200x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
NULL,
"320x240", NULL, 320, 240, (240.0/320.0)*(320.0/240.0),
320, 1, 1, &extra320x240x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
@ -562,42 +562,42 @@ vmode_t vgavidmodes[] = {
NULL,
"320x350", NULL, 320, 350, (350.0/320.0)*(320.0/240.0),
320, 1, 1, &extra320x350x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
NULL,
"360x350", NULL, 360, 350, (350.0/360.0)*(320.0/240.0),
384, 1, 1, &extra360x350x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
NULL,
"320x400", NULL, 320, 400, (400.0/320.0)*(320.0/240.0), 320,
1, 1, &extra320x400x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
NULL,
"360x400", NULL, 360, 400, (400.0/360.0)*(320.0/240.0),
384, 1, 1, &extra360x400x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
NULL,
"320x480", NULL, 320, 480, (480.0/320.0)*(320.0/240.0),
320, 1, 1, &extra320x480x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
{
NULL,
"360x480", NULL, 360, 480, (480.0/360.0)*(320.0/240.0),
384, 1, 1, &extra360x480x256planar, VGA_InitMode,
VGA_SwapBuffers,
VGA_SwapBuffers,
VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
},
};

8
include/win32/dirent.h
View file

@ -56,7 +56,7 @@ extern "C" {
/* disk transfer area for this dir */
struct _finddata_t dd_dta;
/* dirent struct to return from dir (NOTE: this makes this thread
/* dirent struct to return from dir (NOTE: this makes this thread
safe as long as only one thread uses a particular DIR struct
at a time) */
struct dirent dd_dir;
@ -64,7 +64,7 @@ extern "C" {
/* _findnext handle */
long dd_handle;
/*
/*
* Status of search:
* 0 = not started yet (next entry to read is first entry)
* -1 = off the end
@ -103,7 +103,7 @@ extern "C" {
/* disk transfer area for this dir */
struct _wfinddata_t dd_dta;
/* dirent struct to return from dir (NOTE: this makes this thread
/* dirent struct to return from dir (NOTE: this makes this thread
safe as long as only one thread uses a particular DIR struct
at a time) */
struct _wdirent dd_dir;
@ -111,7 +111,7 @@ extern "C" {
/* _findnext handle */
long dd_handle;
/*
/*
* Status of search:
* 0 = not started yet (next entry to read is first entry)
* -1 = off the end

2
include/win32/resources/resource.h
View file

@ -34,7 +34,7 @@
#define IDC_PROGRESS 1000
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
# ifndef APSTUDIO_READONLY_SYMBOLS
# define _APS_NEXT_RESOURCE_VALUE 115

2
include/winquake.h
View file

@ -28,7 +28,7 @@
#ifndef _WINQUAKE_H
#define _WINQUAKE_H
#ifdef _WIN32
#ifdef _WIN32
#ifndef __GNUC__
# pragma warning( disable : 4229 ) /* mgraph gets this */

4
libs/audio/cd_file.c
View file

@ -115,7 +115,7 @@ I_OGGMus_Stop (void)
{
if (!tracklist || !mus_enabled || !playing)
return;
playing = false;
wasPlaying = false;
@ -267,7 +267,7 @@ I_OGGMus_Pause (void)
{
if (!tracklist || !mus_enabled || !playing)
return;
if (cd_channel)
cd_channel->pause = 1;

2
libs/audio/cd_linux.c
View file

@ -428,7 +428,7 @@ Mus_CDChange (cvar_t *mus_cdaudio)
mus_cdaudio->string, errno);
return;
}
if (I_CDAudio_GetAudioDiskInfo ()) {
Sys_Printf ("CDAudio_Init: No CD in player.\n");
cdValid = false;

2
libs/audio/cd_sdl.c
View file

@ -278,7 +278,7 @@ I_CDAudio_Init (void)
bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL,
"Volume of CD music");
Sys_Printf ("CD Audio Initialized.\n");
}

10
libs/audio/cd_win.c
View file

@ -42,11 +42,11 @@
#include "compat.h"
static plugin_t plugin_info;
static plugin_data_t plugin_info_data;
static plugin_funcs_t plugin_info_funcs;
static general_data_t plugin_info_general_data;
static general_funcs_t plugin_info_general_funcs;
static plugin_t plugin_info;
static plugin_data_t plugin_info_data;
static plugin_funcs_t plugin_info_funcs;
static general_data_t plugin_info_general_data;
static general_funcs_t plugin_info_general_funcs;
static cd_funcs_t plugin_info_cd_funcs;
static qboolean cdValid = false;

8
libs/audio/cd_xmms.c
View file

@ -155,7 +155,7 @@ I_XMMS_Running (void)
break;
default: // Parent
// don't need now :/
// xmmsPid = res; // so we can kill it later
// xmmsPid = res; // so we can kill it later
break;
}
return;
@ -181,7 +181,7 @@ I_XMMS_Stop (void) // stop playing
// Play
// start it playing, (unless disabled)
static void
I_XMMS_Play (int track, qboolean looping) // looping for compatability
I_XMMS_Play (int track, qboolean looping) // looping for compatability
{
if (!musEnabled)
return;
@ -395,8 +395,8 @@ I_XMMS_Info (void) // this is untested with really long tracks, prolly works
title = xmms_remote_get_playlist_title (sessionNo, pos); // get track title
ctime = xmms_remote_get_output_time (sessionNo); // get track elapsed time
ttime = xmms_remote_get_playlist_time (sessionNo, pos);
// The time returned by xmms_remote_get_output_time is in milliseconds
// The time returned by xmms_remote_get_output_time is in milliseconds
// elapsed, so, divide by (60*1000) to get mins (its an int, no decimals)
// and divide by 1000 mod 60 to get seconds. its a byte, no decimals too.
cmin = ctime / 60000;

2
libs/audio/renderer/flac.c
View file

@ -312,7 +312,7 @@ flac_callback_load (void *object, cache_allocator_t allocator)
flacfile_t *ff;
sfxblock_t *block = (sfxblock_t *) object;
QFS_FOpenFile (block->file, &file);
if (!file)
return; //FIXME Sys_Error?

12
libs/audio/renderer/midi.c
View file

@ -121,7 +121,7 @@ midi_stream_seek (sfxstream_t *stream, int pos)
pos *= stream->wavinfo.width * stream->wavinfo.channels;
pos += stream->wavinfo.dataofs;
new_pos = pos;
return WildMidi_FastSeek(stream->file, &new_pos);
}
@ -156,8 +156,8 @@ midi_stream_open (sfx_t *sfx)
handle = WildMidi_OpenBuffer(local_buffer, local_buffer_size);
if (handle == NULL)
return NULL;
if (handle == NULL)
return NULL;
mf = calloc (sizeof (midi_file_t), 1);
mf->handle = handle;
@ -179,8 +179,8 @@ SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname)
return -1;
}
}
local_buffer = malloc (local_buffer_size);
Qread (file, local_buffer, local_buffer_size);
Qclose (file);
@ -188,7 +188,7 @@ SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname)
// WildMidi takes ownership, so be damned if you touch it
handle = WildMidi_OpenBuffer (local_buffer, local_buffer_size);
if (handle == NULL)
if (handle == NULL)
return -1;
info = midi_get_info (handle);

6
libs/audio/renderer/snd_channels.c
View file

@ -412,7 +412,7 @@ s_updateAmbientSounds (const byte *ambient_sound_level)
if (!chan)
continue;
}
if (!chan->sfx) {
sfx = sfx->open (sfx);
if (!sfx)
@ -533,13 +533,13 @@ SND_SetListener (const vec3_t origin, const vec3_t forward, const vec3_t right,
// update general area ambient sound sources
s_updateAmbientSounds (ambient_sound_level);
// update spatialization for dynamic sounds
// update spatialization for dynamic sounds
for (ch = dynamic_channels; ch; ch = ch->next)
s_update_channel (ch);
for (ch = looped_dynamic_channels; ch; ch = ch->next)
s_update_channel (ch);
// update spatialization for static sounds
// update spatialization for static sounds
combine = 0;
for (i = 0; i < snd_num_statics; i++) {
ch = static_channels[i];

2
libs/audio/renderer/snd_dma.c
View file

@ -156,7 +156,7 @@ s_get_soundtime (void)
// calls to s_update. Oh well.
if ((framepos = snd_output_funcs->pS_O_GetDMAPos ()) == -1)
return;
if (framepos < oldframepos) {
buffers++; // buffer wrapped

4
libs/audio/renderer/vorbis.c
View file

@ -194,7 +194,7 @@ vorbis_callback_load (void *object, cache_allocator_t allocator)
OggVorbis_File vf;
sfxblock_t *block = (sfxblock_t *) object;
QFS_FOpenFile (block->file, &file);
if (!file)
return; //FIXME Sys_Error?
@ -279,7 +279,7 @@ vorbis_stream_open (sfx_t *sfx)
static void
vorbis_stream (sfx_t *sfx, char *realname, OggVorbis_File *vf, wavinfo_t info)
{
ov_clear (vf);
ov_clear (vf);
SND_SFX_Stream (sfx, realname, info, vorbis_stream_open);
}

2
libs/audio/renderer/wav.c
View file

@ -244,7 +244,7 @@ wav_get_info (QFile *file)
Sys_Printf ("missing data chunk\n");
goto bail;
}
info.rate = dfmt->samples_per_sec;
info.width = dfmt->bits_per_sample / 8;
info.channels = dfmt->channels;

6
libs/audio/targets/snd_disk.c
View file

@ -137,11 +137,11 @@ SNDDMA_Submit (void)
}
static void
SNDDMA_BlockSound (void)
SNDDMA_BlockSound (void)
{
++snd_blocked;
}
}
static void
SNDDMA_UnblockSound (void)
{

2
libs/audio/targets/snd_oss.c
View file

@ -207,7 +207,7 @@ try_open (int rw)
close (audio_fd);
return 0;
}
tmp = sn.channels;
rc = ioctl (audio_fd, SNDCTL_DSP_CHANNELS, &tmp);
if (rc < 0) {

28
libs/audio/targets/snd_win.c
View file

@ -189,10 +189,10 @@ SNDDMA_InitWav (void)
return false;
}
/*
Allocate and lock memory for the waveform data. The memory
for waveform data must be globally allocated with
GMEM_MOVEABLE and GMEM_SHARE flags.
/*
Allocate and lock memory for the waveform data. The memory
for waveform data must be globally allocated with
GMEM_MOVEABLE and GMEM_SHARE flags.
*/
gSndBufSize = WAV_BUFFERS * WAV_BUFFER_SIZE;
hData = GlobalAlloc (GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize);
@ -209,10 +209,10 @@ SNDDMA_InitWav (void)
}
memset (lpData, 0, gSndBufSize);
/*
* Allocate and lock memory for the header. This memory must
* also be globally allocated with GMEM_MOVEABLE and
* GMEM_SHARE flags.
/*
* Allocate and lock memory for the header. This memory must
* also be globally allocated with GMEM_MOVEABLE and
* GMEM_SHARE flags.
*/
hWaveHdr = GlobalAlloc (GMEM_MOVEABLE | GMEM_SHARE,
(DWORD) sizeof (WAVEHDR) * WAV_BUFFERS);
@ -287,9 +287,9 @@ static int
SNDDMA_GetDMAPos (void)
{
int s = 0;
s = snd_sent * WAV_BUFFER_SIZE;
s >>= sample16;
s /= sn.channels;
@ -329,10 +329,10 @@ SNDDMA_Submit (void)
h = lpWaveHdr + (snd_sent & WAV_MASK);
snd_sent++;
/*
Now the data block can be sent to the output device. The
waveOutWrite function returns immediately and waveform
data is sent to the output device in the background.
/*
Now the data block can be sent to the output device. The
waveOutWrite function returns immediately and waveform
data is sent to the output device in the background.
*/
wResult = waveOutWrite (hWaveOut, h, sizeof (WAVEHDR));

2
libs/console/bi_inputline.c
View file

@ -280,7 +280,7 @@ bi_InputLine_SetText (progs_t *pr)
/*
bi_InputLine_GetText
Gets the text from a inputline
Gets the text from a inputline
*/
static void
bi_InputLine_GetText (progs_t *pr)

6
libs/console/client.c
View file

@ -214,7 +214,7 @@ Resize (old_console_t *con)
say_team_line->width = con_linewidth - 9;
say_line->width = con_linewidth - 4;
input_line->width = con_linewidth;
con->current = con_totallines - 1;
con->display = con->current;
}
@ -641,7 +641,7 @@ draw_console_text (view_t *view)
y -= 8;
rows--;
}
row = con->display;
for (i = 0; i < rows; i++, y -= 8, row--) {
if (row < 0)
@ -905,7 +905,7 @@ C_Init (void)
Cmd_AddCommand ("clear", Clear_f, "Clear the console");
Cmd_AddCommand ("condump", Condump_f, "dump the console text to a "
"file");
// register GIB builtins
GIB_Builtin_Add ("HUD::enable", C_GIB_HUD_Enable_f);
GIB_Builtin_Add ("HUD::disable", C_GIB_HUD_Disable_f);

22
libs/console/complete.c
View file

@ -66,7 +66,7 @@ Con_BasicCompleteCommandLine (inputline_t *il)
cbuf_t *cbuf;
s = il->lines[il->edit_line] + 1;
if (*s == '/')
s++;
@ -75,12 +75,12 @@ Con_BasicCompleteCommandLine (inputline_t *il)
if (cbuf->interpreter->complete) {
const char **completions = cbuf->interpreter->complete (cbuf, s);
const char **com;
for (o = 0, com = completions; *com; com++, o++)
;
c = v = 0;
list[2] = completions;
} else {
// Count number of possible matches
@ -88,10 +88,10 @@ Con_BasicCompleteCommandLine (inputline_t *il)
v = Cvar_CompleteCountPossible (s);
o = 0;
}
if (!(c + v + o)) // No possible matches
return;
if (c + v + o == 1) {
if (c) {
list[0] = Cmd_CompleteBuildList (s);
@ -110,7 +110,7 @@ Con_BasicCompleteCommandLine (inputline_t *il)
cmd = *(list[1] = Cvar_CompleteBuildList (s));
if (o)
cmd = *(list[2]);
cmd_len = 0;
do {
for (i = 0; i < 3; i++) {
@ -137,7 +137,7 @@ Con_BasicCompleteCommandLine (inputline_t *il)
Sys_Printf ("%i possible command%s\n", c, (c > 1) ? "s: " : ":");
Con_DisplayList (list[0], con_linewidth);
}
if (v) {
Sys_Printf ("%i possible variable%s\n", v, (v > 1) ? "s: " : ":");
Con_DisplayList (list[1], con_linewidth);
@ -147,18 +147,18 @@ Con_BasicCompleteCommandLine (inputline_t *il)
Con_DisplayList (list[2], con_linewidth);
}
}
if (cmd) {
unsigned bound = max (0, (int) strlen (s) - (int) cmd_len);
const char *overwrite;
if (cmd_len > 0)
while (bound < strlen (s)
&& strncmp (s + bound, cmd, strlen (s + bound)))
bound++;
overwrite = va("%.*s%.*s", bound, s, cmd_len, cmd);
il->lines[il->edit_line][1] = '/';
strncpy (il->lines[il->edit_line] + 2, overwrite, il->line_size - 3);
il->lines[il->edit_line][il->line_size-1] = 0;

4
libs/console/console.c
View file

@ -72,7 +72,7 @@ Con_Interp_f (cvar_t *var)
Sys_Printf ("Switching to interpreter '%s'\n", var->string);
new = Cbuf_New (interp);
if (con_module->data->console->cbuf) {
new->down = con_module->data->console->cbuf;
new->state = CBUF_STATE_STACK;
@ -94,7 +94,7 @@ Con_Init (const char *plugin_name)
} else {
setvbuf (stdout, 0, _IOLBF, BUFSIZ);
}
con_interpreter =
con_interpreter =
Cvar_Get("con_interpreter", "id", CVAR_NONE, Con_Interp_f,
"Interpreter for the interactive console");
}

12
libs/console/pr_keys.c
View file

@ -42,7 +42,7 @@
/*
bi_Key_SetBinding
QC-Function for set a binding
*/
static void
@ -61,7 +61,7 @@ bi_Key_SetBinding (progs_t *pr)
/*
bi_Key_LookupBinding
Perform a reverse-binding-lookup
*/
static void
@ -88,12 +88,12 @@ bi_Key_LookupBinding (progs_t *pr)
}
}
R_INT (pr) = keynum;
R_INT (pr) = keynum;
};
/*
bi_Key_CountBinding
Counts how often a binding is assigned to a key
*/
static void
@ -114,13 +114,13 @@ bi_Key_CountBinding (progs_t *pr)
}
}
R_INT (pr) = res;
R_INT (pr) = res;
};
/*
bi_Key_LookupBinding
Convertes a keynum to a string
*/
static void

4
libs/console/server.c
View file

@ -217,7 +217,7 @@ draw_output (view_t *view)
sv_view_t *sv_view = view->data;
WINDOW *win = sv_view->win;
con_buffer_t *output_buffer = sv_view->obj;
// this is not the most efficient way to update the screen, but oh well
int lines = view->ylen - 1; // leave a blank line
int width = view->xlen;
@ -247,7 +247,7 @@ draw_output (view_t *view)
if (y > 0) {
text += y * width;
len -= y * width;
y = 0;
y = 0;
if (len < 1) {
len = 1;
text = l->text + l->len - 1;

2
libs/gamecode/pr_debug.c
View file

@ -451,7 +451,7 @@ PR_Get_Source_Line (progs_t *pr, pr_uint_t addr)
file_t *file;
pr_auxfunction_t *func;
pr_lineno_t *lineno;
lineno = PR_Find_Lineno (pr, addr);
if (!lineno || PR_Get_Lineno_Addr (pr, lineno) != addr)
return 0;

2
libs/gamecode/pr_edict.c
View file

@ -223,7 +223,7 @@ ED_EdictNum (progs_t *pr, pr_int_t n)
if (offs < 0 || n >= pr->pr_edictareasize)
PR_RunError (pr, "EDICT_NUM: bad number %d", n);
return PROG_TO_EDICT (pr, offs);
}

4
libs/gamecode/pr_exec.c
View file

@ -67,7 +67,7 @@ PR_RunError (progs_t * pr, const char *error, ...)
Sys_Printf ("%s\n", string->str);
// dump the stack so PR_Error can shutdown functions
pr->pr_depth = 0;
pr->pr_depth = 0;
PR_Error (pr, "Program error: %s", string->str);
}
@ -284,7 +284,7 @@ static int
signal_hook (int sig, void *data)
{
progs_t *pr = (progs_t *) data;
if (sig == SIGFPE && pr_faultchecks->int_val) {
dstatement_t *st;
pr_type_t *op_a, *op_b, *op_c;

4
libs/gamecode/pr_opcode.c
View file

@ -855,7 +855,7 @@ VISIBLE opcode_t pr_opcodes[] = {
ev_float, ev_float, ev_integer,
PROG_ID_VERSION,
},
{"||", "or.f", OP_OR, false,
{"||", "or.f", OP_OR, false,
ev_float, ev_float, ev_integer,
PROG_ID_VERSION,
},
@ -1086,7 +1086,7 @@ static inline void
check_branch (progs_t *pr, dstatement_t *st, opcode_t *op, short offset)
{
pr_int_t address = st - pr->pr_statements;
address += offset;
if (address < 0 || (pr_uint_t) address >= pr->progs->numstatements)
PR_Error (pr, "PR_Check_Opcodes: invalid branch (statement %ld: %s)",

4
libs/gamecode/pr_strings.c
View file

@ -330,7 +330,7 @@ VISIBLE string_t
PR_SetString (progs_t *pr, const char *s)
{
strref_t *sr;
if (!s)
s = "";
sr = Hash_Find (pr->strref_hash, s);
@ -559,7 +559,7 @@ I_DoPrint (dstring_t *result, fmt_item_t *formatting)
doPrecision = -1 != current->precision;
doWidth = 0 != current->minFieldWidth;
dsprintf (tmp, "%%%s%s%s%s%s%s%s",
(current->flags & FMT_ALTFORM) ? "#" : "", // hash
(current->flags & FMT_ZEROPAD) ? "0" : "", // zero padding

4
libs/gib/gib_buffer.c
View file

@ -97,7 +97,7 @@ GIB_Buffer_Reset (struct cbuf_s *cbuf)
// It just means the buffer is going to be reused.
if (g->dnotify)
g->dnotify (cbuf, g->ddata);
if (g->locals)
Hash_FlushTable (g->locals);
g->globals = gib_globals;
@ -168,7 +168,7 @@ GIB_Buffer_Add (cbuf_t * cbuf, const char *str)
"|GIB Parse Error|\n"
"-----------------\n"
"Parse error while adding text to GIB buffer.\n"
"Line %u: %s\n",
"Line %u: %s\n",
GIB_Buffer_Get_Line_Num (str, GIB_Parse_ErrorPos ()),
GIB_Parse_ErrorMsg ()
);

28
libs/gib/gib_builtin.c
View file

@ -88,7 +88,7 @@ GIB_Builtin_Free (void *ele, void *ptr)
/*
GIB_Builtin_Add
Registers a new builtin GIB command.
*/
@ -124,7 +124,7 @@ GIB_Builtin_Exists (const char *name)
/*
GIB_Builtin_Find
Looks up the builtin name in the builtin hash,
returning a pointer to the struct on success,
zero otherwise.
@ -165,7 +165,7 @@ GIB_Error (const char *type, const char *fmt, ...)
/*
GIB Builtin functions
See GIB docs for information.
*/
static void
@ -175,7 +175,7 @@ GIB_Function_f (void)
gib_function_t *func;
int i;
int argc = GIB_Argc ();
if (argc < 3) {
GIB_USAGE ("name [arg1 arg2 ...] program");
} else {
@ -262,7 +262,7 @@ GIB_Shared_f (void)
GIB_Return (GIB_Argv(i));
} else for (i = 1; i < GIB_Argc(); i++)
var = GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->globals, &zero,
GIB_Argv (i), &index, true);
GIB_Argv (i), &index, true);
}
static void
@ -273,7 +273,7 @@ GIB_Delete_f (void)
int i;
hashtab_t *source;
char *c;
if (GIB_Argc () < 2) {
GIB_USAGE ("var [var2 var2 ...]");
} else for (i = 1; i < GIB_Argc(); i++) {
@ -326,7 +326,7 @@ GIB_Return_f (void)
for (i = 1; i < GIB_Argc(); i++)
argv[i-1] = GIB_Argv(i);
GIB_Reply (g->reply.obj, g->reply.mesg, GIB_Argc()-1, argv);
free ((void*)argv);
g->dnotify = NULL;
@ -437,7 +437,7 @@ GIB_Count_f (void)
if (GIB_CanReturn())
dsprintf (GIB_Return(0), "%u", GIB_Argc() - 1);
}
static void
GIB_Contains_f (void)
@ -949,10 +949,10 @@ static void
GIB_Class_f (void)
{
if (GIB_Object_Get (GIB_Argv(1))) {
GIB_Error ("ClassRedefinitionError",
GIB_Error ("ClassRedefinitionError",
"Class '%s' already exists", GIB_Argv(1));
} else if (GIB_Argc () == 5)
GIB_Classes_Build_Scripted (GIB_Argv(1), GIB_Argv(3),
GIB_Classes_Build_Scripted (GIB_Argv(1), GIB_Argv(3),
GIB_Argm (4)->children,
GIB_DATA(cbuf_active)->script);
else
@ -973,10 +973,10 @@ GIB_Emit_f (void)
} else {
int i;
const char **argv = malloc (GIB_Argc () - 1);
for (i = 1; i < GIB_Argc (); i ++)
argv[i-1] = GIB_Argv (1);
GIB_Object_Signal_Emit (GIB_DATA(cbuf_active)->reply.obj,
GIB_Argc () - 1, argv);
@ -1013,10 +1013,10 @@ GIB_New_f (void)
} else if (
!(class = GIB_Object_Get(GIB_Argv(1)))
|| classobj->class->classobj != classobj) {
GIB_Error ("UnknownClassError", "Class '%s' does not exist",
GIB_Error ("UnknownClassError", "Class '%s' does not exist",
GIB_Argv(1));
} else {
GIB_Send (classobj,
GIB_Send (classobj,
*/
static void

48
libs/gib/gib_classes.c
View file

@ -57,7 +57,7 @@
*/
typedef struct baseobj_s {
unsigned long int ref;
unsigned long int ref;
} baseobj_t;
static int
@ -65,7 +65,7 @@ Object_Retain_f (gib_object_t *obj, gib_method_t *method, void *data,
gib_object_t *sender, gib_message_t mesg)
{
baseobj_t *base = data;
base->ref++;
GIB_Object_Incref (obj);
GIB_Reply (obj, mesg, 1, &obj->handstr);
@ -74,7 +74,7 @@ Object_Retain_f (gib_object_t *obj, gib_method_t *method, void *data,
static int
Object_Release_f (gib_object_t *obj, gib_method_t *method, void *data,
gib_object_t *sender, gib_message_t mesg)
gib_object_t *sender, gib_message_t mesg)
{
baseobj_t *base = data;
if (base->ref) {
@ -119,7 +119,7 @@ Object_IsKindOf_f (gib_object_t *obj, gib_method_t *method, void *data,
gib_class_t *c;
static const char *one = "1";
static const char *zero = "0";
if (mesg.argc < 2)
return -1;
@ -174,7 +174,7 @@ Object_Class_New_f (gib_object_t *obj, gib_method_t *method, void *data,
{
const char *old;
gib_object_t *new;
new = GIB_Object_Create (obj->class->name, false);
old = mesg.argv[0];
mesg.argv[0] = "init";
@ -200,7 +200,7 @@ Object_Class_Children_f (gib_object_t *obj, gib_method_t *method, void *data,
unsigned int size;
g_occ_i = 0;
size = llist_size (obj->class->children);
if (size) {
g_occ_reply = malloc (sizeof (char *) * size);
@ -210,14 +210,14 @@ Object_Class_Children_f (gib_object_t *obj, gib_method_t *method, void *data,
GIB_Reply (obj, mesg, 0, NULL);
return 0;
}
static void *
Object_Construct (gib_object_t *obj)
{
baseobj_t *base = malloc (sizeof (baseobj_t));
base->ref = 1;
return base;
}
@ -256,11 +256,11 @@ static gib_classdesc_t Object_class = {
Object_Destruct,
Object_methods, Object_class_methods
};
/* End Object class */
/* End Object class */
/*
Begin Thread class
@ -273,7 +273,7 @@ static gib_classdesc_t Object_class = {
this case, the object must be released manually later on, but otherwise
will do nothing.
*/
typedef struct Thread_class_s {
hashtab_t *methods;
} Thread_class_t;
@ -414,7 +414,7 @@ ObjectHash_Insert_f (gib_object_t *obj, gib_method_t *method, void *data,
if (mesg.argc < 3)
return -1;
for (i = 2; i < mesg.argc; i++) {
if ((ins = GIB_Object_Get (mesg.argv[i]))) {
new = malloc (sizeof (ObjRef_t));
@ -462,7 +462,7 @@ ObjectHash_Remove_f (gib_object_t *obj, gib_method_t *method, void *data,
ObjectHash_t *objh = data;
ObjRef_t **refs, **r;
int i;
if (mesg.argc < 2)
return -1;
@ -489,7 +489,7 @@ ObjectHash_Remove_f (gib_object_t *obj, gib_method_t *method, void *data,
}
GIB_Reply (obj, mesg, 0, NULL);
return 0;
}
}
static gib_methodtab_t ObjectHash_methods[] = {
{"insert", ObjectHash_Insert_f, NULL},
@ -536,7 +536,7 @@ Scrobj_Construct (gib_object_t *obj)
if (!obj->vars)
obj->vars = GIB_Var_Hash_New ();
return NULL;
}
@ -544,9 +544,9 @@ static void *
Scrobj_Class_Construct (gib_object_t *obj)
{
Scrobj_t *new = malloc (sizeof (Scrobj_t));
new->shared = GIB_Domain_Get (obj->class->name);
return new;
}
@ -575,7 +575,7 @@ Scrobj_Method_f (gib_object_t *obj, gib_method_t *method, void *data,
cbuf_t *thread = GIB_Thread_New ();
static hashtab_t *nhash = NULL;
gib_var_t *var;
if (GIB_Function_Execute (thread, ((Scrobj_method_t *)method->data)->func,
mesg.argv, mesg.argc))
return -1;
@ -598,7 +598,7 @@ Scrobj_Method_f (gib_object_t *obj, gib_method_t *method, void *data,
else
dstring_copystr (var->array[0].value, "0");
Cbuf_Execute_Stack (thread);
return 0;
}
@ -629,7 +629,7 @@ GIB_Classes_Build_Scripted (const char *name, const char *parentname,
g_gcbs_mode = INSTANCE;
g_gcbs_name = name;
methods = llist_new (gcbs_mtabfree, NULL, NULL);
cmethods = llist_new (gcbs_mtabfree, NULL, NULL);
@ -684,7 +684,7 @@ GIB_Classes_Build_Scripted (const char *name, const char *parentname,
llist_append (methods, calloc (1, sizeof (gib_methodtab_t)));
llist_append (cmethods, calloc (1, sizeof (gib_methodtab_t)));
mtab = llist_createarray (methods, sizeof (gib_methodtab_t));
cmtab = llist_createarray (cmethods, sizeof (gib_methodtab_t));
@ -703,7 +703,7 @@ GIB_Classes_Build_Scripted (const char *name, const char *parentname,
llist_delete (methods);
llist_delete (cmethods);
}
void
GIB_Classes_Init (void)
{

8
libs/gib/gib_execute.c
View file

@ -296,7 +296,7 @@ GIB_Execute (cbuf_t * cbuf)
g->reply.obj, i - 2, mesg,
GIB_Buffer_Reply_Callback,
cbuf) : GIB_Send (obj,
g->reply.obj, i - 2, mesg,
g->reply.obj, i - 2, mesg,
GIB_Buffer_Reply_Callback,
cbuf);
} else {
@ -304,8 +304,8 @@ GIB_Execute (cbuf_t * cbuf)
i = super ? GIB_SendToMethod (obj,
g->reply.method->parent,
g->reply.obj, i - 2, mesg,
NULL, NULL) :
GIB_Send (obj,g->reply.obj,
NULL, NULL) :
GIB_Send (obj,g->reply.obj,
i - 2, mesg, NULL,
NULL);
}
@ -338,7 +338,7 @@ GIB_Execute (cbuf_t * cbuf)
if (GIB_Function_Execute_D
(new, f,
cbuf->args->argv,
cbuf->args->argc))
cbuf->args->argc))
GIB_Error ("syntax", "not "
"enough "
"arguments to "

18
libs/gib/gib_function.c
View file

@ -49,7 +49,7 @@
hashtab_t *gib_functions = 0;
/*
/*
Hashtable callbacks
*/
static const char *
@ -77,7 +77,7 @@ GIB_Function_Free (void *ele, void *ptr)
/*
GIB_Function_New
Builds a new function struct and returns
a pointer to it.
*/
@ -93,7 +93,7 @@ static gib_function_t *
GIB_Function_New (const char *name)
{
gib_function_t *new = calloc (1, sizeof (gib_function_t));
new->text = dstring_newstr ();
new->name = strdup (name);
new->arglist = llist_new (afree, NULL, NULL);
@ -102,7 +102,7 @@ GIB_Function_New (const char *name)
/*
GIB_Function_Define
Sets the program and text of a GIB function,
allocating one and adding it to the functions
hash if needed.
@ -143,7 +143,7 @@ GIB_Function_Define (const char *name, const char *text, gib_tree_t * program,
/*
GIB_Function_Find
Looks up a function in the function hash
and returns a pointer to it on success,
0 otherwise
@ -187,7 +187,7 @@ GIB_Function_Prepare_Args (cbuf_t * cbuf, const char **args, unsigned int
g_fpa_argc = argc;
g_fpa_i = 1; llist_iterate (arglist, LLIST_ICAST (fpa_iterate));
var =
GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &g_fpa_zero, argss,
&g_fpa_ind, true);
@ -233,9 +233,9 @@ GIB_Function_Prepare_Args_D (cbuf_t * cbuf, dstring_t **args, unsigned int
g_fpad_cbuf = cbuf;
g_fpad_args = args;
g_fpad_argc = argc;
i = 1; llist_iterate (arglist, LLIST_ICAST (fpad_iterate));
var =
GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &g_fpad_zero, argss,
&g_fpad_ind, true);
@ -253,7 +253,7 @@ GIB_Function_Prepare_Args_D (cbuf_t * cbuf, dstring_t **args, unsigned int
/*
GIB_Function_Execute
Prepares a buffer to execute
a GIB function with certain arguments
*/

22
libs/gib/gib_object.c
View file

@ -91,8 +91,8 @@ GIB_Signal_Free (void *ele, void *ptr)
{
gib_signal_t *sig;
gib_slot_t *slot;
sig = (gib_signal_t *) ele;
sig = (gib_signal_t *) ele;
slot = llist_remove (llist_getnode (sig->receiver->slots,
sig->slot));
@ -136,10 +136,10 @@ GIB_Method_Build_Hash (gib_class_t *class, hashtab_t *inherited,
method->class = class;
Hash_Add (new, method);
}
if (inherited) {
void **list, **l;
for (l = list = Hash_GetList (inherited); *l; l++)
if (!Hash_Find (new, GIB_Method_Get_Key (*l, NULL)))
Hash_Add (new, *l);
@ -172,7 +172,7 @@ GIB_Class_Create (gib_classdesc_t *desc)
class->class_methods = GIB_Method_Build_Hash (class, parent ?
parent->class_methods : NULL, desc->class_methods);
class->children = llist_new (NULL, NULL, NULL);
Hash_Add (gib_classes, class);
// Create a class object
@ -209,7 +209,7 @@ GIB_Object_Create (const char *classname, qboolean classobj)
obj->signals = Hash_NewTable (128, GIB_Signal_Get_Key,
GIB_Signal_Free, NULL);
obj->slots = llist_new (GIB_Slot_Free, NULL, NULL);
if (classobj) {
for (temp = class, i = class->depth; temp; temp = temp->parent, i--)
if (temp->class_construct)
@ -279,7 +279,7 @@ GIB_Send (gib_object_t *obj, gib_object_t *sender, int argc, const char
if (!(method = Hash_Find (obj->methods, *argv)))
return -1;
message.argc = argc;
message.argv = argv;
message.reply = reply;
@ -287,7 +287,7 @@ GIB_Send (gib_object_t *obj, gib_object_t *sender, int argc, const char
if (reply)
GIB_Object_Incref (obj);
return method->func (obj, method, obj->data[method->class->depth],
sender, message);
}
@ -298,7 +298,7 @@ GIB_SendToMethod (gib_object_t *obj, gib_method_t *method, gib_object_t
void *replydata)
{
gib_message_t message;
message.argc = argc;
message.argv = argv;
message.reply = reply;
@ -306,7 +306,7 @@ GIB_SendToMethod (gib_object_t *obj, gib_method_t *method, gib_object_t
if (reply)
GIB_Object_Incref (obj);
return method->func (obj, method, obj->data[method->class->depth],
sender, message);
}
@ -378,7 +378,7 @@ GIB_Object_Signal_Emit (gib_object_t *sender, int argc, const char **argv)
{
gib_signal_t **list, **cur;
const char *old = *argv;
if ((list = (gib_signal_t **) Hash_FindList (sender->signals, *argv))) {
for (cur = list; *cur; cur++) {
*argv = (*cur)->slot->mesg;

4
libs/gib/gib_parse.c
View file

@ -47,7 +47,7 @@
#include "gib_process.h"
#include "gib_semantics.h"
/*
/*
GIB_Escaped
Returns true if character i in str is
@ -67,7 +67,7 @@ GIB_Escaped (const char *str, int i)
/*
GIB_Parse_Match_*
These are the workhorses of the GIB parser. They iterate
an index variable through a string until an appropriate
matching character is found, calling themselves and their

10
libs/gib/gib_semantics.c
View file

@ -43,7 +43,7 @@ static int
GIB_Semantic_Validate_Class (gib_tree_t * tokens)
{
gib_tree_t *a_class, *line, *cmd;
if (!tokens->next || !tokens->next->next) {
GIB_Parse_Error ("Malformed class definition; expected class "
"name, optional 'extends' and parent class, and "
@ -95,7 +95,7 @@ GIB_Semantic_Validate_Class (gib_tree_t * tokens)
gib_tree_t *last;
for (last = cmd; last->next; last = last->next);
if (!cmd->next || !last || last->delim != '{' ||
!last->children) {
GIB_Parse_Error ("Malformed function "
@ -490,17 +490,17 @@ GIB_Semantic_Label_To_Lines (gib_tree_t *tokens, const char *program,
char *name;
line = GIB_Tree_New (TREE_T_LABEL);
name = strdup (tokens->str);
name[strlen(name)-1] = '\0';
line->str = name;
line->flags = flags;
GIB_Tree_Unref (&tokens);
return line;
}
gib_tree_t *
GIB_Semantic_Tokens_To_Lines (gib_tree_t *tokens, const char *program, gib_tree_flags_t flags, unsigned int start, unsigned int end)
{

8
libs/gib/gib_vars.c
View file

@ -120,13 +120,13 @@ GIB_Var_Get_Complex (hashtab_t ** first, hashtab_t ** second, char *key,
*first = Hash_NewTable (256, GIB_Var_Get_Key, GIB_Var_Free, 0);
Hash_Add (*first, var);
}
// We are done looking up/creating var, fix up key
if (n)
key[n] = '[';
if (i < len)
key[i] = '.';
// Give up
if (!var)
return 0;
@ -163,7 +163,7 @@ GIB_Var_Get_Very_Complex (hashtab_t ** first, hashtab_t ** second, dstring_t *ke
cvar_t *cvar;
char c, *str;
qboolean done = false;
for (i = start, protect = 0; !done; i++) {
if (key->str[i] == '.' || key->str[i] == 0) {
index = 0;
@ -229,7 +229,7 @@ GIB_Var_Get_Very_Complex (hashtab_t ** first, hashtab_t ** second, dstring_t *ke
}
i = n;
}
}
if (!var->array[index].value)
var->array[index].value = dstring_newstr ();

596
libs/gib/regex.c
View file

File diff suppressed because it is too large Load diff

2
libs/image/image.c
View file

@ -27,7 +27,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif

4
libs/image/pcx.c
View file

@ -178,7 +178,7 @@ EncodePCX (byte * data, int width, int height,
for (i = 0; i < height; i++) {
// from darkplaces lmp2pcx
for (dataend = data + width; data < dataend; /* empty */) {
for (pix = *data++, run = 0xC1;
for (pix = *data++, run = 0xC1;
data < dataend && run < 0xFF && *data == pix;
data++, run++)
/* empty */;
@ -200,7 +200,7 @@ EncodePCX (byte * data, int width, int height,
for (i = 0; i < 768; i++)
*pack++ = *palette++;
// write output file
// write output file
*length = pack - (byte *) pcx;
return pcx;
}

2
libs/image/tga.c
View file

@ -632,7 +632,7 @@ LoadTGA (QFile *fin)
targa_mark = Hunk_LowMark ();
targa = Hunk_AllocName (fsize, "TGA");
Qread (fin, targa, fsize);
targa->colormap_index = LittleShort (targa->colormap_index);
targa->colormap_length = LittleShort (targa->colormap_length);
targa->x_origin = LittleShort (targa->x_origin);

14
libs/models/alias/gl_mesh.c
View file

@ -403,7 +403,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
mdfour_update (&md, (unsigned char *) vo, no * sizeof (vo[0]));
mdfour_update (&md, d1, MDFOUR_DIGEST_BYTES);
mdfour_result (&md, mesh_digest);
if (memcmp (d2, mesh_digest, MDFOUR_DIGEST_BYTES) == 0
&& memcmp (d1, model_digest, MDFOUR_DIGEST_BYTES) == 0) {
remesh = false;
@ -440,7 +440,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
if (do_cache) {
// save out the cached version
dsprintf (fullpath, "%s/%s", qfs_gamedir->dir.def, cache->str);
f = QFS_WOpen (fullpath->str, 9);
f = QFS_WOpen (fullpath->str, 9);
if (f) {
struct mdfour md;
@ -458,7 +458,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
mdfour_update (&md, (unsigned char *) vertexorder,
numorder * sizeof (vertexorder[0]));
mdfour_update (&md, model_digest, MDFOUR_DIGEST_BYTES);
mdfour_result (&md, mesh_digest);
mdfour_result (&md, mesh_digest);
Qwrite (f, &vers, sizeof (int));
Qwrite (f, &len, sizeof (int));
@ -471,10 +471,10 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
Qclose (f);
}
}
}
}
// save the data out
paliashdr->poseverts = numorder;
paliashdr->poseverts = numorder;
cmds = Hunk_Alloc (numcommands * sizeof (int));
paliashdr->commands = (byte *) cmds - (byte *) paliashdr;
@ -483,13 +483,13 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
} else {
tex_coord_t *tex_coord;
numorder = 0;
numorder = 0;
for (i=0; i < pheader->mdl.numtris; i++) {
add_vertex(triangles[i].vertindex[0]);
add_vertex(triangles[i].vertindex[1]);
add_vertex(triangles[i].vertindex[2]);
}
paliashdr->poseverts = numorder;
paliashdr->poseverts = numorder;
tex_coord = Hunk_Alloc (numorder * sizeof(tex_coord_t));
paliashdr->tex_coord = (byte *) tex_coord - (byte *) paliashdr;

2
libs/models/brush/gl_model_brush.c
View file

@ -122,7 +122,7 @@ gl_Mod_LoadExternalTextures (model_t *mod)
if (luma) {
tx->gl_fb_texturenum =
GL_LoadTexture (va ("fb_%s", tx->name), luma->width,
luma->height, luma->data, true, true,
luma->height, luma->data, true, true,
luma->format > 2 ? luma->format : 1);
} else if (base->format < 3) {
tx->gl_fb_texturenum =

2
libs/models/gl_model_fullbright.c
View file

@ -45,7 +45,7 @@ VISIBLE int
Mod_CalcFullbright (byte *in, byte *out, int pixels)
{
int fb = 0;
while (pixels--) {
if (*in >= 256 - 32) {
fb = 1;

2
libs/models/iqm/model_iqm.c
View file

@ -574,7 +574,7 @@ blend_compare (void *e1, void *e2, void *unused)
#define MAX_BLENDS 1024
iqmblend_t *
iqmblend_t *
Mod_IQMBuildBlendPalette (iqm_t *iqm, int *size)
{
int i, j;

4
libs/models/test/testclip.c
View file

@ -296,7 +296,7 @@ run_test (test_t *test)
test->start[0], test->start[1], test->start[2],
test->end[0], test->end[1], test->end[2],
end[0], end[1], end[2],
test->expect.frac,
test->expect.frac,
test->expect.allsolid, test->expect.startsolid,
test->expect.inopen, test->expect.inwater);
trace_t trace = do_trace (test->box, test->hull, test->start, test->end);
@ -305,7 +305,7 @@ run_test (test_t *test)
test->start[0], test->start[1], test->start[2],
test->end[0], test->end[1], test->end[2],
trace.endpos[0], trace.endpos[1], trace.endpos[2],
trace.fraction,
trace.fraction,
trace.allsolid, trace.startsolid,
trace.inopen, trace.inwater);
if (!(VectorCompare (end, trace.endpos)

14
libs/models/test/trace-id.c
View file

@ -12,10 +12,10 @@ HullPointContents (hull_t *hull, int num, const vec3_t p)
{
if (num < hull->firstclipnode || num > hull->lastclipnode)
Sys_Error ("HullPointContents: bad node number");
node = hull->clipnodes + num;
plane = hull->planes + node->planenum;
if (plane->type < 3)
d = p[plane->type] - plane->dist;
else
@ -25,7 +25,7 @@ HullPointContents (hull_t *hull, int num, const vec3_t p)
else
num = node->children[0];
}
return num;
}
@ -81,7 +81,7 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, const vec3_t
t1 = DotProduct (plane->normal, p1) - plane->dist;
t2 = DotProduct (plane->normal, p2) - plane->dist;
}
if (t1 >= 0 && t2 >= 0)
return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2, trace);
if (t1 < 0 && t2 < 0)
@ -96,7 +96,7 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, const vec3_t
frac = 0;
if (frac > 1)
frac = 1;
midf = p1f + (p2f - p1f)*frac;
for (i=0 ; i<3 ; i++)
mid[i] = p1[i] + frac*(p2[i] - p1[i]);
@ -111,10 +111,10 @@ SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, const vec3_t
!= CONTENTS_SOLID)
// go past the node
return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
if (trace->allsolid)
return false; // never got out of the solid area
//==================
// the other side of the node is solid, this is the impact point
//==================

2
libs/models/trace.c
View file

@ -571,7 +571,7 @@ portal_intersect (trace_t *trace, clipport_t *portal, plane_t *plane,
// if both ends of the box edge are on the same side (or touching) the
// plane, the edge does not cross the plane
// if only one end of the edge is touching, then we still have to
// check the impact point.
// check the impact point.
if ((t1 > 0 && t2 > 0) || (t1 < 0 && t2 < 0) || (t1 == t2))
continue;
if (t1 == t2) {

4
libs/net/net_chan.c
View file

@ -174,7 +174,7 @@ Netchan_CanPacket (netchan_t *chan)
/*
Netchan_CanReliable
Returns true if the bandwidth choke isn't
Returns true if the bandwidth choke isn't
*/
qboolean
Netchan_CanReliable (netchan_t *chan)
@ -346,7 +346,7 @@ Netchan_Process (netchan_t *chan)
chan->reliable_length = 0; // it has been received
/// If this message contains a reliable message, bump
/// incoming_reliable_sequence
/// incoming_reliable_sequence
chan->incoming_sequence = sequence;
chan->incoming_acknowledged = sequence_ack;
chan->incoming_reliable_acknowledged = reliable_ack;

2
libs/net/nm/net_dgrm.c
View file

@ -1059,7 +1059,7 @@ _Datagram_CheckNewConnections (void)
NET_FreeQSocket (sock);
return NULL;
}
// everything is allocated, just fill in the details
// everything is allocated, just fill in the details
sock->socket = newsock;
sock->landriver = net_landriverlevel;
sock->addr = clientaddr;

2
libs/ruamoko/pr_cmds.c
View file

@ -199,7 +199,7 @@ PF_break (progs_t *pr)
}
/*
float (string s) cvar
float (string s) cvar
*/
static void
PF_cvar (progs_t *pr)

2
libs/ruamoko/rua_math.c
View file

@ -32,7 +32,7 @@
#endif
#include <stdlib.h>
#include <math.h>
#include <math.h>
#include "QF/cmd.h"
#include "QF/hash.h"

10
libs/ruamoko/rua_obj.c
View file

@ -162,7 +162,7 @@ create_tree_of_subclasses_inherited_from (progs_t *pr, pr_class_t *bottom,
const char *super_class = PR_GetString (pr, bottom->super_class);
pr_class_t *superclass;
class_tree *tree, *prev;
superclass = bottom->super_class ? Hash_Find (pr->classes, super_class)
: 0;
tree = prev = class_tree_new ();
@ -943,7 +943,7 @@ rua_obj_error (progs_t *pr)
const char *fmt = P_GSTRING (pr, 2);
int count = pr->pr_argc - 3;
pr_type_t *args = pr->pr_params[3];
obj_verror (pr, object, code, fmt, count, args);
}
@ -1259,7 +1259,7 @@ rua_class_create_instance (progs_t *pr)
{
pr_class_t *class = &P_STRUCT (pr, pr_class_t, 0);
pr_id_t *id = class_create_instance (pr, class);
RETURN_POINTER (pr, id);
}
@ -1494,7 +1494,7 @@ rua__i_Object_error_error_ (progs_t *pr)
dstring_t *dstr = dstring_new ();
int count = pr->pr_argc - 3;
pr_type_t *args = pr->pr_params[3];
dsprintf (dstr, "error: %s (%s)\n%s",
PR_GetString (pr, object_get_class_name (pr, self)),
object_is_instance (pr, self) ? "instance" : "class", fmt);
@ -1531,7 +1531,7 @@ static builtin_t obj_methods [] = {
{"obj_get_uninstalled_dtable", rua_obj_get_uninstalled_dtable, -1},
{"obj_msgSend", rua_obj_msgSend, -1},
{"obj_msgSend_super", rua_obj_msgSend_super, -1},
{"obj_get_class", rua_obj_get_class, -1},
{"obj_lookup_class", rua_obj_lookup_class, -1},
{"obj_next_class", rua_obj_next_class, -1},

18
libs/ruamoko/rua_plist.c
View file

@ -109,7 +109,7 @@ plist_handle (plist_resources_t *res, plitem_t *plitem)
{
bi_plist_t dummy = {0, 0, plitem, 0};
bi_plist_t *plist = Hash_FindElement (res->plist_tab, &dummy);
if (plist)
return plist_index (res, plist);
@ -193,8 +193,8 @@ bi_PL_GetFromFile (progs_t *pr)
Qread (file, buf, len);
buf[len] = 0;
plitem = PL_GetPropertyList (buf);
plitem = PL_GetPropertyList (buf);
R_INT (pr) = plist_retain (res, plitem);
}
@ -202,8 +202,8 @@ static void
bi_PL_GetPropertyList (progs_t *pr)
{
plist_resources_t *res = PR_Resources_Find (pr, "plist");
plitem_t *plitem = PL_GetPropertyList (P_GSTRING (pr, 0));
plitem_t *plitem = PL_GetPropertyList (P_GSTRING (pr, 0));
R_INT (pr) = plist_retain (res, plitem);
}
@ -363,7 +363,7 @@ bi_PL_NewDictionary (progs_t *pr)
{
plist_resources_t *res = PR_Resources_Find (pr, "plist");
plitem_t *plitem = PL_NewDictionary ();
R_INT (pr) = plist_retain (res, plitem);
}
@ -372,7 +372,7 @@ bi_PL_NewArray (progs_t *pr)
{
plist_resources_t *res = PR_Resources_Find (pr, "plist");
plitem_t *plitem = PL_NewArray ();
R_INT (pr) = plist_retain (res, plitem);
}
@ -382,7 +382,7 @@ bi_PL_NewData (progs_t *pr)
//FIXME not safe
plist_resources_t *res = PR_Resources_Find (pr, "plist");
plitem_t *plitem = PL_NewData (P_GPOINTER (pr, 0), P_INT (pr, 1));
R_INT (pr) = plist_retain (res, plitem);
}
@ -391,7 +391,7 @@ bi_PL_NewString (progs_t *pr)
{
plist_resources_t *res = PR_Resources_Find (pr, "plist");
plitem_t *plitem = PL_NewString (P_GSTRING (pr, 0));
R_INT (pr) = plist_retain (res, plitem);
}

12
libs/util/bspfile.c
View file

@ -2,7 +2,7 @@
bspfile.c
DESCRIPTION
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
@ -73,7 +73,7 @@ swap_bsp (bsp_t *bsp, int todisk, void (*cb) (const bsp_t *, void *),
d->visleafs = LittleLong (d->visleafs);
d->firstface = LittleLong (d->firstface);
d->numfaces = LittleLong (d->numfaces);
for (j=0 ; j<3 ; j++) {
d->mins[j] = LittleFloat(d->mins[j]);
d->maxs[j] = LittleFloat(d->maxs[j]);
@ -87,7 +87,7 @@ swap_bsp (bsp_t *bsp, int todisk, void (*cb) (const bsp_t *, void *),
for (j=0 ; j<3 ; j++)
vertex->point[j] = LittleFloat (vertex->point[j]);
}
// planes
for (i=0 ; i<bsp->numplanes ; i++) {
dplane_t *plane = &bsp->planes[i];
@ -96,7 +96,7 @@ swap_bsp (bsp_t *bsp, int todisk, void (*cb) (const bsp_t *, void *),
plane->dist = LittleFloat (plane->dist);
plane->type = LittleLong (plane->type);
}
// texinfos
for (i=0 ; i<bsp->numtexinfo ; i++) {
texinfo_t *texinfo = &bsp->texinfo[i];
@ -105,7 +105,7 @@ swap_bsp (bsp_t *bsp, int todisk, void (*cb) (const bsp_t *, void *),
texinfo->miptex = LittleLong (texinfo->miptex);
texinfo->flags = LittleLong (texinfo->flags);
}
// faces
for (i=0 ; i<bsp->numfaces ; i++) {
dface_t *face = &bsp->faces[i];
@ -164,7 +164,7 @@ swap_bsp (bsp_t *bsp, int todisk, void (*cb) (const bsp_t *, void *),
for (i=0 ; i<c ; i++)
mtl->dataofs[i] = LittleLong(mtl->dataofs[i]);
}
// marksurfaces
for (i=0 ; i<bsp->nummarksurfaces ; i++) {
uint16_t *marksurface = &bsp->marksurfaces[i];

6
libs/util/cbuf.c
View file

@ -116,7 +116,7 @@ VISIBLE void
Cbuf_DeleteStack (cbuf_t *stack)
{
cbuf_t *next;
for (; stack; stack = next) {
next = stack->down;
Cbuf_Delete (stack);
@ -182,7 +182,7 @@ VISIBLE void
Cbuf_Execute_Stack (cbuf_t *cbuf)
{
cbuf_t *sp;
if (cbuf->resumetime) {
if (cbuf->resumetime < Sys_DoubleTime())
cbuf->resumetime = 0;
@ -208,7 +208,7 @@ Cbuf_Execute_Stack (cbuf_t *cbuf)
return;
}
}
sp->state = CBUF_STATE_JUNK;
sp->state = CBUF_STATE_JUNK;
sp = sp->up;
}
if (cbuf->down) {

2
libs/util/checksum.c
View file

@ -108,7 +108,7 @@ static byte chktbl[1024 + 4] = {
0x20, 0xf0, 0x3a, 0xfa, 0x80, 0x4d, 0x2c, 0x7d,
0xac, 0x60, 0x09, 0xc0, 0x40, 0xee, 0xb9, 0xeb,
0x13, 0x5b, 0xe8, 0x2b, 0xb1, 0x20, 0xf0, 0xce,
0x4c, 0xbd, 0xc6, 0x04, 0x86, 0x70, 0xc6, 0x33,
0x4c, 0xbd, 0xc6, 0x04, 0x86, 0x70, 0xc6, 0x33,
0xc3, 0x15, 0x0f, 0x65, 0x19, 0xfd, 0xc2, 0xd3,
// map checksum goes here

6
libs/util/cmd.c
View file

@ -610,7 +610,7 @@ Cmd_Init (void)
cmd_warncmd = Cvar_Get ("cmd_warncmd", "0", CVAR_NONE, NULL, "Toggles the "
"display of error messages for unknown commands");
cmd_cbuf = Cbuf_New (&id_interp);
Cmd_AddProvider("id", &id_interp);
}
@ -661,7 +661,7 @@ VISIBLE void
Cmd_AddProvider(const char *name, cbuf_interpreter_t *interp)
{
cmd_provider_t *p = (cmd_provider_t *) Hash_Find (cmd_provider_hash, name);
if (!p)
{
cmd_provider_t *p = malloc(sizeof(cmd_provider_t));
@ -675,7 +675,7 @@ VISIBLE cbuf_interpreter_t *
Cmd_GetProvider(const char *name)
{
cmd_provider_t *p = (cmd_provider_t *) Hash_Find (cmd_provider_hash, name);
if (!p)
return NULL;
else

12
libs/util/cvar.c
View file

@ -202,18 +202,18 @@ Cvar_CompleteCountPossible (const char *partial)
cvar_t *cvar;
int len;
int h;
h = 0;
len = strlen(partial);
if (!len)
return 0;
// Loop through the cvars and count all possible matches
for (cvar = cvar_vars; cvar; cvar = cvar->next)
if (!strncmp(partial, cvar->name, len))
h++;
return h;
}
@ -245,7 +245,7 @@ Cvar_CompleteBuildList (const char *partial)
buf[bpos] = NULL;
return buf;
}
}
VISIBLE void
Cvar_Set (cvar_t *var, const char *value)
@ -640,7 +640,7 @@ Cvar_Shutdown (void)
free (var);
var = next;
}
// Free aliases
// Free aliases
alias = calias_vars;
while (alias) {
nextalias = alias->next;

4
libs/util/dirent.c
View file

@ -1,14 +1,14 @@
/*
* dirent.c
*
* Derived from DIRLIB.C by Matt J. Weinstein
* Derived from DIRLIB.C by Matt J. Weinstein
* This note appears in the DIRLIB.H
* DIRLIB.H by M. J. Weinstein Released to public domain 1-Jan-89
*
* Updated by Jeremy Bettis <jeremy@hksys.com>
* Significantly revised and rewinddir, seekdir and telldir added by Colin
* Peters <colin@fu.is.saga-u.ac.jp>
*
*
* $Revision$
* $Author$
* $Date$

2
libs/util/dstring.c
View file

@ -329,7 +329,7 @@ _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
#endif
}
dstr->size = size + offs + 2;
// "Proper" implementations return the required size
// "Proper" implementations return the required size
if (dstr->size > dstr->truesize) {
dstring_adjust (dstr);
#ifdef VA_LIST_IS_ARRAY

10
libs/util/getopt.c
View file

@ -20,7 +20,7 @@
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
Ditto for AIX 3.2 and <stdlib.h>. */
#ifndef _NO_PROTO
@ -188,7 +188,7 @@ static enum
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
#ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble.
@ -241,7 +241,7 @@ extern int strlen (const char *);
#endif /* __GNUC__ */
#endif /* not __GNU_LIBRARY__ */
/* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have
@ -454,7 +454,7 @@ _getopt_initialize (argc, argv, optstring)
return optstring;
}
/* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING.
@ -984,7 +984,7 @@ getopt (argc, argv, optstring)
}
#endif /* Not ELIDE_CODE. */
#ifdef TEST
/* Compile with -DTEST to make an executable for use in testing

4
libs/util/getopt1.c
View file

@ -17,7 +17,7 @@
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@ -92,7 +92,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
#endif /* Not ELIDE_CODE. */
#ifdef TEST
#include <stdio.h>

6
libs/util/hash.c
View file

@ -104,7 +104,7 @@ Hash_String (const char *str)
}
return h;
#else
// dx_hack_hash
// dx_hack_hash
// shamelessly stolen from Daniel Phillips <phillips@innominate.de>
// from his post to lkml
unsigned long hash0 = 0x12a3fe2d, hash1 = 0x37abe8f9;
@ -131,7 +131,7 @@ Hash_Buffer (const void *_buf, int len)
}
return h;
#else
// dx_hack_hash
// dx_hack_hash
// shamelessly stolen from Daniel Phillips <phillips@innominate.de>
// from his post to lkml
unsigned long hash0 = 0x12a3fe2d, hash1 = 0x37abe8f9;
@ -163,7 +163,7 @@ get_index (uintptr_t hash, size_t size, size_t bits)
#if 0
unsigned long mask = ~0UL << bits;
unsigned long extract;
size -= 1;
for (extract = (hash & mask) >> bits;
extract;

4
libs/util/idparse.c
View file

@ -51,7 +51,7 @@ static void
COM_construct (cbuf_t *cbuf)
{
idbuf_t *new = calloc (1, sizeof (idbuf_t));
new->buf = dstring_newstr();
new->line = dstring_newstr();
cbuf->data = new;
@ -97,7 +97,7 @@ COM_Parse (const char *data)
if (!_com_token)
_com_token = dstring_newstr ();
com_token = _com_token->str;
if (!data)
return 0;

2
libs/util/pakfile.c
View file

@ -209,7 +209,7 @@ pack_add (pack_t *pack, const char *filename)
return -1;
if (pack->numfiles == pack->files_size) {
dpackfile_t *f;
pack->files_size += 64;
f = realloc (pack->files, pack->files_size * sizeof (dpackfile_t));

Some files were not shown because too many files have changed in this diff Show more