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

Fix GCC complaining about Mod_GetBoneRelations having conflicting types with the software-only client.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3187 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2009-05-07 12:18:35 +00:00
parent af09a50527
commit cdb9eed996
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/common/com_mesh.c
View file

@ -142,7 +142,7 @@ static int Alias_BuildLerps(float plerp[4], float *pose[4], int numbones, galias
int frame2;
float mlerp; //minor lerp, poses within a group.
int l = 0;
mlerp = (fg1time)*g1->rate;
frame1=mlerp;
frame2=frame1+1;
@ -695,7 +695,7 @@ static void Alias_BuildSkeletalMesh(mesh_t *mesh, float *bonepose, galisskeletal
#endif
#endif
qboolean Alias_GAliasBuildMesh(mesh_t *mesh, galiasinfo_t *inf,
qboolean Alias_GAliasBuildMesh(mesh_t *mesh, galiasinfo_t *inf,
entity_t *e,
float alpha, qboolean nolightdir)
{
@ -986,7 +986,7 @@ static void Mod_ClampModelSize(model_t *mod)
return;
}
}
Con_DPrintf("Don't know what size to clamp \"%s\" to (size:%f).\n", mod->name, rad);
#endif
}
@ -1666,7 +1666,7 @@ static void *Q1_LoadSkins_GL (daliasskintype_t *pskintype, qboolean alpha)
{
snprintf(skinname, sizeof(skinname), "%s_%i_pants", loadname, i);
texnums->loweroverlay = Mod_LoadReplacementTexture(skinname, "models", true, true, true);
snprintf(skinname, sizeof(skinname), "%s_%i_shirt", loadname, i);
texnums->upperoverlay = Mod_LoadReplacementTexture(skinname, "models", true, true, true);
}
@ -1809,7 +1809,7 @@ qboolean Mod_LoadQ1Model (model_t *mod, void *buffer)
}
seamremap = (int*)pq1inmodel; //I like overloading locals.
if (qtest)
i = sizeof(dmdl_t)/4 - sizeof(int)*2 - 1;
else
@ -4639,7 +4639,7 @@ int Mod_GetNumBones(struct model_s *model, qboolean allowtags)
{
return 0;
}
int Mod_GetBoneRelations(struct model_s *model, int numbones, framestate_t *fstate, float *result)
int Mod_GetBoneRelations(model_t *model, int firstbone, int lastbone, framestate_t *fstate, float *result)
{
return 0;
}