]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fixed a (hopefully rare) bug affecting shalrath missiles which caused multiple missil...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 20 Sep 2006 06:37:04 +0000 (06:37 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 20 Sep 2006 06:37:04 +0000 (06:37 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6595 d7cf8633-e32d-0410-b094-e92efae38249

sv_phys.c

index 6b4e1f8e765e7766423d5250aabc7e8a5570b90f..2c7cd21042389968f33e53af1dafaa51a31aa472 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -595,7 +595,7 @@ static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmo
        VectorCopy (trace.endpos, ent->fields.server->origin);
        SV_LinkEdict (ent, true);
 
-       if (trace.ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent)))
+       if (ent->fields.server->solid >= SOLID_TRIGGER && trace.ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent)))
                SV_Impact (ent, &trace);
        return trace;
 }