Have objects with PF_PERSISTENT (never supposed to stop) flag also trigger original condition in check_vector_to_sphere_1

This commit is contained in:
zico 2014-08-18 10:48:02 +02:00
parent ce8165fc6c
commit cc2f1cb040

View file

@ -627,6 +627,12 @@ static fix check_vector_to_object(vms_vector *intp,const vms_vector *p0,const vm
for (i = 0; i < numignore; i++)
if (obj->type == ignoreobjs[i] || otherobj->type == ignoreobjs[i])
haveignoreobj = 1;
if (obj->type == OBJ_WEAPON)
if (obj->mtype.phys_info.flags & PF_PERSISTENT)
haveignoreobj = 1;
if (otherobj->type == OBJ_WEAPON)
if (otherobj->mtype.phys_info.flags & PF_PERSISTENT)
haveignoreobj = 1;
return check_vector_to_sphere_1(intp,p0,p1,&obj->pos,size+rad,haveignoreobj);