]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
nudgeoutofsolid: check for bmodelstartsolid, not startsolid. Allows multiple player...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 27 Jan 2010 10:12:51 +0000 (10:12 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 27 Jan 2010 10:12:51 +0000 (10:12 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9874 d7cf8633-e32d-0410-b094-e92efae38249

sv_phys.c

index 2b1aa58d29327a7413b1f1e3d9bf0669fd5294f3..b62de11953fd02ba6afecc467c53c16d0d58b638 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1515,7 +1515,7 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q
 
        *trace = SV_TraceBox(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent));
        bump = 0;
-       while (trace->startsolid && sv_gameplayfix_nudgeoutofsolid.integer)
+       while (trace->bmodelstartsolid && sv_gameplayfix_nudgeoutofsolid.integer)
        {
                vec_t nudge = -trace->startdepth + sv_gameplayfix_nudgeoutofsolid_bias.value;
                VectorMA(ent->fields.server->origin, nudge, trace->startdepthnormal, ent->fields.server->origin);