X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=c4d2b088234a61962243ae9ef565a32efe442581;hb=2048a824c4d5c5d4d031e519dd3a125db35415fd;hp=9fa98ccaf2621dd10884ff8faaf82afd35255645;hpb=b2ceb93109e9c9aa188fe8cb22dde6b4d169807f;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 9fa98cca..c4d2b088 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -259,7 +259,6 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version loadmodel->radius2 = modelradius * modelradius; } -extern void R_Model_Sprite_Draw(entity_render_t *ent); void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend) { int version; @@ -368,7 +367,7 @@ void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; + loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); } @@ -476,5 +475,5 @@ 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; + loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1); }