qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 20:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a silly goof with the models

Browse source
This commit is contained in:
Bill Currie 2001-10-28 05:43:53 +00:00
parent 09f19fd9c9
commit 3ce8029f74
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/QF/model.h
View file

@ -463,8 +463,8 @@ void Mod_ProcessTexture(miptex_t *mt, texture_t *tx);
void Mod_LoadLighting (lump_t *l); void Mod_LoadLighting (lump_t *l);
int Mod_CalcFullbright (byte *in, byte *out, int pixels); int Mod_CalcFullbright (byte *in, byte *out, int pixels);
void *Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame); void *Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame);
void *Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame); void *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame);
void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype,
int *pskinindex); int *pskinindex);
void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,

16
libs/models/alias/gl_model_alias.c
View file

@ -233,7 +233,7 @@ Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
} }
void * void *
Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame) Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame)
{ {
trivertx_t *pinframe; trivertx_t *pinframe;
int i; int i;
@ -242,7 +242,7 @@ Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame)
pdaliasframe = (daliasframe_t *) pin; pdaliasframe = (daliasframe_t *) pin;
strcpy (frame->name, pdaliasframe->name); strcpy (frame->name, pdaliasframe->name);
frame->firstpose = posenum; frame->firstpose = (*posenum);
frame->numposes = 1; frame->numposes = 1;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -253,8 +253,8 @@ Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame)
pinframe = (trivertx_t *) (pdaliasframe + 1); pinframe = (trivertx_t *) (pdaliasframe + 1);
poseverts[posenum] = pinframe; poseverts[(*posenum)] = pinframe;
posenum++; (*posenum)++;
pinframe += pheader->mdl.numverts; pinframe += pheader->mdl.numverts;
@ -262,7 +262,7 @@ Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame)
} }
void * void *
Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame) Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame)
{ {
daliasgroup_t *pingroup; daliasgroup_t *pingroup;
int i, numframes; int i, numframes;
@ -273,7 +273,7 @@ Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame)
numframes = LittleLong (pingroup->numframes); numframes = LittleLong (pingroup->numframes);
frame->firstpose = posenum; frame->firstpose = (*posenum);
frame->numposes = numframes; frame->numposes = numframes;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -291,8 +291,8 @@ Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame)
ptemp = (void *) pin_intervals; ptemp = (void *) pin_intervals;
for (i = 0; i < numframes; i++) { for (i = 0; i < numframes; i++) {
poseverts[posenum] = (trivertx_t *) ((daliasframe_t *) ptemp + 1); poseverts[(*posenum)] = (trivertx_t *) ((daliasframe_t *) ptemp + 1);
posenum++; (*posenum)++;
ptemp = (trivertx_t *) ((daliasframe_t *) ptemp + 1) + pheader->mdl.numverts; ptemp = (trivertx_t *) ((daliasframe_t *) ptemp + 1) + pheader->mdl.numverts;
} }
return ptemp; return ptemp;

4
libs/models/alias/model_alias.c
View file

@ -187,11 +187,11 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
if (frametype == ALIAS_SINGLE) { if (frametype == ALIAS_SINGLE) {
pframetype = (daliasframetype_t *) pframetype = (daliasframetype_t *)
Mod_LoadAliasFrame (pframetype + 1, posenum, Mod_LoadAliasFrame (pframetype + 1, &posenum,
&pheader->frames[i]); &pheader->frames[i]);
} else { } else {
pframetype = (daliasframetype_t *) pframetype = (daliasframetype_t *)
Mod_LoadAliasGroup (pframetype + 1, posenum, Mod_LoadAliasGroup (pframetype + 1, &posenum,
&pheader->frames[i]); &pheader->frames[i]);
} }
} }

6
libs/models/alias/sw32_model_alias.c
View file

@ -190,7 +190,7 @@ GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s)
} }
void * void *
Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame) Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame)
{ {
trivertx_t *pframe, *pinframe; trivertx_t *pframe, *pinframe;
int i, j; int i, j;
@ -228,7 +228,7 @@ Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame)
} }
void * void *
Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame) Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame)
{ {
daliasgroup_t *pingroup; daliasgroup_t *pingroup;
maliasgroup_t *paliasgroup; maliasgroup_t *paliasgroup;
@ -272,7 +272,7 @@ Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame)
for (i = 0; i < numframes; i++) { for (i = 0; i < numframes; i++) {
maliasframedesc_t temp_frame; maliasframedesc_t temp_frame;
ptemp = Mod_LoadAliasFrame (ptemp, i, &temp_frame); ptemp = Mod_LoadAliasFrame (ptemp, &i, &temp_frame);
memcpy (&paliasgroup->frames[i], &temp_frame, memcpy (&paliasgroup->frames[i], &temp_frame,
sizeof(paliasgroup->frames[i])); sizeof(paliasgroup->frames[i]));
} }

6
libs/models/alias/sw_model_alias.c
View file

@ -184,7 +184,7 @@ GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s)
} }
void * void *
Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame) Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame)
{ {
trivertx_t *pframe, *pinframe; trivertx_t *pframe, *pinframe;
int i, j; int i, j;
@ -223,7 +223,7 @@ Mod_LoadAliasFrame (void *pin, int posenum, maliasframedesc_t *frame)
} }
void * void *
Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame) Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame)
{ {
daliasgroup_t *pingroup; daliasgroup_t *pingroup;
maliasgroup_t *paliasgroup; maliasgroup_t *paliasgroup;
@ -267,7 +267,7 @@ Mod_LoadAliasGroup (void *pin, int posenum, maliasframedesc_t *frame)
for (i = 0; i < numframes; i++) { for (i = 0; i < numframes; i++) {
maliasframedesc_t temp_frame; maliasframedesc_t temp_frame;
ptemp = Mod_LoadAliasFrame (ptemp, i, &temp_frame); ptemp = Mod_LoadAliasFrame (ptemp, &i, &temp_frame);
memcpy (&paliasgroup->frames[i], &temp_frame, memcpy (&paliasgroup->frames[i], &temp_frame,
sizeof(paliasgroup->frames[i])); sizeof(paliasgroup->frames[i]));
} }