From: Samual <samual@xonotic.org>
Date: Tue, 31 May 2011 17:15:17 +0000 (-0400)
Subject: Some early stuff for getting this to work.. just want to have proof of concept first.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1663c0545b72af3cee1e106790d46649ea599158;p=xonotic%2Fdarkplaces.git

Some early stuff for getting this to work.. just want to have proof of concept first.
---

diff --git a/sv_phys.c b/sv_phys.c
index 61a5dc4e..1ba87baa 100644
--- 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));