From b4ab993fe442d27d4e9b919115818e2f1e670590 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 19 Sep 2006 08:45:13 +0000 Subject: [PATCH] fix bug that often made enforcer laser bolts 'stick' in the air if a player is standing right next to the enforcer when it fires, this was due to some internal confusion over what constitutes a 'startsolid' case, this has been clarified so that SV_PushEntity only uses trace.bmodelstartsolid, just like the toss/bounce/fly/flymissile/bouncemissile physics expect git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6594 d7cf8633-e32d-0410-b094-e92efae38249 --- sv_phys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv_phys.c b/sv_phys.c index 36859f3f..6b4e1f8e 100644 --- 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); -- 2.39.2