Added isfunction and changed callfunction so it works

[xonotic/darkplaces.git] / pr_cmds.c

diff --git a/pr_cmds.c b/pr_cmds.c
index d9762d83c28f0fe0203dcb7429bad32d5a529b3f..5f033db063e477e540f55a9a8bdc29e055aaeaf7 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -107,6 +107,8 @@ char *ENGINE_EXTENSIONS =
 "DP_QC_SINCOSSQRTPOW "
 "DP_QC_TRACEBOX "
 "DP_QC_TRACETOSS "
+"DP_QC_TRACE_MOVETYPE_WORLDONLY "
+"DP_QC_TRACE_MOVETYPE_HITMODEL "
 "DP_QC_VECTORVECTORS "
 "DP_QUAKE2_MODEL "
 "DP_QUAKE3_MODEL "
@@ -2966,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))