rename VM_hash to VM_crc16, and the extension to DP_QC_CRC16. That way, it is specifi...

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index b117fec37fb359ed142addce4c3d8f7931c9a5b2..7fdf187371e312a9b714a023a6c3bf30fda55bb3 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -431,6 +431,8 @@ int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, ma
 int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const char *tagname)
 {
        int i;
+       if(skin >= (unsigned int)model->numskins)
+               skin = 0;
        if (model->data_overridetagnamesforskin && skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)skin].num_overridetagnames)
                for (i = 0;i < model->data_overridetagnamesforskin[skin].num_overridetagnames;i++)
                        if (!strcasecmp(tagname, model->data_overridetagnamesforskin[skin].data_overridetagnames[i].name))
@@ -1529,7 +1531,8 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
        Mod_Alias_CalculateBoundingBox();
        Mod_FreeSkinFiles(skinfiles);
 
-       loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
+       loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 
+            || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1);
 }
 
 void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)