]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
handle one error condition I forgot to code in PF_setattachment (modelindex was check...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 16 Oct 2003 11:41:18 +0000 (11:41 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 16 Oct 2003 11:41:18 +0000 (11:41 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3586 d7cf8633-e32d-0410-b094-e92efae38249

pr_cmds.c

index a7468f0a39368aff17728db196df3077e7b04638..5f033db063e477e540f55a9a8bdc29e055aaeaf7 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -2968,9 +2968,8 @@ void PF_setattachment (void)
        if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
        {
                modelindex = (int)tagentity->v->modelindex;
-               if (modelindex >= 0 && modelindex < MAX_MODELS)
+               if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
                {
-                       model = sv.models[modelindex];
                        if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
                                for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
                                        if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))