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

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 00e046b30bedd61e5069fdc2bc3c6f7409f29903..6b4e1f8e765e7766423d5250aabc7e8a5570b90f 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -374,6 +374,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
                Con_Print("\n");
 #endif
 
+#if 0
                if (trace.bmodelstartsolid)
                {
                        // LordHavoc: note: this code is what makes entities stick in place
@@ -383,6 +384,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
                        VectorClear(ent->fields.server->velocity);
                        return 3;
                }
+#endif
 
                // break if it moved the entire distance
                if (trace.fraction == 1)
@@ -571,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;
@@ -587,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);