fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix config_minimal.h from being unable to compile.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5801 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Eukara 2021-01-18 22:18:09 +00:00
parent 5cc499d5eb
commit 46eaeabbc6
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/client/cl_main.c
View file

@ -4567,7 +4567,9 @@ static char *ShowTime(unsigned int seconds)
} }
void CL_Status_f(void) void CL_Status_f(void)
{ {
#ifdef CSQC_DAT
extern world_t csqc_world; extern world_t csqc_world;
#endif
char adr[128]; char adr[128];
float pi, po, bi, bo; float pi, po, bi, bo;
@ -4676,6 +4678,7 @@ void CL_Status_f(void)
Con_Printf ("current map : %s (%s)\n", adr, cl.levelname); Con_Printf ("current map : %s (%s)\n", adr, cl.levelname);
} }
#ifdef CSQC_DAT
if (csqc_world.progs) if (csqc_world.progs)
{ {
extern int num_sfx; extern int num_sfx;
@ -4703,6 +4706,7 @@ void CL_Status_f(void)
if (cl.csqcdebug) if (cl.csqcdebug)
Con_Printf("csqc debug : true\n"); Con_Printf("csqc debug : true\n");
} }
#endif
Con_Printf("gamedir : %s\n", FS_GetGamedir(true)); Con_Printf("gamedir : %s\n", FS_GetGamedir(true));
} }

2
engine/common/com_mesh.c
View file

@ -2169,6 +2169,7 @@ void Mod_AddSingleSurface(entity_t *ent, int surfaceidx, shader_t *shader, qbool
posedata = m->xyz_array; posedata = m->xyz_array;
normdata = normals?m->normals_array:NULL; normdata = normals?m->normals_array:NULL;
#ifdef SKELETALMODELS
if (m->numbones) if (m->numbones)
{ //intended shader might have caused it to use skeletal stuff. { //intended shader might have caused it to use skeletal stuff.
//we're too lame for that though. //we're too lame for that though.
@ -2182,6 +2183,7 @@ void Mod_AddSingleSurface(entity_t *ent, int surfaceidx, shader_t *shader, qbool
Alias_TransformVerticies_V(m->bones, m->numvertexes, m->bonenums[0], m->boneweights[0], m->xyz_array[0], posedata[0]); Alias_TransformVerticies_V(m->bones, m->numvertexes, m->bonenums[0], m->boneweights[0], m->xyz_array[0], posedata[0]);
} }
else else
#endif
{ {
if (m->xyz_blendw[1] == 1 && m->xyz2_array) if (m->xyz_blendw[1] == 1 && m->xyz2_array)
posedata = m->xyz2_array; posedata = m->xyz2_array;