From e3017a8fe48363cd4027d834c325d5e54c5e2c5b Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Fri, 16 Jan 2009 01:24:57 +0000 Subject: [PATCH] Some random #ifdef SKELETALMODELS scattered around the code. Enough to make it build, but not enough to exclude unused code from being built. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3101 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/com_mesh.c | 12 ++++++++++++ engine/common/com_mesh.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c index 633a8116e..db185b4e1 100644 --- a/engine/common/com_mesh.c +++ b/engine/common/com_mesh.c @@ -291,6 +291,7 @@ int Alias_GetBoneRelations(galiasinfo_t *inf, framestate_t *fstate, float *resul //_may_ into bonepose, return value is the real result float *Alias_GetBonePositions(galiasinfo_t *inf, framestate_t *fstate, float *buffer, int buffersize) { +#ifdef SKELETALMODELS float relationsbuf[MAX_BONES][12]; float *relations = NULL; galiasbone_t *bones = (galiasbone_t *)((char*)inf+inf->ofsbones); @@ -381,6 +382,8 @@ float *Alias_GetBonePositions(galiasinfo_t *inf, framestate_t *fstate, float *bu } return buffer; } +#endif + return 0; } @@ -2352,6 +2355,7 @@ int Mod_GetNumBones(model_t *model, qboolean allowtags) int Mod_GetBoneRelations(model_t *model, int numbones, framestate_t *fstate, float *result) { +#ifdef SKELETALMODELS galiasinfo_t *inf; @@ -2360,10 +2364,13 @@ int Mod_GetBoneRelations(model_t *model, int numbones, framestate_t *fstate, flo inf = Mod_Extradata(model); return Alias_GetBoneRelations(inf, fstate, result, numbones); +#endif + return 0; } int Mod_GetBoneParent(model_t *model, int bonenum) { +#ifdef SKELETALMODELS galiasbone_t *bone; galiasinfo_t *inf; @@ -2379,10 +2386,13 @@ int Mod_GetBoneParent(model_t *model, int bonenum) return 0; //no parent bone = (galiasbone_t*)((char*)inf + inf->ofsbones); return bone[bonenum].parent+1; +#endif + return 0; } char *Mod_GetBoneName(model_t *model, int bonenum) { +#ifdef SKELETALMODELS galiasbone_t *bone; galiasinfo_t *inf; @@ -2398,6 +2408,8 @@ char *Mod_GetBoneName(model_t *model, int bonenum) return 0; //no parent bone = (galiasbone_t*)((char*)inf + inf->ofsbones); return bone[bonenum].name; +#endif + return 0; } diff --git a/engine/common/com_mesh.h b/engine/common/com_mesh.h index e8c53a7d3..1b78c2459 100644 --- a/engine/common/com_mesh.h +++ b/engine/common/com_mesh.h @@ -121,7 +121,9 @@ typedef struct { #endif float *Alias_GetBonePositions(galiasinfo_t *inf, framestate_t *fstate, float *buffer, int buffersize); +#ifdef SKELETALMODELS void Alias_TransformVerticies(float *bonepose, galisskeletaltransforms_t *weights, int numweights, float *xyzout); +#endif qboolean Alias_GAliasBuildMesh(mesh_t *mesh, galiasinfo_t *inf, entity_t *e, float alpha, qboolean nolightdir);