hehe, player skins were totally borked for the last 3 weeks :/. They're now

fixed :)
This commit is contained in:
Bill Currie 2000-09-16 19:28:13 +00:00
parent 18aa60183d
commit 7605d9d17e
3 changed files with 6 additions and 14 deletions

View file

@ -61,8 +61,6 @@ extern mtriangle_t triangles[MAXALIASTRIS];
extern trivertx_t *poseverts[MAXALIASFRAMES];
extern int posenum;
extern byte player_8bit_texels[320*200];
/*
=================
Mod_FloodFillSkin
@ -147,6 +145,12 @@ void *Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, qboolean group
int fbtexnum;
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 = Hunk_AllocName(skinsize, loadname);
pheader->texels[snum] = texels - (byte *)pheader;
memcpy (texels, skin, skinsize);
}
if (group) {
snprintf(name, sizeof(name), "fb_%s_%i_%i", loadmodel->name,snum,gnum);
@ -196,14 +200,6 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinind
skin+=4;
skin = Mod_LoadSkin (skin, skinsize, i, 0, false);
// save 8 bit texels for the player model to remap
if (!strcmp(loadmodel->name,"progs/player.mdl"))
{
if (skinsize > sizeof(player_8bit_texels))
Sys_Error ("Player skin too large");
memcpy (player_8bit_texels, skin, skinsize);
}
for (j=1; j < 4; j++) {
pheader->gl_texturenum[i][j] =
pheader->gl_texturenum[i][j - 1];

View file

@ -63,8 +63,6 @@ mtriangle_t triangles[MAXALIASTRIS];
trivertx_t *poseverts[MAXALIASFRAMES];
int posenum;
byte player_8bit_texels[320*200];
void *Mod_LoadAliasFrame (void * pin, maliasframedesc_t *frame);
void *Mod_LoadAliasGroup (void * pin, maliasframedesc_t *frame);

View file

@ -61,8 +61,6 @@ extern mtriangle_t triangles[MAXALIASTRIS];
extern trivertx_t *poseverts[MAXALIASFRAMES];
extern int posenum;
extern byte player_8bit_texels[320*200];
void *Mod_LoadSkin (byte *skin, int skinsize, int *pskinindex, int snum, int gnum)
{
byte *pskin;