s/thier/their

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2716 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-10-05 17:43:26 +00:00
parent 37e0b298b3
commit 379efc8376
19 changed files with 2803 additions and 2803 deletions

View File

@ -627,7 +627,7 @@ void CL_CheckForResend (void)
Cvar_ForceSet(&cl_servername, cls.servername); Cvar_ForceSet(&cl_servername, cls.servername);
#ifdef Q3CLIENT #ifdef Q3CLIENT
//Q3 clients send thier cdkey to the q3 authorize server. //Q3 clients send their cdkey to the q3 authorize server.
//they send this packet with the challenge. //they send this packet with the challenge.
//and the server will refuse the client if it hasn't sent it. //and the server will refuse the client if it hasn't sent it.
CLQ3_SendAuthPacket(adr); CLQ3_SendAuthPacket(adr);
@ -2004,7 +2004,7 @@ void CL_ConnectionlessPacket (void)
{ {
//ack needs two parameters to work with realip properly. //ack needs two parameters to work with realip properly.
//firstly it needs an auth message, so it can't be spoofed. //firstly it needs an auth message, so it can't be spoofed.
//secondly, it needs a copy of the realip ident, so you can't report a different player's client (you would need access to thier ip). //secondly, it needs a copy of the realip ident, so you can't report a different player's client (you would need access to their ip).
data[5] = ' '; data[5] = ' ';
sprintf(data+6, "%i %i", atoi(MSG_ReadString()), cls.realip_ident); sprintf(data+6, "%i %i", atoi(MSG_ReadString()), cls.realip_ident);
} }
@ -3520,7 +3520,7 @@ void Host_Init (quakeparms_t *parms)
Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to
//assuming they didn't use any waits in thier config (fools) //assuming they didn't use any waits in their config (fools)
//the configs should be fully loaded. //the configs should be fully loaded.
//so convert the backwards compable commandline parameters in cvar sets. //so convert the backwards compable commandline parameters in cvar sets.

View File

