From f3e7012bdbe72add113c66e264b24a31853479c0 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 18 Jun 2012 16:31:16 +0000 Subject: [PATCH] REFACTOR [a vs an] From /dev/humancontroller. --- ChangeLog | 2 +- code/botlib/be_aas_bspq3.c | 2 +- code/botlib/be_aas_file.c | 2 +- code/botlib/be_aas_main.c | 2 +- code/botlib/be_aas_reach.c | 2 +- code/botlib/be_ai_char.c | 2 +- code/botlib/be_ai_chat.c | 2 +- code/botlib/be_ai_goal.c | 2 +- code/botlib/be_ai_move.c | 2 +- code/botlib/botlib.h | 2 +- code/botlib/l_precomp.h | 2 +- code/botlib/l_script.c | 2 +- code/botlib/l_script.h | 2 +- code/client/cl_main.c | 2 +- code/client/snd_openal.c | 2 +- code/game/ai_dmq3.h | 2 +- code/qcommon/huffman.c | 2 +- code/qcommon/md4.c | 2 +- code/qcommon/unzip.c | 4 ++-- code/qcommon/unzip.h | 4 ++-- code/qcommon/vm_local.h | 2 +- code/qcommon/vm_powerpc_asm.c | 12 ++++++------ code/renderer/tr_image_png.c | 8 ++++---- code/tools/lcc/doc/4.html | 4 ++-- code/tools/lcc/doc/install.html | 4 ++-- code/tools/lcc/src/list.c | 2 +- misc/nsis/ioquake3-q3ctc.nsi | 2 +- 27 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c0d955..ab963fe3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -279,7 +279,7 @@ added Wheel support to the DirectInput code IN_DIMouse (in_mouse 1) tweaked the Wheel mouse reading for in_mouse -1 (old win32 input code) handle correctly when zDelta is > 120 - provide a in_logitechbug cvar to handle buggy Logitech MouseWare driver sending wheel events twice + provide an in_logitechbug cvar to handle buggy Logitech MouseWare driver sending wheel events twice 2002-9-26 Timothee Besset + ATVI Quake 3 1.32 Patch #38 diff --git a/code/botlib/be_aas_bspq3.c b/code/botlib/be_aas_bspq3.c index 9bfc824f..c149b05f 100644 --- a/code/botlib/be_aas_bspq3.c +++ b/code/botlib/be_aas_bspq3.c @@ -469,7 +469,7 @@ void AAS_DumpBSPData(void) Com_Memset( &bspworld, 0, sizeof(bspworld) ); } //end of the function AAS_DumpBSPData //=========================================================================== -// load an bsp file +// load a .bsp file // // Parameter: - // Returns: - diff --git a/code/botlib/be_aas_file.c b/code/botlib/be_aas_file.c index 9395b1d3..f74f5318 100644 --- a/code/botlib/be_aas_file.c +++ b/code/botlib/be_aas_file.c @@ -281,7 +281,7 @@ void AAS_FileInfo(void) } //end of the function AAS_FileInfo #endif //AASFILEDEBUG //=========================================================================== -// allocate memory and read a lump of a AAS file +// allocate memory and read a lump of an AAS file // // Parameter: - // Returns: - diff --git a/code/botlib/be_aas_main.c b/code/botlib/be_aas_main.c index 0dab57c8..7a9f7017 100644 --- a/code/botlib/be_aas_main.c +++ b/code/botlib/be_aas_main.c @@ -423,7 +423,7 @@ void AAS_Shutdown(void) //aas has not been initialized aasworld.initialized = qfalse; //NOTE: as soon as a new .bsp file is loaded the .bsp file memory is - // freed an reallocated, so there's no need to free that memory here + // freed and reallocated, so there's no need to free that memory here //print shutdown botimport.Print(PRT_MESSAGE, "AAS shutdown.\n"); } //end of the function AAS_Shutdown diff --git a/code/botlib/be_aas_reach.c b/code/botlib/be_aas_reach.c index 6c457958..e8dfaa42 100644 --- a/code/botlib/be_aas_reach.c +++ b/code/botlib/be_aas_reach.c @@ -412,7 +412,7 @@ int AAS_BestReachableArea(vec3_t origin, vec3_t mins, vec3_t maxs, vec3_t goalor else { //it can very well happen that the AAS_PointAreaNum function tells that - //a point is in an area and that starting a AAS_TraceClientBBox from that + //a point is in an area and that starting an AAS_TraceClientBBox from that //point will return trace.startsolid qtrue #if 0 if (AAS_PointAreaNum(start)) diff --git a/code/botlib/be_ai_char.c b/code/botlib/be_ai_char.c index b5d044ce..83648c59 100644 --- a/code/botlib/be_ai_char.c +++ b/code/botlib/be_ai_char.c @@ -713,7 +713,7 @@ int Characteristic_Integer(int character, int index) } //end else if else { - botimport.Print(PRT_ERROR, "characteristic %d is not a integer\n", index); + botimport.Print(PRT_ERROR, "characteristic %d is not an integer\n", index); return 0; } //end else if // return 0; diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c index cc489d55..c227ddde 100644 --- a/code/botlib/be_ai_chat.c +++ b/code/botlib/be_ai_chat.c @@ -2080,7 +2080,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname) return NULL; } //end if StripDoubleQuotes(token.string); - //after the chat name we expect a opening brace + //after the chat name we expect an opening brace if (!PC_ExpectTokenString(source, "{")) { FreeSource(source); diff --git a/code/botlib/be_ai_goal.c b/code/botlib/be_ai_goal.c index 538a82e0..e7ee598e 100644 --- a/code/botlib/be_ai_goal.c +++ b/code/botlib/be_ai_goal.c @@ -1018,7 +1018,7 @@ void BotUpdateEntityItems(void) for (li = levelitems; li; li = nextli) { nextli = li->next; - //if it is a item that will time out + //if it is an item that will time out if (li->timeout) { //timeout the item diff --git a/code/botlib/be_ai_move.c b/code/botlib/be_ai_move.c index e633ebcc..ba28b66a 100644 --- a/code/botlib/be_ai_move.c +++ b/code/botlib/be_ai_move.c @@ -764,7 +764,7 @@ int BotGetReachabilityToGoal(vec3_t origin, int areanum, reachnum = AAS_NextAreaReachability(areanum, reachnum)) { #ifdef AVOIDREACH - //check if it isn't an reachability to avoid + //check if it isn't a reachability to avoid for (i = 0; i < MAX_AVOIDREACH; i++) { if (avoidreach[i] == reachnum && avoidreachtimes[i] >= AAS_Time()) break; diff --git a/code/botlib/botlib.h b/code/botlib/botlib.h index 4279fe4c..9eaee0a6 100644 --- a/code/botlib/botlib.h +++ b/code/botlib/botlib.h @@ -102,7 +102,7 @@ struct weaponinfo_s; #define ACTION_FOLLOWME 0x08000000 #define ACTION_JUMPEDLASTFRAME 0x10000000 -//the bot input, will be converted to an usercmd_t +//the bot input, will be converted to a usercmd_t typedef struct bot_input_s { float thinktime; //time since last output (in seconds) diff --git a/code/botlib/l_precomp.h b/code/botlib/l_precomp.h index ca1d9640..bdf8e9c9 100644 --- a/code/botlib/l_precomp.h +++ b/code/botlib/l_precomp.h @@ -117,7 +117,7 @@ int PC_ExpectTokenType(source_t *source, int type, int subtype, token_t *token); int PC_ExpectAnyToken(source_t *source, token_t *token); //returns true when the token is available int PC_CheckTokenString(source_t *source, char *string); -//returns true an reads the token when a token with the given type is available +//returns true and reads the token when a token with the given type is available int PC_CheckTokenType(source_t *source, int type, int subtype, token_t *token); //skip tokens until the given token string is read int PC_SkipUntilString(source_t *source, char *string); diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c index 1e1f1f12..09b110f1 100644 --- a/code/botlib/l_script.c +++ b/code/botlib/l_script.c @@ -879,7 +879,7 @@ int PS_ReadToken(script_t *script, token_t *token) { if (!PS_ReadString(script, token, '\"')) return 0; } //end if - //if an literal + //if a literal else if (*script->script_p == '\'') { //if (!PS_ReadLiteral(script, token)) return 0; diff --git a/code/botlib/l_script.h b/code/botlib/l_script.h index ce701cb3..f8b7483a 100644 --- a/code/botlib/l_script.h +++ b/code/botlib/l_script.h @@ -201,7 +201,7 @@ int PS_ExpectTokenType(script_t *script, int type, int subtype, token_t *token); int PS_ExpectAnyToken(script_t *script, token_t *token); //returns true when the token is available int PS_CheckTokenString(script_t *script, char *string); -//returns true an reads the token when a token with the given type is available +//returns true and reads the token when a token with the given type is available int PS_CheckTokenType(script_t *script, int type, int subtype, token_t *token); //skip tokens until the given token string is read int PS_SkipUntilString(script_t *script, char *string); diff --git a/code/client/cl_main.c b/code/client/cl_main.c index ccdf025b..b506dbd4 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -3954,7 +3954,7 @@ int CL_ServerStatus( char *serverAddress, char *serverStatusString, int maxLen ) // if this server status request has the same address if ( NET_CompareAdr( to, serverStatus->address) ) { - // if we recieved an response for this server status request + // if we received a response for this server status request if (!serverStatus->pending) { Q_strncpyz(serverStatusString, serverStatus->string, maxLen); serverStatus->retrieved = qtrue; diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c index d53cf0f5..b907ae68 100644 --- a/code/client/snd_openal.c +++ b/code/client/snd_openal.c @@ -491,7 +491,7 @@ sfxHandle_t S_AL_RegisterSound( const char *sample, qboolean compressed ) ================= S_AL_BufferGet -Return's an sfx's buffer +Return's a sfx's buffer ================= */ static diff --git a/code/game/ai_dmq3.h b/code/game/ai_dmq3.h index e124b1a6..7b69bf38 100644 --- a/code/game/ai_dmq3.h +++ b/code/game/ai_dmq3.h @@ -72,7 +72,7 @@ void BotSetUserInfo(bot_state_t *bs, char *key, char *value); void BotSetTeamStatus(bot_state_t *bs); //returns the name of the client char *ClientName(int client, char *name, int size); -//returns an simplyfied client name +//returns a simplified client name char *EasyClientName(int client, char *name, int size); //returns the skin used by the client char *ClientSkin(int client, char *skin, int size); diff --git a/code/qcommon/huffman.c b/code/qcommon/huffman.c index 8a5fa507..941258c2 100644 --- a/code/qcommon/huffman.c +++ b/code/qcommon/huffman.c @@ -362,7 +362,7 @@ void Huff_Decompress(msg_t *mbuf, int offset) { for ( j = 0; j < cch; j++ ) { ch = 0; // don't overflow reading from the messages - // FIXME: would it be better to have a overflow check in get_bit ? + // FIXME: would it be better to have an overflow check in get_bit ? if ( (bloc >> 3) > size ) { seq[j] = 0; break; diff --git a/code/qcommon/md4.c b/code/qcommon/md4.c index 838b062e..b37c87b4 100644 --- a/code/qcommon/md4.c +++ b/code/qcommon/md4.c @@ -38,7 +38,7 @@ struct mdfour { /* NOTE: This code makes no attempt to be fast! - It assumes that a int is at least 32 bits long + It assumes that an int is at least 32 bits long */ static struct mdfour *m; diff --git a/code/qcommon/unzip.c b/code/qcommon/unzip.c index 128502ce..2dd0bf83 100644 --- a/code/qcommon/unzip.c +++ b/code/qcommon/unzip.c @@ -376,11 +376,11 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) /* Open a Zip file. path contain the full pathname (by example, - on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer + on a Windows NT computer "c:\\test\\zlib114.zip" or on a Unix computer "zlib/zlib114.zip". If the zipfile cannot be opened (file doesn't exist or in not valid), the return value is NULL. - Else, the return value is a unzFile Handle, usable with other function + Else, the return value is an unzFile Handle, usable with other function of this unzip package. */ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) diff --git a/code/qcommon/unzip.h b/code/qcommon/unzip.h index b4a839b3..b22b72ea 100644 --- a/code/qcommon/unzip.h +++ b/code/qcommon/unzip.h @@ -136,11 +136,11 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, extern unzFile ZEXPORT unzOpen OF((const char *path)); /* Open a Zip file. path contain the full pathname (by example, - on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer + on a Windows XP computer "c:\\zlib\\zlib113.zip" or on a Unix computer "zlib/zlib113.zip". If the zipfile cannot be opened (file don't exist or in not valid), the return value is NULL. - Else, the return value is a unzFile Handle, usable with other function + Else, the return value is an unzFile Handle, usable with other function of this unzip package. */ diff --git a/code/qcommon/vm_local.h b/code/qcommon/vm_local.h index aa14e672..2c7d6f7d 100644 --- a/code/qcommon/vm_local.h +++ b/code/qcommon/vm_local.h @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define OPSTACK_MASK (OPSTACK_SIZE-1) // don't change -// Hardcoded in q3asm an reserved at end of bss +// Hardcoded in q3asm a reserved at end of bss #define PROGRAM_STACK_SIZE 0x10000 #define PROGRAM_STACK_MASK (PROGRAM_STACK_SIZE-1) diff --git a/code/qcommon/vm_powerpc_asm.c b/code/qcommon/vm_powerpc_asm.c index 70159259..5ad62a3b 100644 --- a/code/qcommon/vm_powerpc_asm.c +++ b/code/qcommon/vm_powerpc_asm.c @@ -374,7 +374,7 @@ static const struct powerpc_operand powerpc_operands[] = /* The SH field in an X or M form instruction. */ #define SH RS + 1 #define SH_MASK (0x1f << 11) - /* The other UIMM field in a EVX form instruction. */ + /* The other UIMM field in an EVX form instruction. */ #define EVUIMM SH { 0x1f, 11, NULL, 0 }, @@ -657,19 +657,19 @@ insert_rbs (unsigned long insn, #define SC(op, sa, lk) (OP (op) | ((((unsigned long)(sa)) & 1) << 1) | ((lk) & 1)) #define SC_MASK (OP_MASK | (((unsigned long)0x3ff) << 16) | (((unsigned long)1) << 1) | 1) -/* An VX form instruction. */ +/* A VX form instruction. */ #define VX(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x7ff)) -/* The mask for an VX form instruction. */ +/* The mask for a VX form instruction. */ #define VX_MASK VX(0x3f, 0x7ff) -/* An VA form instruction. */ +/* A VA form instruction. */ #define VXA(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x03f)) -/* The mask for an VA form instruction. */ +/* The mask for a VA form instruction. */ #define VXA_MASK VXA(0x3f, 0x3f) -/* An VXR form instruction. */ +/* A VXR form instruction. */ #define VXR(op, xop, rc) (OP (op) | (((rc) & 1) << 10) | (((unsigned long)(xop)) & 0x3ff)) /* The mask for a VXR form instruction. */ diff --git a/code/renderer/tr_image_png.c b/code/renderer/tr_image_png.c index 4dc9d9bb..b30c7fea 100644 --- a/code/renderer/tr_image_png.c +++ b/code/renderer/tr_image_png.c @@ -962,7 +962,7 @@ static qboolean UnfilterImage(uint8_t *DecompressedData, PixelLeft = DecompPtr; /* - * We only have a upleft pixel if we are on the second line or above. + * We only have an upleft pixel if we are on the second line or above. */ if(h > 0) @@ -2131,7 +2131,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height) ChunkHeaderType = BigLong(CH->Type); /* - * Check if the chunk is an PLTE. + * Check if the chunk is a PLTE. */ if(!(ChunkHeaderType == PNG_ChunkType_PLTE)) @@ -2202,7 +2202,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height) } /* - * transparency information is sometimes stored in an tRNS chunk + * transparency information is sometimes stored in a tRNS chunk */ /* @@ -2233,7 +2233,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height) ChunkHeaderType = BigLong(CH->Type); /* - * Check if the chunk is an tRNS. + * Check if the chunk is a tRNS. */ if(!(ChunkHeaderType == PNG_ChunkType_tRNS)) diff --git a/code/tools/lcc/doc/4.html b/code/tools/lcc/doc/4.html index c36f280b..0b4b36d2 100644 --- a/code/tools/lcc/doc/4.html +++ b/code/tools/lcc/doc/4.html @@ -99,7 +99,7 @@ the symbol's type field.

