]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Some early stuff for getting this to work.. just want to have proof of concept first.
authorSamual <samual@xonotic.org>
Tue, 31 May 2011 17:15:17 +0000 (13:15 -0400)
committerSamual <samual@xonotic.org>
Tue, 31 May 2011 17:15:17 +0000 (13:15 -0400)
sv_phys.c

index 61a5dc4e59d9a33ed5ed8defdd4f71f0fc99cd52..1ba87baa2847636227254b33a914a9cffc4f128a 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1513,9 +1513,11 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q
        if (movetype == MOVETYPE_FLYMISSILE)
                type = MOVE_MISSILE;
        else if (solid == SOLID_TRIGGER || solid == SOLID_NOT)
-               type = MOVE_NOMONSTERS; // only clip against bmodels
+               type = MOVE_WORLDONLY; // only clip against bmodels
        else
                type = MOVE_NORMAL;
+               
+       Con_Printf("wtfhax: %i \n", type); 
 
        *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent));
        if (trace->bmodelstartsolid && failonbmodelstartsolid)
@@ -2211,7 +2213,7 @@ void SV_WalkMove (prvm_edict_t *ent)
                if (ent->fields.server->movetype == MOVETYPE_FLYMISSILE)
                        type = MOVE_MISSILE;
                else if (ent->fields.server->solid == SOLID_TRIGGER || ent->fields.server->solid == SOLID_NOT)
-                       type = MOVE_NOMONSTERS; // only clip against bmodels
+                       type = MOVE_WORLDONLY; // only clip against bmodels
                else
                        type = MOVE_NORMAL;
                trace = SV_TraceBox(upmove, ent->fields.server->mins, ent->fields.server->maxs, downmove, type, ent, SV_GenericHitSuperContentsMask(ent));