fix bug that often made enforcer laser bolts 'stick' in the air if a player is standi...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6594 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sv_phys.c b/sv_phys.c
index 36859f3f744ec07075958433e5743c51f1585a08..6b4e1f8e765e7766423d5250aabc7e8a5570b90f 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -573,7 +573,7 @@ SV_PushEntity
 Does not change the entities velocity at all
 ============
 */
-trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonstartsolid)
+static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid)
 {
        int type;
        trace_t trace;
@@ -589,7 +589,7 @@ trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonstartsolid
                type = MOVE_NORMAL;
 
        trace = SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, type, ent);
-       if (trace.startsolid && failonstartsolid)
+       if (trace.bmodelstartsolid && failonbmodelstartsolid)
                return trace;
 
        VectorCopy (trace.endpos, ent->fields.server->origin);