5.5 Dag Operators

-

The op field a of node structure holds a dag operator, which +

The op field of a node structure holds a dag operator, which consists of a generic operator, a type suffix, and a size indicator. The type suffixes are:

@@ -516,7 +516,7 @@ e.g.,

The type suffix for a conversion operator denotes the type of the result and the size indicator gives the size of the result. For example, CVUI4 converts an unsigned (U) to a 4-byte signed integer (I4). The syms[0] -field points to a symbol-table entry for a integer constant that gives the size of the +field points to a symbol-table entry for an integer constant that gives the size of the source operand. For example, if syms[0] in a CVUI4 points to a symbol-table entry for 2, the conversion widens a 2-byte unsigned integer to a 4-byte signed integer. Conversions that widen unsigned integers zero-extend; those that widen diff --git a/code/tools/lcc/doc/install.html b/code/tools/lcc/doc/install.html index 3cc59a8f..3410e8f1 100644 --- a/code/tools/lcc/doc/install.html +++ b/code/tools/lcc/doc/install.html @@ -722,7 +722,7 @@ C:\dist\lcc\4.1>copy %BUILDDIR%\bprint.exe \bin

Reporting Bugs

lcc is a large, complex program. We find and repair errors routinely. If you think that -you've found a error, follow the steps below, which are adapted from the instructions in +you've found an error, follow the steps below, which are adapted from the instructions in Chapter 1 of A Retargetable C Compiler: Design and Implementation.

    @@ -751,7 +751,7 @@ Chapter 1 of A Retargetable C Compiler: Design and Implementation. HREF="ftp://ftp.cs.princeton.edu/pub/lcc">pub/lcc. A README file there gives acquistion details, and the LOG file reports what errors - were fixed and when they were fixed. If you report a error that's been fixed, you might + were fixed and when they were fixed. If you report an error that's been fixed, you might get a canned reply.
  1. Send your program by electronic mail to lcc-bugs@cs.princeton.edu. Please send only valid C programs; put all remarks in C comments so that we can process reports diff --git a/code/tools/lcc/src/list.c b/code/tools/lcc/src/list.c index 29e660ab..9c3ec9f6 100644 --- a/code/tools/lcc/src/list.c +++ b/code/tools/lcc/src/list.c @@ -33,7 +33,7 @@ int length(List list) { return n; } -/* ltov - convert list to an NULL-terminated vector allocated in arena */ +/* ltov - convert list to a NULL-terminated vector allocated in arena */ void *ltov(List *list, unsigned arena) { int i = 0; void **array = newarray(length(*list) + 1, sizeof array[0], arena); diff --git a/misc/nsis/ioquake3-q3ctc.nsi b/misc/nsis/ioquake3-q3ctc.nsi index e4f27e38..3ccb19a9 100644 --- a/misc/nsis/ioquake3-q3ctc.nsi +++ b/misc/nsis/ioquake3-q3ctc.nsi @@ -1,4 +1,4 @@ -; sample NSIS description file for a ioquake3 mod installer +; sample NSIS description file for an ioquake3 mod installer !define NAME "Catch the Chicken" !define FSNAME "ioquake3-q3ctc"