REFACTOR [a vs an]

From /dev/humancontroller.

Author: zturtleman

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 <[email protected]>
 	+ ATVI Quake 3 1.32 Patch #38

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

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

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

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

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;

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

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

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;

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)

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

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;

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

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;

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

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

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;

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;

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)

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.
 */
 

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)
 

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.  */

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

code/tools/lcc/doc/4.html

@@ -99,7 +99,7 @@ <h2><a NAME="symbols">5.3 Symbols</a></h2>
 
 <h2><a NAME="operators">5.5 Dag Operators</a></h2>
 
-<p>The <code>op</code> field a of <code>node</code> structure holds a dag operator, which
+<p>The <code>op</code> field of a <code>node</code> structure holds a dag operator, which
 consists of a generic operator, a type suffix, and a size indicator. The type suffixes
 are:</p>
 
@@ -516,7 +516,7 @@ <h2><a NAME="operators">5.5 Dag Operators</a></h2>
 <p>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, <code>CVUI4</code> converts an
 unsigned (<code>U</code>) to a 4-byte signed integer (<code>I4</code>). The <code>syms[0]</code>
-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 <code>syms[0]</code> in a <code>CVUI4</code> 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

code/tools/lcc/doc/install.html

@@ -722,7 +722,7 @@ <h2><a NAME="win32">Installation on Windows NT 4.0 or Windows 95/98</a></h2>
 <h2><a NAME="bugs">Reporting Bugs</a></h2>
 
 <p>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 <cite>A Retargetable C Compiler: Design and Implementation</cite>. 
 
 <ol>
@@ -751,7 +751,7 @@ <h2><a NAME="bugs">Reporting Bugs</a></h2>
     HREF="ftp://ftp.cs.princeton.edu/pub/lcc"><code>pub/lcc</code></a>. A <a
     HREF="ftp://ftp.cs.princeton.edu/pub/lcc/README"><code>README</code></a> file there gives
     acquistion details, and the <a HREF="../LOG"><code>LOG</code></a> 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.</li>
   <li>Send your program by electronic mail to <code>[email protected]</code>. Please
     send only valid C programs; put all remarks in C comments so that we can process reports

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

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"