From cdb9eed996f3bad6e81504f00628b15e8b687f6f Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 7 May 2009 12:18:35 +0000 Subject: [PATCH] Fix GCC complaining about Mod_GetBoneRelations having conflicting types with the software-only client. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3187 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/com_mesh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c index decc74724..20e91aa10 100644 --- a/engine/common/com_mesh.c +++ b/engine/common/com_mesh.c @@ -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; }