yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 12:41:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

models: ignore sprites/skins bigger than MAX_MD2SKINS

Browse source
This commit is contained in:
Denis Pauk 2023-07-02 00:08:23 +03:00
parent 5c0883594f
commit 63d990487a
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/client/refresh/files/models.c
View file

@ -112,6 +112,14 @@ Mod_LoadMD2 (const char *mod_name, const void *buffer, int modfilelen,
return NULL; return NULL;
} }
if (pheader->num_skins > MAX_MD2SKINS)
{
R_Printf(PRINT_ALL, "%s has too many skins (%i > %i), "
"extra sprites will be ignored\n",
mod_name, pheader->num_skins, MAX_MD2SKINS);
pheader->num_skins = MAX_MD2SKINS;
}
// //
// load base s and t vertices (not used in gl version) // load base s and t vertices (not used in gl version)
// //
@ -212,7 +220,7 @@ SPRITE MODELS
Mod_LoadSP2 Mod_LoadSP2
support for .sp2 sprites support for .sp2 sprites
==== =================
*/ */
void * void *
Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen, Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
@ -239,9 +247,10 @@ Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
if (sprout->numframes > MAX_MD2SKINS) if (sprout->numframes > MAX_MD2SKINS)
{ {
R_Printf(PRINT_ALL, "%s has too many frames (%i > %i)", R_Printf(PRINT_ALL, "%s has too many frames (%i > %i), "
"extra frames will be ignored\n",
mod_name, sprout->numframes, MAX_MD2SKINS); mod_name, sprout->numframes, MAX_MD2SKINS);
return NULL; sprout->numframes = MAX_MD2SKINS;
} }
/* byte swap everything */ /* byte swap everything */
@ -278,8 +287,10 @@ Mod_ReLoadSkins(struct image_s **skins, findimage_t find_image, void *extradata,
int i; int i;
sprout = (dsprite_t *)extradata; sprout = (dsprite_t *)extradata;
for (i=0 ; i<sprout->numframes ; i++) for (i=0; i < sprout->numframes; i++)
skins[i] = find_image (sprout->frames[i].name, it_sprite); {
skins[i] = find_image(sprout->frames[i].name, it_sprite);
}
return sprout->numframes; return sprout->numframes;
} }
else if (type == mod_alias) else if (type == mod_alias)
@ -288,8 +299,10 @@ Mod_ReLoadSkins(struct image_s **skins, findimage_t find_image, void *extradata,
int i; int i;
pheader = (dmdl_t *)extradata; pheader = (dmdl_t *)extradata;
for (i=0 ; i<pheader->num_skins ; i++) for (i=0; i < pheader->num_skins; i++)
{
skins[i] = find_image ((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME, it_skin); skins[i] = find_image ((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME, it_skin);
}
return pheader->num_frames; return pheader->num_frames;
} }
/* Unknow format, no images associated with it */ /* Unknow format, no images associated with it */