qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

finish the model merge

Browse source
This commit is contained in:
Bill Currie 2001-05-10 15:29:29 +00:00
parent e12879c55b
commit d3d3a1c451
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,8 +117,7 @@ Mod_FloodFillSkin (byte * skin, int skinwidth, int skinheight)
// can't fill to filled color or to transparent color (used as visited
// marker)
if ((fillcolor == filledcolor) || (fillcolor == 255)) {
// printf( "not filling skin from %d to %d\n", fillcolor, filledcolor
// );
//printf ("not filling skin from %d to %d\n", fillcolor, filledcolor);
return;
}
@ -155,8 +154,12 @@ Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group)
Mod_FloodFillSkin (skin, pheader->mdl.skinwidth, pheader->mdl.skinheight);
// save 8 bit texels for the player model to remap
if (!strcmp (loadmodel->name, "progs/player.mdl")) {
byte *texels;
if (skinsize > sizeof (player_8bit_texels))
Sys_Error ("Player skin too large");
texels = Hunk_AllocName (skinsize, loadname);
pheader->texels[snum] = texels - (byte *) pheader;
memcpy (texels, skin, skinsize);
memcpy (player_8bit_texels, skin, skinsize);
}
@ -256,7 +259,8 @@ Mod_LoadAliasFrame (void *pin, maliasframedesc_t *frame)
frame->firstpose = posenum;
frame->numposes = 1;
for (i = 0; i < 3; i++) { // byte values, don't worry about endianness
for (i = 0; i < 3; i++) {
// byte values, don't worry about endianness
frame->bboxmin.v[i] = pdaliasframe->bboxmin.v[i];
frame->bboxmax.v[i] = pdaliasframe->bboxmax.v[i];
}

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

@ -205,7 +205,8 @@ Mod_LoadAliasFrame (void *pin, maliasframedesc_t *frame)
strcpy (frame->name, pdaliasframe->name);
for (i = 0; i < 3; i++) { // byte values, don't worry about endianness
for (i = 0; i < 3; i++) {
// byte values, don't worry about endianness
frame->bboxmin.v[i] = pdaliasframe->bboxmin.v[i];
frame->bboxmax.v[i] = pdaliasframe->bboxmax.v[i];
}

6
libs/models/model.c
View file

@ -104,7 +104,7 @@ Mod_FindName (char *name)
model_t *mod;
if (!name[0])
Sys_Error ("Mod_ForName: NULL name");
Sys_Error ("Mod_FindName: NULL name");
//
// search the currently loaded models
@ -152,7 +152,7 @@ Mod_LoadModel (model_t *mod, qboolean crash)
sizeof (stackbuf));
if (!buf) {
if (crash)
Sys_Error ("Mod_NumForName: %s not found", mod->name);
Sys_Error ("Mod_LoadModel: %s not found", mod->name);
return NULL;
}
//
@ -204,7 +204,7 @@ Mod_ForName (char *name, qboolean crash)
}
/*
Mod_Init
Mod_Extradata
Caches the data if needed
*/