X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=df70609f6dba352efde24d8e7c7eeb00e1bafab8;hb=c71f71171708eafc50feb816fb0532eb57aa1de6;hp=0c27bc21801f886e2073289942ed0dc977f59e0c;hpb=f87cf4e9590a353b5253b5bf098ec4450d49a965;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 0c27bc21..df70609f 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -192,7 +192,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version } if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false))) { - unsigned char *pixels = Mem_Alloc(loadmodel->mempool, width*height*4); + unsigned char *pixels = (unsigned char *) Mem_Alloc(loadmodel->mempool, width*height*4); if (version == SPRITE32_VERSION) { for (x = 0;x < width*height;x++) @@ -340,6 +340,8 @@ void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend) else Host_Error("Mod_IDSP_Load: %s has wrong version number (%i). Only %i (quake), %i (HalfLife), and %i (sprite32) supported", loadmodel->name, version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION); + + loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1; } @@ -445,4 +447,6 @@ void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend) } loadmodel->radius = modelradius; loadmodel->radius2 = modelradius * modelradius; + + loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1; }