eukara
/
fteqw
forked from fte/fteqw
1
0
Fork 0
Code Pull Requests Activity

s/compatable/compatible (take notice that sv_compatablehulls will have a changed name too) 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2717 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-10-05 18:08:47 +00:00
parent 379efc8376
commit 0f02f12b8b
37 changed files with 13231 additions and 13231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_main.c
View File

@ -2053,7 +2053,7 @@ void CL_ConnectionlessPacket (void)
break;
}
if (*s2)
{//and if it's not, we're unlikly to be compatable with whatever it is that's talking at us.
{//and if it's not, we're unlikly to be compatible with whatever it is that's talking at us.
#ifdef NQPROT
if (cls.protocol == CP_NETQUAKE || cls.protocol == CP_UNKNOWN)
{

2
engine/client/cl_ui.c
View File

@ -1496,7 +1496,7 @@ void UI_Start (void)
apiversion = VM_Call(uivm, UI_GETAPIVERSION, 6);
if (apiversion != 4 && apiversion != 6) //make sure we can run the thing
{
Con_Printf("User-Interface VM uses incompatable API version (%i)\n", apiversion);
Con_Printf("User-Interface VM uses incompatible API version (%i)\n", apiversion);
VM_Destroy(uivm);
VM_fcloseall(0);
uivm = NULL;

2
engine/client/clq3defs.h
View File

@ -15,7 +15,7 @@ typedef struct {
int entityNum; // entity the contacted surface is a part of
} q3trace_t;
//#define Q3_NOENCRYPT //a debugging property, makes it incompatable with q3
//#define Q3_NOENCRYPT //a debugging property, makes it incompatible with q3
#define MAX_Q3_STATS 16
#define MAX_Q3_PERSISTANT 16

4
engine/client/image.c
View File

@ -1831,12 +1831,12 @@ int GL_LoadTextureDDS(unsigned char *buffer, int filesize)
datasize = pad;
qglCompressedTexImage2DARB(GL_TEXTURE_2D, mipnum, intfmt, fmtheader.dwWidth>>mipnum, fmtheader.dwHeight>>mipnum, 0, datasize, buffer);
if (qglGetError())
Con_Printf("Incompatable dds file (mip %i)\n", mipnum);
Con_Printf("Incompatible dds file (mip %i)\n", mipnum);
buffer += datasize;
datasize/=4;
}
if (qglGetError())
Con_Printf("Incompatable dds file\n");
Con_Printf("Incompatible dds file\n");
if (nummips>1)

2
engine/client/keys.c
View File

@ -135,7 +135,7 @@ keyname_t keynames[] =
{"KP_STAR", K_KP_STAR},
{"KP_EQUALS", K_KP_EQUALS},
//fuhquake compatable.
//fuhquake compatible.
{"KP_0", K_KP_INS},
{"KP_1", K_KP_END},
{"KP_2", K_KP_DOWNARROW},

2
engine/client/m_download.c
View File

@ -81,7 +81,7 @@ static package_t *BuildPackageList(vfsfile_t *f, int flags, char *prefix)
version = atoi(Cmd_Argv(1));
if (version != 0 && version != 1)
{
Con_Printf("Packagelist is of a future or incompatable version\n");
Con_Printf("Packagelist is of a future or incompatible version\n");
return NULL; //it's not the right version.
}

2
engine/client/m_single.c
View File

@ -40,7 +40,7 @@ void M_ScanSaves (void)
version = atoi(line);
if (version < FTESAVEGAME_VERSION || version >= FTESAVEGAME_VERSION+GT_MAX)
{
Q_strncpyz (m_filenames[i], "Incompatable version", sizeof(m_filenames[i]));
Q_strncpyz (m_filenames[i], "Incompatible version", sizeof(m_filenames[i]));
VFS_CLOSE (f);
continue;
}

2
engine/client/menu.h
View File

@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//m_media - an mp3 player type thing. It was never really compleate.
// It should perhaps either be fixed or removed.
//m_plugin - A QVM based or DLL based plugin.
//m_menu_dat- A QC based version of m_plugin. This should be compatable with DP's menu.dat stuff.
//m_menu_dat- A QC based version of m_plugin. This should be compatible with DP's menu.dat stuff.
//the m_complex menu state is the most advanced, and drives the bulk of FTE's menus in an event driven way.

4
engine/client/pr_csqc.c
View File

@ -553,14 +553,14 @@ static void PF_Fixme (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
Con_Printf("\n");
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nCSQC is not compatable.", prinst->lastcalledbuiltinnumber);
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nCSQC is not compatible.", prinst->lastcalledbuiltinnumber);
PR_BIError (prinst, "bulitin not implemented");
}
static void PF_NoCSQC (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
Con_Printf("\n");
prinst->RunError(prinst, "\nBuiltin %i does not make sense in csqc.\nCSQC is not compatable.", prinst->lastcalledbuiltinnumber);
prinst->RunError(prinst, "\nBuiltin %i does not make sense in csqc.\nCSQC is not compatible.", prinst->lastcalledbuiltinnumber);
PR_BIError (prinst, "bulitin not implemented");
}

2
engine/client/pr_menu.c
View File

@ -262,7 +262,7 @@ static void PF_Fixme (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
Con_Printf("\n");
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nMenu is not compatable.", prinst->lastcalledbuiltinnumber);
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nMenu is not compatible.", prinst->lastcalledbuiltinnumber);
PR_BIError (prinst, "bulitin not implemented");
}

2
engine/client/renderer.c
View File

@ -2081,7 +2081,7 @@ TRACE(("dbg: R_RestartRenderer_f\n"));
if (R_ApplyRenderer(&newr))
{
TRACE(("dbg: R_RestartRenderer_f going to dedicated\n"));
Con_Printf(CON_ERROR "Video mode switch failed. Old mode wasn't supported either. Console forced.\nChange vid_width, vid_height, vid_bpp, vid_displayfrequency to a compatable mode, and then use the setrenderer command.\n");
Con_Printf(CON_ERROR "Video mode switch failed. Old mode wasn't supported either. Console forced.\nChange vid_width, vid_height, vid_bpp, vid_displayfrequency to a compatible mode, and then use the setrenderer command.\n");
}
else
Sys_Error("Couldn't fall back to previous renderer\n");

2
engine/client/snd_alsa.c
View File

@ -210,7 +210,7 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
if (!Alsa_InitAlsa())
{
Con_Printf(CON_ERROR "Alsa does not appear to be installed or compatable\n");
Con_Printf(CON_ERROR "Alsa does not appear to be installed or compatible\n");
return 2;
}

2
engine/gl/gl_model.c
View File

@ -2117,7 +2117,7 @@ void GLMod_LoadCrouchHull(void)
}
numsm = LittleLong(*data++);
if (numsm != loadmodel->numsubmodels) //not compatable
if (numsm != loadmodel->numsubmodels) //not compatible
return;
numsuplementryplanes = LittleLong(*data++);

2
engine/gl/gl_warp.c
View File

@ -103,7 +103,7 @@ void EmitWaterPolys (msurface_t *fa, float basealpha)
float a;
int l;
extern cvar_t r_waterlayers;
//the code prior to april 2005 gave a nicer result, but was incompatable with meshes and required poly lists instead
//the code prior to april 2005 gave a nicer result, but was incompatible with meshes and required poly lists instead
//the new code uses vertex arrays but sacrifises the warping. We're left only with scaling.
//The default settings still look nicer than original quake but not pre-april.
//in the plus side, you can never see the junction glitches of the old warping. :)

12
engine/qclib/pr_edict.c
View File

@ -660,7 +660,7 @@ char *PR_UglyValueString (progfuncs_t *progfuncs, etype_t type, eval_t *val)
return line;
}
//compatable with Q1 (for savegames)
//compatible with Q1 (for savegames)
char *PR_UglyOldValueString (progfuncs_t *progfuncs, etype_t type, eval_t *val)
{
static char line[256];
@ -1361,7 +1361,7 @@ add32:
return buffer;
}
char *ED_WriteEdict(progfuncs_t *progfuncs, edictrun_t *ed, char *buffer, pbool q1compatable)
char *ED_WriteEdict(progfuncs_t *progfuncs, edictrun_t *ed, char *buffer, pbool q1compatible)
{
fdef_t *d;
@ -1396,7 +1396,7 @@ char *ED_WriteEdict(progfuncs_t *progfuncs, edictrun_t *ed, char *buffer, pbool
//add it to the file
AddS (qcva("\"%s\" ",name));
AddS (qcva("\"%s\"\n", (q1compatable?PR_UglyOldValueString:PR_UglyValueString)(progfuncs, d->type, (eval_t *)v)));
AddS (qcva("\"%s\"\n", (q1compatible?PR_UglyOldValueString:PR_UglyValueString)(progfuncs, d->type, (eval_t *)v)));
}
return buffer;
@ -1508,7 +1508,7 @@ char *SaveEnts(progfuncs_t *progfuncs, char *mem, int *len, int alldata)
if (pr_progstate[a].progs)
break;
}
if (!pr_progstate[0].progs || a != maxprogs) //the state of the progs wasn't Q1 compatable.
if (!pr_progstate[0].progs || a != maxprogs) //the state of the progs wasn't Q1 compatible.
{
memfree(os);
return NULL;
@ -2359,7 +2359,7 @@ retry:
}
/* else
{
printf ("Progs extensions are not compatable\nTry recompiling with the FTE compiler\n");
printf ("Progs extensions are not compatible\nTry recompiling with the FTE compiler\n");
HunkFree(hmark);
pr_progs=NULL;
return false;
@ -2555,7 +2555,7 @@ retry:
|| file[5] != pr_progs->numstatements
)
{
PRHunkFree(progfuncs, ohm); //whoops: old progs or incompatable
PRHunkFree(progfuncs, ohm); //whoops: old progs or incompatible
}
else
pr_linenums = file + 6;

2
engine/qclib/qcc_pr_comp.c
View File

@ -3608,7 +3608,7 @@ reloop:
}
else
{
if (!QCC_OPCodeValid(&pr_opcodes[OP_LOADA_F])) //q1 compatable.
if (!QCC_OPCodeValid(&pr_opcodes[OP_LOADA_F])) //q1 compatible.
{ //you didn't see this, okay?
QCC_def_t *funcretr;
if (d->scope)

2
engine/qclib/qccgui.c
View File

@ -1161,7 +1161,7 @@ static LONG CALLBACK OptionsWndProc(HWND hWnd,UINT message,
}
break;
case IDI_O_TARGET:
MessageBox(hWnd, "Click here to compile a hexen2 compatable progs. Note that this uses the -Thexen2. There are other targets available.", "Help", MB_OK|MB_ICONINFORMATION);
MessageBox(hWnd, "Click here to compile a hexen2 compatible progs. Note that this uses the -Thexen2. There are other targets available.", "Help", MB_OK|MB_ICONINFORMATION);
break;
case IDI_O_SYNTAX_HIGHLIGHTING:
MessageBox(hWnd, "Should syntax be highlighted automatically when a file is opened?", "Help", MB_OK|MB_ICONINFORMATION);

8
engine/qclib/qccmain.c
View File

@ -220,7 +220,7 @@ compiler_flag_t compiler_flag[] = {
{&flag_ifstring, FLAG_MIDCOMPILE,"ifstring", "if(string) fix", "Causes if(string) to behave identically to if(string!="") This is most useful with addons of course, but also has adverse effects with FRIK_FILE's fgets, where it becomes impossible to determin the end of the file. In such a case, you can still use asm {IF string 2;RETURN} to detect eof and leave the function."}, //correction for if(string) no-ifstring to get the standard behaviour.
{&flag_acc, 0, "acc", "Reacc support", "Reacc is a pascall like compiler. It was released before the Quake source was released. This flag has a few effects. It sorts all qc files in the current directory into alphabetical order to compile them. It also allows Reacc global/field distinctions, as well as allows ¦ as EOF. Whilst case insensativity and lax type checking are supported by reacc, they are seperate compiler flags in fteqcc."}, //reacc like behaviour of src files.
{&flag_caseinsensative, 0, "caseinsens", "Case insensativity", "Causes fteqcc to become case insensative whilst compiling names. It's generally not advised to use this as it compiles a little more slowly and provides little benefit. However, it is required for full reacc support."}, //symbols will be matched to an insensative case if the specified case doesn't exist. This should b usable for any mod
{&flag_laxcasts, FLAG_MIDCOMPILE,"lax", "Lax type checks", "Disables many errors (generating warnings instead) when function calls or operations refer to two normally incompatable types. This is required for reacc support, and can also allow certain (evil) mods to compile that were originally written for frikqcc."}, //Allow lax casting. This'll produce loadsa warnings of course. But allows compilation of certain dodgy code.
{&flag_laxcasts, FLAG_MIDCOMPILE,"lax", "Lax type checks", "Disables many errors (generating warnings instead) when function calls or operations refer to two normally incompatible types. This is required for reacc support, and can also allow certain (evil) mods to compile that were originally written for frikqcc."}, //Allow lax casting. This'll produce loadsa warnings of course. But allows compilation of certain dodgy code.
{&flag_hashonly, FLAG_MIDCOMPILE,"hashonly", "Hash-only constants", "Allows use of only #constant for precompiler constants, allows certain preqcc using mods to compile"},
{&opt_logicops, FLAG_MIDCOMPILE,"lo", "Logic ops", "This changes the behaviour of your code. It generates additional if operations to early-out in if statements. With this flag, the line if (0 && somefunction()) will never call the function. It can thus be considered an optimisation. However, due to the change of behaviour, it is not considered so by fteqcc. Note that due to inprecisions with floats, this flag can cause runaway loop errors within the player walk and run functions. This code is advised:\nplayer_stand1:\n if (self.velocity_x || self.velocity_y)\nplayer_run\n if (!(self.velocity_x || self.velocity_y))"},
{&flag_fasttrackarrays, FLAG_MIDCOMPILE|FLAG_ASDEFAULT,"fastarrays", "fast arrays where possible", "Generates extra instructions inside array handling functions to detect engine and use extension opcodes only in supporting engines.\nAdds a global which is set by the engine if the engine supports the extra opcodes. Note that this applies to all arrays or none."}, //correction for if(string) no-ifstring to get the standard behaviour.
@ -577,7 +577,7 @@ void QCC_WriteData (int crc)
}
else if (qcc_targetformat == QCF_HEXEN2)
{
printf("Progs execution requires a Hexen2 compatable engine\n");
printf("Progs execution requires a Hexen2 compatible engine\n");
break;
}
else
@ -621,7 +621,7 @@ void QCC_WriteData (int crc)
if (numpr_globals > 65530)
printf("Warning: Saving is not supported. Ensure all engine read fields and globals are defined early on.\n");
printf("A KK compatable executor will be required (FTE/KK)\n");
printf("A KK compatible executor will be required (FTE/KK)\n");
break;
}
@ -817,7 +817,7 @@ strofs = (strofs+3)&~3;
for (i=0 ; i<numstatements ; i++)
{
if (statements[i].op >= OP_CALL1 && statements[i].op <= OP_CALL8)
QCC_Error(ERR_BADTARGETSWITCH, "Target switching produced incompatable instructions");
QCC_Error(ERR_BADTARGETSWITCH, "Target switching produced incompatible instructions");
else if (statements[i].op >= OP_CALL1H && statements[i].op <= OP_CALL8H)
statements[i].op = statements[i].op - OP_CALL1H + OP_CALL1;
}

8
engine/server/pr_cmds.c
View File

@ -734,9 +734,9 @@ progsnum_t AddProgs(char *name)
fl = G_FLOAT(OFS_RETURN);
if (fl < 0)
SV_Error ("PR_LoadProgs: progs.dat is not compatable with EXE version");
SV_Error ("PR_LoadProgs: progs.dat is not compatible with EXE version");
else if ((int) (fl) != (int) (build_number()))
Con_DPrintf("Warning: Progs may not be fully compatable\n (%4.2f != %i)\n", fl, build_number());
Con_DPrintf("Warning: Progs may not be fully compatible\n (%4.2f != %i)\n", fl, build_number());
}
if ((f = PR_FindFunction (svprogfuncs, "FTE_init", num )))
@ -5390,7 +5390,7 @@ qboolean printedheader = false;
if (progstype == PROG_QW)
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nMods designed for mvdsv may need pr_imitatemvdsv to be enabled.", prinst->lastcalledbuiltinnumber);
else
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nMod is not compatable.", prinst->lastcalledbuiltinnumber);
prinst->RunError(prinst, "\nBuiltin %i not implemented.\nMod is not compatible.", prinst->lastcalledbuiltinnumber);
PR_BIError (prinst, "bulitin not implemented");
}
@ -6494,7 +6494,7 @@ lh_extension_t FTE_Protocol_Extensions[] =
{"DP_ENT_COLORMOD"},
{NULL}, //splitscreen - not queryable.
{"FTE_HEXEN2"}, //client can use hexen2 maps. server can use hexen2 progs
{"FTE_PEXT_SPAWNSTATIC"}, //means that static entities can have alpha/scale and anything else the engine supports on normal ents. (Added for >256 models, while still being compatable - previous system failed with -1 skins)
{"FTE_PEXT_SPAWNSTATIC"}, //means that static entities can have alpha/scale and anything else the engine supports on normal ents. (Added for >256 models, while still being compatible - previous system failed with -1 skins)
{"FTE_PEXT_CUSTOMTENTS", 2, NULL, {"RegisterTempEnt", "CustomTempEnt"}},
{"FTE_PEXT_256PACKETENTITIES"}, //client is able to receive unlimited packet entities (server caps itself to 256 to prevent insanity).
{"FTE_PEXT_64PLAYERS"},

18
engine/server/sv_main.c
View File

@ -182,7 +182,7 @@ cvar_t sv_motd[] ={ SCVAR("sv_motd1", ""),
SCVAR("sv_motd3", ""),
SCVAR("sv_motd4", "") };
cvar_t sv_compatablehulls = SCVAR("sv_compatablehulls", "1");
cvar_t sv_compatiblehulls = SCVAR("sv_compatiblehulls", "1");
cvar_t hostname = SCVARF("hostname","unnamed", CVAR_SERVERINFO);
@ -1500,7 +1500,7 @@ client_t *SVC_DirectConnect(void)
if (strcmp(Info_ValueForKey(userinfo[0], "protocol"), "darkplaces 3"))
{
SV_RejectMessage (SCP_BAD, "Server is "DISTRIBUTION" build %i.\n", build_number());
Con_Printf ("* rejected connect from incompatable client\n");
Con_Printf ("* rejected connect from incompatible client\n");
return NULL;
}
//it's a darkplaces client.
@ -1721,24 +1721,24 @@ client_t *SVC_DirectConnect(void)
{
if (atof(Info_ValueForKey (temp.userinfo, "*FuhQuake")) < 0.3)
{
SV_RejectMessage (protocol, "The server is using a halflife level and we don't think your client supports this\nuse 'setinfo iknow 1' to ignore this check\nYou can go to "ENGINEWEBSITE" to get a compatable client\n\nYou may need to enable an option\n\n");
// Con_Printf("player %s was dropped due to incompatable client\n", name);
SV_RejectMessage (protocol, "The server is using a halflife level and we don't think your client supports this\nuse 'setinfo iknow 1' to ignore this check\nYou can go to "ENGINEWEBSITE" to get a compatible client\n\nYou may need to enable an option\n\n");
// Con_Printf("player %s was dropped due to incompatible client\n", name);
// return;
}
}
#ifdef PEXT_Q2BSP
else if (sv.worldmodel->fromgame == fg_quake2 && !(newcl->fteprotocolextensions & PEXT_Q2BSP))
{
SV_RejectMessage (protocol, "The server is using a quake 2 level and we don't think your client supports this\nuse 'setinfo iknow 1' to ignore this check\nYou can go to "ENGINEWEBSITE" to get a compatable client\n\nYou may need to enable an option\n\n");
// Con_Printf("player %s was dropped due to incompatable client\n", name);
SV_RejectMessage (protocol, "The server is using a quake 2 level and we don't think your client supports this\nuse 'setinfo iknow 1' to ignore this check\nYou can go to "ENGINEWEBSITE" to get a compatible client\n\nYou may need to enable an option\n\n");
// Con_Printf("player %s was dropped due to incompatible client\n", name);
// return;
}
#endif
#ifdef PEXT_Q3BSP
else if (sv.worldmodel->fromgame == fg_quake3 && !(newcl->fteprotocolextensions & PEXT_Q3BSP))
{
SV_RejectMessage (protocol, "The server is using a quake 3 level and we don't think your client supports this\nuse 'setinfo iknow 1' to ignore this check\nYou can go to "ENGINEWEBSITE" to get a compatable client\n\nYou may need to enable an option\n\n");
// Con_Printf("player %s was dropped due to incompatable client\n", name);
SV_RejectMessage (protocol, "The server is using a quake 3 level and we don't think your client supports this\nuse 'setinfo iknow 1' to ignore this check\nYou can go to "ENGINEWEBSITE" to get a compatible client\n\nYou may need to enable an option\n\n");
// Con_Printf("player %s was dropped due to incompatible client\n", name);
// return;
}
#endif
@ -3202,7 +3202,7 @@ void SV_InitLocal (void)
Cvar_Register (&pm_walljump, cvargroup_serverphysics);
Cvar_Register (&pm_stepheight, cvargroup_serverphysics);
Cvar_Register (&sv_compatablehulls, cvargroup_serverphysics);
Cvar_Register (&sv_compatiblehulls, cvargroup_serverphysics);
for (i = 0; i < sizeof(sv_motd)/sizeof(sv_motd[0]); i++)
Cvar_Register(&sv_motd[i], cvargroup_serverinfo);

2
engine/server/sv_mvd.c
View File

@ -454,7 +454,7 @@ void SV_MVD_RunPendingConnections(void)
else if (!versiontouse)
{
e = ("QTVSV 1\n"
"PERROR: Incompatable version (valid version is v1)\n\n");
"PERROR: Incompatible version (valid version is v1)\n\n");
}
else if (raw)
{

2
engine/server/sv_phys.c
View File

@ -1013,7 +1013,7 @@ void SV_CheckWaterTransition (edict_t *ent)
cont = SV_PointContents (ent->v->origin);
//needs to be q1 progs compatable
//needs to be q1 progs compatible
if (cont & FTECONTENTS_LAVA)
cont = Q1CONTENTS_LAVA;
else if (cont & FTECONTENTS_SLIME)

2
engine/server/sv_user.c
View File

@ -5797,7 +5797,7 @@ void SV_AirMove (void)
// else
// scale = val->_float;
maxspeed=sv_player->xv->maxspeed;//FIXME: This isn't fully compatable code...
maxspeed=sv_player->xv->maxspeed;//FIXME: This isn't fully compatible code...
if (sv_player->xv->hasted)
maxspeed*=sv_player->xv->hasted;

4
engine/server/world.c
View File

@ -30,7 +30,7 @@ line of sight checks trace->crosscontent, but bullets don't
*/
extern cvar_t sv_compatablehulls;
extern cvar_t sv_compatiblehulls;
typedef struct
{
@ -1926,7 +1926,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
if (passedict && passedict->xv->hull)
hullnum = passedict->xv->hull;
else if (sv_compatablehulls.value)
else if (sv_compatiblehulls.value)
hullnum = 0;
else
{

2
engine/sw/sw_model.c
View File

@ -1559,7 +1559,7 @@ void SWMod_LoadCrouchHull(void)
return;
numsm = LittleLong(((int *)crouchhullfile)[2]);
if (numsm != loadmodel->numsubmodels) //not compatable
if (numsm != loadmodel->numsubmodels) //not compatible
return;
numsuplementryplanes = LittleLong(((int *)crouchhullfile)[3]);