@ -1517,7 +1517,7 @@ void M_QuickConnect_PreDraw(menu_t *menu)
if (s->players == s->maxplayers) if (s->players == s->maxplayers)
continue; //server is full already continue; //server is full already
if (s->special & SS_PROXY) if (s->special & SS_PROXY)
continue; //don't quickconnect to a proxy. thier player counts are often wrong (especially with qtv) continue; //don't quickconnect to a proxy. their player counts are often wrong (especially with qtv)
if (s->ping < 50) //don't like servers with too high a ping if (s->ping < 50) //don't like servers with too high a ping
{ {
if (s->players > 0) if (s->players > 0)

View File

@ -170,7 +170,7 @@ static void CSQC_FindGlobals(void)
fieldvector(velocity); \ fieldvector(velocity); \
fieldfloat(alpha); /*transparency*/ \ fieldfloat(alpha); /*transparency*/ \
fieldfloat(scale); /*model scale*/ \ fieldfloat(scale); /*model scale*/ \
fieldfloat(fatness); /*expand models X units along thier normals.*/ \ fieldfloat(fatness); /*expand models X units along their normals.*/ \
fieldfloat(skin); \ fieldfloat(skin); \
fieldfloat(colormap); \ fieldfloat(colormap); \
fieldfloat(flags); \ fieldfloat(flags); \

View File

@ -353,7 +353,7 @@ qboolean TP_SoundTrigger(char *message) //if there is a trigger there, play it.
if (*strip == '#') if (*strip == '#')
filter++; filter++;
if (*strip == ':') if (*strip == ':')
break; //if someone says just one word, we can take any tidles in thier name to be a voice command break; //if someone says just one word, we can take any tidles in their name to be a voice command
if (*strip == '\n') if (*strip == '\n')
lineend = strip; lineend = strip;
else if (*strip <= ' ') else if (*strip <= ' ')

View File

@ -517,7 +517,7 @@ void MSG_WriteBits(sizebuf_t *msg, int value, int bits)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
//q3 netchan //q3 netchan
//note that the sv and cl both have thier own wrappers, to handle encryption. //note that the sv and cl both have their own wrappers, to handle encryption.

View File

@ -39,7 +39,7 @@ static char *defaultlanguagetext =
"STL_CLIENTISSTILLMUTED \"%s is muted (still)\\n\"\n" "STL_CLIENTISSTILLMUTED \"%s is muted (still)\\n\"\n"
"STL_YOUAREMUTED \"%s is muted\\n\"\n" "STL_YOUAREMUTED \"%s is muted\\n\"\n"
"STL_YOUARNTMUTED \"You are no longer muted\\n\"\n" "STL_YOUARNTMUTED \"You are no longer muted\\n\"\n"
"STL_NONAMEASMUTE \"Muted players may not change thier names\\n\"\n" "STL_NONAMEASMUTE \"Muted players may not change their names\\n\"\n"
"STL_MUTEDVOTE \"Sorry, you cannot vote when muted as it may allow you to send a message.\\n\"\n" "STL_MUTEDVOTE \"Sorry, you cannot vote when muted as it may allow you to send a message.\\n\"\n"
"STL_MUTEDCHAT \"You cannot chat while muted\\n\"\n" "STL_MUTEDCHAT \"You cannot chat while muted\\n\"\n"
"STL_FLOODPROTACTIVE \"floodprot: You can't talk for %i seconds\\n\"\n" "STL_FLOODPROTACTIVE \"floodprot: You can't talk for %i seconds\\n\"\n"
@ -52,7 +52,7 @@ static char *defaultlanguagetext =
"STL_MAPCHEAT \"Map model file does not match (%s), %i != %i/%i.\\nYou may need a new version of the map, or the proper install files.\\n\"\n" "STL_MAPCHEAT \"Map model file does not match (%s), %i != %i/%i.\\nYou may need a new version of the map, or the proper install files.\\n\"\n"
"STL_INVALIDTRACKCLIENT \"invalid player to track\\n\"\n" "STL_INVALIDTRACKCLIENT \"invalid player to track\\n\"\n"
"STL_BADNAME \"Can't change name - new is invalid\\n\"\n" "STL_BADNAME \"Can't change name - new is invalid\\n\"\n"
"STL_CLIENTNAMECHANGE \"%s changed thier name to %s\\n\"\n" "STL_CLIENTNAMECHANGE \"%s changed their name to %s\\n\"\n"
"STL_SERVERPAUSED \"server is paused\\n\"\n" "STL_SERVERPAUSED \"server is paused\\n\"\n"
"STL_UPLOADDENIED \"Upload denied\\n\"\n" "STL_UPLOADDENIED \"Upload denied\\n\"\n"
"STL_NAMEDCLIENTDOESNTEXIST \"client does not exist\\n\"\n" "STL_NAMEDCLIENTDOESNTEXIST \"client does not exist\\n\"\n"

View File

@ -214,7 +214,7 @@ void D3DR_BuildLightMap (msurface_t *surf, qbyte *dest, qbyte *deluxdest, stmap
surf->cached_colour[maps] = cl_lightstyle[surf->styles[maps]].colour; surf->cached_colour[maps] = cl_lightstyle[surf->styles[maps]].colour;
} }
*/ */
for (i = 0; i < tmax; i++) //q3 maps store thier light in a block fashion, q1/q2/hl store it in a linear fashion. for (i = 0; i < tmax; i++) //q3 maps store their light in a block fashion, q1/q2/hl store it in a linear fashion.
{ {
for (j = 0; j < smax; j++) for (j = 0; j < smax; j++)
{ {

View File

@ -215,7 +215,7 @@ void D3D9R_BuildLightMap (msurface_t *surf, qbyte *dest, qbyte *deluxdest, stmap
surf->cached_colour[maps] = cl_lightstyle[surf->styles[maps]].colour; surf->cached_colour[maps] = cl_lightstyle[surf->styles[maps]].colour;
} }
*/ */
for (i = 0; i < tmax; i++) //q3 maps store thier light in a block fashion, q1/q2/hl store it in a linear fashion. for (i = 0; i < tmax; i++) //q3 maps store their light in a block fashion, q1/q2/hl store it in a linear fashion.
{ {
for (j = 0; j < smax; j++) for (j = 0; j < smax; j++)
{ {

View File

@ -139,7 +139,7 @@ typedef struct {
//frame is an index into this //frame is an index into this
typedef struct { typedef struct {
#ifdef SKELETALMODELS #ifdef SKELETALMODELS
qboolean isheirachical; //for models with transforms, states that bones need to be transformed from thier parent. qboolean isheirachical; //for models with transforms, states that bones need to be transformed from their parent.
//this is actually bad, and can result in bones shortening as they interpolate. //this is actually bad, and can result in bones shortening as they interpolate.
#endif #endif
qboolean loop; qboolean loop;

View File

@ -826,7 +826,7 @@ void GLR_BuildLightMap (msurface_t *surf, qbyte *dest, qbyte *deluxdest, stmap *
surf->cached_colour[maps] = cl_lightstyle[surf->styles[maps]].colour; surf->cached_colour[maps] = cl_lightstyle[surf->styles[maps]].colour;
} }
*/ */
for (i = 0; i < tmax; i++) //q3 maps store thier light in a block fashion, q1/q2/hl store it in a linear fashion. for (i = 0; i < tmax; i++) //q3 maps store their light in a block fashion, q1/q2/hl store it in a linear fashion.
{ {
for (j = 0; j < smax; j++) for (j = 0; j < smax; j++)
{ {
@ -3219,7 +3219,7 @@ int GLAllocBlock (int w, int h, int *x, int *y)
return 0; return 0;
} }
//quake3 maps have thier lightmaps in gl style already. //quake3 maps have their lightmaps in gl style already.
//rather than forgetting that and redoing it, let's just keep the data. //rather than forgetting that and redoing it, let's just keep the data.
int GLFillBlock (int texnum, int w, int h, int x, int y) int GLFillBlock (int texnum, int w, int h, int x, int y)
{ {

View File

@ -2673,9 +2673,9 @@ retry:
else else
type = fld16[i].type & ~(DEF_SHARED|DEF_SAVEGLOBAL); type = fld16[i].type & ~(DEF_SHARED|DEF_SAVEGLOBAL);
if (progfuncs->fieldadjust && !pr_typecurrent) //we need to make sure all fields appear in thier original place. if (progfuncs->fieldadjust && !pr_typecurrent) //we need to make sure all fields appear in their original place.
QC_RegisterFieldVar(progfuncs, type, fld16[i].s_name+pr_strings, 4*(fld16[i].ofs+progfuncs->fieldadjust), -1); QC_RegisterFieldVar(progfuncs, type, fld16[i].s_name+pr_strings, 4*(fld16[i].ofs+progfuncs->fieldadjust), -1);
else if (type == ev_vector) //emit vector vars early, so thier fields cannot be alocated before the vector itself. (useful against scramblers) else if (type == ev_vector) //emit vector vars early, so their fields cannot be alocated before the vector itself. (useful against scramblers)
{ {
QC_RegisterFieldVar(progfuncs, type, fld16[i].s_name+pr_strings, -1, fld16[i].ofs); QC_RegisterFieldVar(progfuncs, type, fld16[i].s_name+pr_strings, -1, fld16[i].ofs);
} }
@ -2742,7 +2742,7 @@ retry:
type = pr_types[pr_fielddefs32[i].type & ~(DEF_SHARED|DEF_SAVEGLOBAL)].type; type = pr_types[pr_fielddefs32[i].type & ~(DEF_SHARED|DEF_SAVEGLOBAL)].type;
else else
type = pr_fielddefs32[i].type & ~(DEF_SHARED|DEF_SAVEGLOBAL); type = pr_fielddefs32[i].type & ~(DEF_SHARED|DEF_SAVEGLOBAL);
if (progfuncs->fieldadjust && !pr_typecurrent) //we need to make sure all fields appear in thier original place. if (progfuncs->fieldadjust && !pr_typecurrent) //we need to make sure all fields appear in their original place.
QC_RegisterFieldVar(progfuncs, type, fld16[i].s_name+pr_strings, 4*(fld16[i].ofs+progfuncs->fieldadjust), -1); QC_RegisterFieldVar(progfuncs, type, fld16[i].s_name+pr_strings, 4*(fld16[i].ofs+progfuncs->fieldadjust), -1);
else if (type == ev_vector) else if (type == ev_vector)
QC_RegisterFieldVar(progfuncs, type, pr_fielddefs32[i].s_name+pr_strings, -1, pr_fielddefs32[i].ofs); QC_RegisterFieldVar(progfuncs, type, pr_fielddefs32[i].s_name+pr_strings, -1, pr_fielddefs32[i].ofs);

View File

@ -193,7 +193,7 @@ void QC_FlushProgsOffsets(progfuncs_t *progfuncs)
//called if a global is defined as a field //called if a global is defined as a field
//returns offset. //returns offset.
//vectors must be added before any of thier corresponding _x/y/z vars //vectors must be added before any of their corresponding _x/y/z vars
//in this way, even screwed up progs work. //in this way, even screwed up progs work.
//requestedpos is the offset the engine WILL put it at. //requestedpos is the offset the engine WILL put it at.

View File

@ -66,7 +66,7 @@ pbool keyword_union; //you surly know what a union is!
pbool keywords_coexist; //don't disable a keyword simply because a var was made with the same name. pbool keywords_coexist; //don't disable a keyword simply because a var was made with the same name.
pbool output_parms; //emit some PARMX fields. confuses decompilers. pbool output_parms; //emit some PARMX fields. confuses decompilers.
pbool autoprototype; //take two passes over the source code. First time round doesn't enter and functions or initialise variables. pbool autoprototype; //take two passes over the source code. First time round doesn't enter and functions or initialise variables.
pbool pr_subscopedlocals; //causes locals to be valid ONLY within thier statement block. (they simply can't be referenced by name outside of it) pbool pr_subscopedlocals; //causes locals to be valid ONLY within their statement block. (they simply can't be referenced by name outside of it)
pbool flag_ifstring; //makes if (blah) equivelent to if (blah != "") which resolves some issues in multiprogs situations. pbool flag_ifstring; //makes if (blah) equivelent to if (blah != "") which resolves some issues in multiprogs situations.
pbool flag_acc; //reacc like behaviour of src files (finds *.qc in start dir and compiles all in alphabetical order) pbool flag_acc; //reacc like behaviour of src files (finds *.qc in start dir and compiles all in alphabetical order)
pbool flag_caseinsensative; //symbols will be matched to an insensative case if the specified case doesn't exist. This should b usable for any mod pbool flag_caseinsensative; //symbols will be matched to an insensative case if the specified case doesn't exist. This should b usable for any mod
@ -3168,7 +3168,7 @@ void QCC_PR_EmitFieldsForMembers(QCC_type_t *clas)
unsigned int o; unsigned int o;
QCC_type_t *mt, *ft; QCC_type_t *mt, *ft;
QCC_def_t *f, *m; QCC_def_t *f, *m;
if (clas->parentclass != type_entity) //parents MUST have all thier fields set or inheritance would go crazy. if (clas->parentclass != type_entity) //parents MUST have all their fields set or inheritance would go crazy.
QCC_PR_EmitFieldsForMembers(clas->parentclass); QCC_PR_EmitFieldsForMembers(clas->parentclass);
np = clas->num_parms; np = clas->num_parms;

View File

@ -502,7 +502,7 @@ int WriteBodylessFuncs (int handle)
return ret; return ret;
} }
//marshalled locals remaps all the functions to use the range MAX_REGS onwards for the offset to thier locals. //marshalled locals remaps all the functions to use the range MAX_REGS onwards for the offset to their locals.
//this function remaps all the locals back into the function. //this function remaps all the locals back into the function.
void QCC_UnmarshalLocals(void) void QCC_UnmarshalLocals(void)
{ {

View File

@ -23,7 +23,7 @@ static qboolean ignoreprotocol;
#define svc_clearviewflags 41 //hexen2. #define svc_clearviewflags 41 //hexen2.
//these are present in the darkplaces engine. //these are present in the darkplaces engine.
//I wanna knick thier mods. //I wanna knick their mods.
#define svcdp_skybox 37 #define svcdp_skybox 37
#define svcdp_showlmp 35 // [string] slotname [string] lmpfilename [short] x [short] y #define svcdp_showlmp 35 // [string] slotname [string] lmpfilename [short] x [short] y

View File

@ -6480,7 +6480,7 @@ lh_extension_t FTE_Protocol_Extensions[] =
{"FTE_PEXT_BULLETENS"}, //bulleten boards (scrolling text on walls) {"FTE_PEXT_BULLETENS"}, //bulleten boards (scrolling text on walls)
{"FTE_PEXT_ZLIBDL"}, //supposed download optimisation (unimportant to qc) {"FTE_PEXT_ZLIBDL"}, //supposed download optimisation (unimportant to qc)
{"FTE_PEXT_LIGHTUPDATES"}, //zap.mdl is sent as a nail packet. {"FTE_PEXT_LIGHTUPDATES"}, //zap.mdl is sent as a nail packet.
{"FTE_PEXT_FATNESS"}, //entities may be expanded along thier vertex normals {"FTE_PEXT_FATNESS"}, //entities may be expanded along their vertex normals
{"DP_HALFLIFE_MAP"}, //entitiy can visit a hl bsp {"DP_HALFLIFE_MAP"}, //entitiy can visit a hl bsp
{"FTE_PEXT_TE_BULLET"}, //additional particle effect. Like TE_SPIKE and TE_SUPERSPIKE {"FTE_PEXT_TE_BULLET"}, //additional particle effect. Like TE_SPIKE and TE_SUPERSPIKE
{"FTE_PEXT_HULLSIZE"}, //means we can tell a client to go to crouching hull {"FTE_PEXT_HULLSIZE"}, //means we can tell a client to go to crouching hull

View File

@ -2016,7 +2016,7 @@ client_t *SVC_DirectConnect(void)
SV_OutOfBandTPrintf (protocol == SCP_QUAKE2, adr, newcl->language, STL_FIRSTGREETING, newcl->name, (int)rs.timeonserver); SV_OutOfBandTPrintf (protocol == SCP_QUAKE2, adr, newcl->language, STL_FIRSTGREETING, newcl->name, (int)rs.timeonserver);
} }
//else loaded players already have thier initial parms set //else loaded players already have their initial parms set
} }
} }
#else #else

View File

@ -4510,7 +4510,7 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean recurse)
oldmsec = ucmd->msec; oldmsec = ucmd->msec;
cmd.msec = oldmsec/2; cmd.msec = oldmsec/2;
SV_RunCmd (&cmd, true); SV_RunCmd (&cmd, true);
cmd.msec = oldmsec/2 + (oldmsec&1); //give them back thier msec. cmd.msec = oldmsec/2 + (oldmsec&1); //give them back their msec.
cmd.impulse = 0; cmd.impulse = 0;
SV_RunCmd (&cmd, true); SV_RunCmd (&cmd, true);
return; return;

View File

@ -45,7 +45,7 @@ qboolean SWVID_Init (rendererstate_t *info, unsigned char *palette)
int flags; int flags;
Con_Printf("SDL SWVID_Init\n"); Con_Printf("SDL SWVID_Init\n");
info->bpp = 8; //I don't know thier card details I'm afraid. info->bpp = 8; //I don't know their card details I'm afraid.
SDL_InitSubSystem(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE); SDL_InitSubSystem(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);