team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s/componants/components + missing newline. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2767 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-10-29 06:06:20 +00:00
parent 4e29e25f90
commit 3b1ac20640
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/image.c
View File

@ -954,7 +954,7 @@ badjpeg:
if (cinfo.output_components!=3)
{
Con_Printf("Bad number of componants in jpeg");
Con_Printf("Bad number of components in jpeg\n");
goto badjpeg;
}
size_stride = cinfo.output_width * cinfo.output_components;

2
engine/common/bothdefs.h
View File

@ -180,7 +180,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#undef Q3SHADERS
#undef TERRAIN //not supported
#endif
#ifdef CLIENTONLY //remove optional server componants that make no sence on a client only build.
#ifdef CLIENTONLY //remove optional server components that make no sence on a client only build.
#undef Q2SERVER
#undef Q3SERVER
#undef WEBSERVER

32
engine/common/com_mesh.c
View File

@ -3829,10 +3829,10 @@ qboolean Mod_ParseMD5Anim(char *buffer, galiasinfo_t *prototype, void**poseofs,
galiasbone_t *bonelist;
unsigned char *boneflags;
unsigned int *firstanimatedcomponants;
unsigned int *firstanimatedcomponents;
float *animatedcomponants;
float *baseframe; //6 componants.
float *animatedcomponents;
float *baseframe; //6 components.
float *posedata;
float tx, ty, tz, qx, qy, qz;
int fac, flags;
@ -3860,8 +3860,8 @@ qboolean Mod_ParseMD5Anim(char *buffer, galiasinfo_t *prototype, void**poseofs,
buffer = COM_Parse(buffer);
numanimatedparts = atoi(com_token);
firstanimatedcomponants = BZ_Malloc(sizeof(int)*numjoints);
animatedcomponants = BZ_Malloc(sizeof(float)*numanimatedparts);
firstanimatedcomponents = BZ_Malloc(sizeof(int)*numjoints);
animatedcomponents = BZ_Malloc(sizeof(float)*numanimatedparts);
boneflags = BZ_Malloc(sizeof(unsigned char)*numjoints);
baseframe = BZ_Malloc(sizeof(float)*12*numjoints);
@ -3905,7 +3905,7 @@ qboolean Mod_ParseMD5Anim(char *buffer, galiasinfo_t *prototype, void**poseofs,
buffer = COM_Parse(buffer);
boneflags[i] = atoi(com_token);
buffer = COM_Parse(buffer);
firstanimatedcomponants[i] = atoi(com_token);
firstanimatedcomponents[i] = atoi(com_token);
}
EXPECT("}");
@ -3963,37 +3963,37 @@ qboolean Mod_ParseMD5Anim(char *buffer, galiasinfo_t *prototype, void**poseofs,
for (j = 0; j < numanimatedparts; j++)
{
buffer = COM_Parse(buffer);
animatedcomponants[j] = atof(com_token);
animatedcomponents[j] = atof(com_token);
}
EXPECT("}");
for (j = 0; j < numjoints; j++)
{
fac = firstanimatedcomponants[j];
fac = firstanimatedcomponents[j];
flags = boneflags[j];
if (flags&1)
tx = animatedcomponants[fac++];
tx = animatedcomponents[fac++];
else
tx = baseframe[j*6+0];
if (flags&2)
ty = animatedcomponants[fac++];
ty = animatedcomponents[fac++];
else
ty = baseframe[j*6+1];
if (flags&4)
tz = animatedcomponants[fac++];
tz = animatedcomponents[fac++];
else
tz = baseframe[j*6+2];
if (flags&8)
qx = animatedcomponants[fac++];
qx = animatedcomponents[fac++];
else
qx = baseframe[j*6+3];
if (flags&16)
qy = animatedcomponants[fac++];
qy = animatedcomponents[fac++];
else
qy = baseframe[j*6+4];
if (flags&32)
qz = animatedcomponants[fac++];
qz = animatedcomponents[fac++];
else
qz = baseframe[j*6+5];
@ -4001,8 +4001,8 @@ qboolean Mod_ParseMD5Anim(char *buffer, galiasinfo_t *prototype, void**poseofs,
}
}
BZ_Free(firstanimatedcomponants);
BZ_Free(animatedcomponants);
BZ_Free(firstanimatedcomponents);
BZ_Free(animatedcomponents);
BZ_Free(boneflags);
BZ_Free(baseframe);

2
engine/gl/gl_vidlinuxglx.c
View File

@ -876,7 +876,7 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
if (rampsize != 256)
{
originalapplied = false;
Con_Printf("Gamma ramps are not of 256 componants (but %i).\n", rampsize);
Con_Printf("Gamma ramps are not of 256 components (but %i).\n", rampsize);
}
else
originalapplied = XF86VidModeGetGammaRamp(vid_dpy, scrnum, 256, originalramps[0], originalramps[1], originalramps[2]);

4
engine/qclib/pr_edict.c
View File

@ -1245,7 +1245,7 @@ char *ED_WriteGlobals(progfuncs_t *progfuncs, char *buffer) //switch first.
if (!*name)
continue;
if (name[len-2] == '_' && (name[len-1] == 'x' || name[len-1] == 'y' || name[len-1] == 'z'))
continue; // skip _x, _y, _z vars (vector componants, which are saved as one vector not 3 floats)
continue; // skip _x, _y, _z vars (vector components, which are saved as one vector not 3 floats)
type = def16->type;
@ -1307,7 +1307,7 @@ char *ED_WriteGlobals(progfuncs_t *progfuncs, char *buffer) //switch first.
def32 = &pr_globaldefs32[i];
name = def32->s_name + progfuncs->stringtable;
if (name[strlen(name)-2] == '_')
continue; // skip _x, _y, _z vars (vector componants, which are saved as one vector not 3 floats)
continue; // skip _x, _y, _z vars (vector components, which are saved as one vector not 3 floats)
type = def32->type;