X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=dd85b9b497bae616056be4948cea73ff4cb1c87f;hb=62dde41ada94503a2742512e040e57855d639e97;hp=9cf79ae4fa11eb316d989f8936bec632d57fab57;hpb=5fbf1b000aeab4cc583f562a35cf0dddef63aa52;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index 9cf79ae4..dd85b9b4 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -39,15 +39,10 @@ solid_edge items only clip against bsp models.
 
 */
 
-cvar_t sv_friction = {CVAR_NOTIFY, "sv_friction","4", "how fast you slow down"};
-cvar_t sv_waterfriction = {CVAR_NOTIFY, "sv_waterfriction","-1", "how fast you slow down, if less than 0 the sv_friction variable is used instead"};
-cvar_t sv_stopspeed = {CVAR_NOTIFY, "sv_stopspeed","100", "how fast you come to a complete stop"};
 cvar_t sv_gravity = {CVAR_NOTIFY, "sv_gravity","800", "how fast you fall (512 = roughly earth gravity)"};
 cvar_t sv_maxvelocity = {CVAR_NOTIFY, "sv_maxvelocity","2000", "universal speed limit on all entities"};
 cvar_t sv_nostep = {CVAR_NOTIFY, "sv_nostep","0", "prevents MOVETYPE_STEP entities (monsters) from moving"};
-cvar_t sv_stepheight = {CVAR_NOTIFY, "sv_stepheight", "18", "how high you can step up (TW_SV_STEPCONTROL extension)"};
 cvar_t sv_jumpstep = {CVAR_NOTIFY, "sv_jumpstep", "0", "whether you can step up while jumping (sv_gameplayfix_stepwhilejumping must also be 1)"};
-cvar_t sv_wallfriction = {CVAR_NOTIFY, "sv_wallfriction", "1", "how much you slow down when sliding along a wall"};
 cvar_t sv_newflymove = {CVAR_NOTIFY, "sv_newflymove", "0", "enables simpler/buggier player physics (not recommended)"};
 cvar_t sv_freezenonclients = {CVAR_NOTIFY, "sv_freezenonclients", "0", "freezes time, except for players, allowing you to walk around and take screenshots of explosions"};
 cvar_t sv_playerphysicsqc = {CVAR_NOTIFY, "sv_playerphysicsqc", "1", "enables QuakeC function to override player physics"};
@@ -85,111 +80,30 @@ LINE TESTING IN HULLS
 ===============================================================================
 */
 
-/*
-==================
-SV_Move_ClipToEntity
-
-Handles selection or creation of a clipping hull, and offseting (and
-eventually rotation) of the end points
-==================
-*/
-trace_t SV_Move_ClipToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
+int SV_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 {
-	trace_t trace;
-	model_t *model = NULL;
-	matrix4x4_t matrix, imatrix;
-	float tempnormal[3], starttransformed[3], endtransformed[3];
-
-	memset(&trace, 0, sizeof(trace));
-	trace.fraction = trace.realfraction = 1;
-	VectorCopy(end, trace.endpos);
-
-	if ((int) ent->fields.server->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
+	prvm_eval_t *val;
+	if (passedict)
 	{
-		unsigned int modelindex = (unsigned int)ent->fields.server->modelindex;
-		// if the modelindex is 0, it shouldn't be SOLID_BSP!
-		if (modelindex == 0)
-		{
-			Con_Printf("SV_Move_ClipToEntity: edict %i: SOLID_BSP with no model\n", PRVM_NUM_FOR_EDICT(ent));
-			return trace;
-		}
-		if (modelindex >= MAX_MODELS)
-		{
-			Con_Printf("SV_Move_ClipToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
-			return trace;
-		}
-		model = sv.models[modelindex];
-		if (modelindex != 0 && model == NULL)
-		{
-			Con_Printf("SV_Move_ClipToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
-			return trace;
-		}
-
-		if ((int) ent->fields.server->solid == SOLID_BSP)
+		val = PRVM_EDICTFIELDVALUE(passedict, prog->fieldoffsets.dphitcontentsmask);
+		if (val && val->_float)
+			return (int)val->_float;
+		else if (passedict->fields.server->solid == SOLID_SLIDEBOX)
 		{
-			if (!model->TraceBox)
-			{
-				Con_Printf("SV_Move_ClipToEntity: edict %i: SOLID_BSP with a non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
-				return trace;
-			}
-			//if ((int) ent->fields.server->movetype != MOVETYPE_PUSH)
-			//{
-			//	Con_Printf("SV_Move_ClipToEntity: edict %i: SOLID_BSP without MOVETYPE_PUSH\n", PRVM_NUM_FOR_EDICT(ent));
-			//	return trace;
-			//}
+			if ((int)passedict->fields.server->flags & FL_MONSTER)
+				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP;
+			else
+				return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP;
 		}
-		Matrix4x4_CreateFromQuakeEntity(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2], ent->fields.server->angles[0], ent->fields.server->angles[1], ent->fields.server->angles[2], 1);
-	}
-	else
-		Matrix4x4_CreateTranslate(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
-
-	Matrix4x4_Invert_Simple(&imatrix, &matrix);
-	Matrix4x4_Transform(&imatrix, start, starttransformed);
-	Matrix4x4_Transform(&imatrix, end, endtransformed);
-#if COLLISIONPARANOID >= 3
-	Con_Printf("trans(%f %f %f -> %f %f %f, %f %f %f -> %f %f %f)", start[0], start[1], start[2], starttransformed[0], starttransformed[1], starttransformed[2], end[0], end[1], end[2], endtransformed[0], endtransformed[1], endtransformed[2]);
-#endif
-
-	if (model && model->TraceBox)
-	{
-		int frame;
-		frame = (int)ent->fields.server->frame;
-		frame = bound(0, frame, (model->numframes - 1));
-		model->TraceBox(model, frame, &trace, starttransformed, mins, maxs, endtransformed, hitsupercontents);
-	}
-	else
-		Collision_ClipTrace_Box(&trace, ent->fields.server->mins, ent->fields.server->maxs, starttransformed, mins, maxs, endtransformed, hitsupercontents, ent->fields.server->solid == SOLID_CORPSE ? SUPERCONTENTS_CORPSE : SUPERCONTENTS_BODY, 0, NULL);
-	trace.fraction = bound(0, trace.fraction, 1);
-	trace.realfraction = bound(0, trace.realfraction, 1);
-
-	if (trace.fraction < 1)
-	{
-		VectorLerp(start, trace.fraction, end, trace.endpos);
-		VectorCopy(trace.plane.normal, tempnormal);
-		Matrix4x4_Transform3x3(&matrix, tempnormal, trace.plane.normal);
-		// FIXME: should recalc trace.plane.dist
+		else if (passedict->fields.server->solid == SOLID_CORPSE)
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
+		else if (passedict->fields.server->solid == SOLID_TRIGGER)
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
+		else
+			return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
 	}
 	else
-		VectorCopy(end, trace.endpos);
-
-	return trace;
-}
-
-/*
-==================
-SV_Move_ClipToWorld
-==================
-*/
-trace_t SV_Move_ClipToWorld(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
-{
-	trace_t trace;
-	memset(&trace, 0, sizeof(trace));
-	trace.fraction = trace.realfraction = 1;
-	sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, start, mins, maxs, end, hitsupercontents);
-	trace.fraction = bound(0, trace.fraction, 1);
-	trace.realfraction = bound(0, trace.realfraction, 1);
-	VectorLerp(start, trace.fraction, end, trace.endpos);
-	return trace;
+		return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
 }
 
 /*
@@ -198,18 +112,16 @@ SV_Move
 ==================
 */
 #if COLLISIONPARANOID >= 1
-trace_t SV_Move_(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict)
+trace_t SV_Move_(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
 #else
-trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict)
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
 #endif
 {
 	vec3_t hullmins, hullmaxs;
-	int i;
-	int hitsupercontentsmask;
+	int i, bodysupercontents;
 	int passedictprog;
 	qboolean pointtrace;
 	prvm_edict_t *traceowner, *touch;
-	prvm_eval_t *val;
 	trace_t trace;
 	// bounding box of entire move area
 	vec3_t clipboxmins, clipboxmaxs;
@@ -221,6 +133,11 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	vec3_t clipstart, clipend;
 	// trace results
 	trace_t cliptrace;
+	// matrices to transform into/out of other entity's space
+	matrix4x4_t matrix, imatrix;
+	// model of other entity
+	model_t *model;
+	// list of entities to test for collisions
 	int numtouchedicts;
 	prvm_edict_t *touchedicts[MAX_EDICTS];
 
@@ -234,28 +151,8 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	Con_Printf("move(%f %f %f,%f %f %f)", clipstart[0], clipstart[1], clipstart[2], clipend[0], clipend[1], clipend[2]);
 #endif
 
-	if (passedict)
-	{
-		val = PRVM_GETEDICTFIELDVALUE(passedict, prog->fieldoffsets.dphitcontentsmask);
-		if (val && val->_float)
-			hitsupercontentsmask = (int)val->_float;
-		else if (passedict->fields.server->solid == SOLID_SLIDEBOX)
-		{
-			if ((int)passedict->fields.server->flags & FL_MONSTER)
-				hitsupercontentsmask = SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_MONSTERCLIP;
-			else
-				hitsupercontentsmask = SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP;
-		}
-		else if (passedict->fields.server->solid == SOLID_CORPSE)
-			hitsupercontentsmask = SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY;
-		else
-			hitsupercontentsmask = SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
-	}
-	else
-		hitsupercontentsmask = SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
-
 	// clip to world
-	cliptrace = SV_Move_ClipToWorld(clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
+	Collision_ClipToWorld(&cliptrace, sv.worldmodel, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
 	cliptrace.bmodelstartsolid = cliptrace.startsolid;
 	if (cliptrace.startsolid || cliptrace.fraction < 1)
 		cliptrace.ent = prog->edicts;
@@ -306,6 +203,8 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.server->owner) : 0;
 
 	// clip to entities
+	// because this uses World_EntitiestoBox, we know all entity boxes overlap
+	// the clip region, so we can skip culling checks in the loop below
 	numtouchedicts = World_EntitiesInBox(&sv.world, clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
 	if (numtouchedicts > MAX_EDICTS)
 	{
@@ -338,57 +237,44 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 				continue;
 		}
 
+		bodysupercontents = touch->fields.server->solid == SOLID_CORPSE ? SUPERCONTENTS_CORPSE : SUPERCONTENTS_BODY;
+
 		// might interact, so do an exact clip
-		if ((int)touch->fields.server->flags & FL_MONSTER)
-			trace = SV_Move_ClipToEntity(touch, clipstart, clipmins2, clipmaxs2, clipend, type, hitsupercontentsmask);
-		else
-			trace = SV_Move_ClipToEntity(touch, clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
-		// LordHavoc: take the 'best' answers from the new trace and combine with existing data
-		if (trace.allsolid)
-			cliptrace.allsolid = true;
-		if (trace.startsolid)
+		model = NULL;
+		if ((int) touch->fields.server->solid == SOLID_BSP || type == MOVE_HITMODEL)
 		{
-			if (touch->fields.server->solid == SOLID_BSP)
-				cliptrace.bmodelstartsolid = true;
-			cliptrace.startsolid = true;
-			if (cliptrace.realfraction == 1)
-				cliptrace.ent = touch;
+			unsigned int modelindex = (unsigned int)touch->fields.server->modelindex;
+			// if the modelindex is 0, it shouldn't be SOLID_BSP!
+			if (modelindex > 0 && modelindex < MAX_MODELS)
+				model = sv.models[(int)touch->fields.server->modelindex];
 		}
-		// don't set this except on the world, because it can easily confuse
-		// monsters underwater if there's a bmodel involved in the trace
-		// (inopen && inwater is how they check water visibility)
-		//if (trace.inopen)
-		//	cliptrace.inopen = true;
-		if (trace.inwater)
-			cliptrace.inwater = true;
-		if (trace.realfraction < cliptrace.realfraction)
-		{
-			cliptrace.fraction = trace.fraction;
-			cliptrace.realfraction = trace.realfraction;
-			VectorCopy(trace.endpos, cliptrace.endpos);
-			cliptrace.plane = trace.plane;
-			cliptrace.ent = touch;
-			cliptrace.hitsupercontents = trace.hitsupercontents;
-			cliptrace.hitq3surfaceflags = trace.hitq3surfaceflags;
-			cliptrace.hittexture = trace.hittexture;
-		}
-		cliptrace.startsupercontents |= trace.startsupercontents;
+		if (model)
+			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2], touch->fields.server->angles[0], touch->fields.server->angles[1], touch->fields.server->angles[2], 1);
+		else
+			Matrix4x4_CreateTranslate(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2]);
+		Matrix4x4_Invert_Simple(&imatrix, &matrix);
+		if ((int)touch->fields.server->flags & FL_MONSTER)
+			Collision_ClipToGenericEntity(&trace, model, touch->fields.server->frame, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
+		else
+			Collision_ClipToGenericEntity(&trace, model, touch->fields.server->frame, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
+
+		Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.server->solid == SOLID_BSP);
 	}
 
 	return cliptrace;
 }
 
 #if COLLISIONPARANOID >= 1
-trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict)
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
 {
 	int endstuck;
 	trace_t trace;
 	vec3_t temp;
-	trace = SV_Move_(start, mins, maxs, end, type, passedict);
+	trace = SV_Move_(start, mins, maxs, end, type, passedict, hitsupercontentsmask);
 	if (passedict)
 	{
 		VectorCopy(trace.endpos, temp);
-		endstuck = SV_Move_(temp, mins, maxs, temp, type, passedict).startsolid;
+		endstuck = SV_Move_(temp, mins, maxs, temp, type, passedict, hitsupercontentsmask).startsolid;
 #if COLLISIONPARANOID < 3
 		if (trace.startsolid || endstuck)
 #endif
@@ -412,7 +298,7 @@ void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent)
 	prvm_edict_t *touch, *touchedicts[MAX_EDICTS];
 
 	// build a list of edicts to touch, because the link loop can be corrupted
-	// by SV_IncreaseEdicts called during touch functions
+	// by IncreaseEdicts called during touch functions
 	numtouchedicts = World_EntitiesInBox(&sv.world, ent->priv.server->areamins, ent->priv.server->areamaxs, MAX_EDICTS, touchedicts);
 	if (numtouchedicts > MAX_EDICTS)
 	{
@@ -441,13 +327,13 @@ void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent)
 			VectorSet (prog->globals.server->trace_plane_normal, 0, 0, 1);
 			prog->globals.server->trace_plane_dist = 0;
 			prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(ent);
-			if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
+			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
 				val->_float = 0;
-			if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
+			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
 				val->_float = 0;
-			if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
+			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
 				val->_float = 0;
-			if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
+			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
 				val->string = 0;
 			PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
 		}
@@ -568,9 +454,12 @@ SV_TestEntityPosition
 returns true if the entity is in solid currently
 ============
 */
-static int SV_TestEntityPosition (prvm_edict_t *ent)
+static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset)
 {
-	trace_t trace = SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NOMONSTERS, ent);
+	vec3_t org;
+	trace_t trace;
+	VectorAdd(ent->fields.server->origin, offset, org);
+	trace = SV_Move (org, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NOMONSTERS, ent, SUPERCONTENTS_SOLID);
 	if (trace.startsupercontents & SUPERCONTENTS_SOLID)
 		return true;
 	else
@@ -580,10 +469,11 @@ static int SV_TestEntityPosition (prvm_edict_t *ent)
 			// q1bsp/hlbsp use hulls and if the entity does not exactly match
 			// a hull size it is incorrectly tested, so this code tries to
 			// 'fix' it slightly...
+			// FIXME: this breaks entities larger than the hull size
 			int i;
 			vec3_t v, m1, m2, s;
-			VectorAdd(ent->fields.server->origin, ent->fields.server->mins, m1);
-			VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, m2);
+			VectorAdd(org, ent->fields.server->mins, m1);
+			VectorAdd(org, ent->fields.server->maxs, m2);
 			VectorSubtract(m2, m1, s);
 #define EPSILON (1.0f / 32.0f)
 			if (s[0] >= EPSILON*2) {m1[0] += EPSILON;m2[0] -= EPSILON;}
@@ -598,8 +488,11 @@ static int SV_TestEntityPosition (prvm_edict_t *ent)
 					return true;
 			}
 		}
-		return false;
 	}
+	// if the trace found a better position for the entity, move it there
+	if (VectorDistance2(trace.endpos, ent->fields.server->origin) >= 0.0001)
+		VectorCopy(trace.endpos, ent->fields.server->origin);
+	return false;
 }
 
 /*
@@ -624,7 +517,7 @@ void SV_CheckAllEnts (void)
 		 || check->fields.server->movetype == MOVETYPE_NOCLIP)
 			continue;
 
-		if (SV_TestEntityPosition (check))
+		if (SV_TestEntityPosition (check, vec3_origin))
 			Con_Print("entity in invalid position\n");
 	}
 }
@@ -648,7 +541,7 @@ int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents)
 	if(ent->fields.server->watertype != nContents)
 	{ // Changed Contents
 		// Acquire Contents Transition Function from QC
-		contentstransition = PRVM_GETEDICTFIELDVALUE(ent, prog->fieldoffsets.contentstransition);
+		contentstransition = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.contentstransition);
 
 		if(contentstransition->function)
 		{ // Valid Function; Execute
@@ -745,6 +638,7 @@ SV_Impact
 Two entities have touched, so run their touch functions
 ==================
 */
+extern void VM_SetTraceGlobals(const trace_t *trace);
 void SV_Impact (prvm_edict_t *e1, trace_t *trace)
 {
 	int old_self, old_other;
@@ -754,36 +648,13 @@ void SV_Impact (prvm_edict_t *e1, trace_t *trace)
 	old_self = prog->globals.server->self;
 	old_other = prog->globals.server->other;
 
+	VM_SetTraceGlobals(trace);
+
 	prog->globals.server->time = sv.time;
 	if (!e1->priv.server->free && !e2->priv.server->free && e1->fields.server->touch && e1->fields.server->solid != SOLID_NOT)
 	{
 		prog->globals.server->self = PRVM_EDICT_TO_PROG(e1);
 		prog->globals.server->other = PRVM_EDICT_TO_PROG(e2);
-		prog->globals.server->trace_allsolid = trace->allsolid;
-		prog->globals.server->trace_startsolid = trace->startsolid;
-		prog->globals.server->trace_fraction = trace->fraction;
-		prog->globals.server->trace_inwater = trace->inwater;
-		prog->globals.server->trace_inopen = trace->inopen;
-		VectorCopy (trace->endpos, prog->globals.server->trace_endpos);
-		VectorCopy (trace->plane.normal, prog->globals.server->trace_plane_normal);
-		prog->globals.server->trace_plane_dist =  trace->plane.dist;
-		if (trace->ent)
-			prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(trace->ent);
-		else
-			prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(prog->edicts);
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
-			val->_float = trace->startsupercontents;
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
-			val->_float = trace->hitsupercontents;
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
-			val->_float = trace->hitq3surfaceflags;
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
-		{
-			if (trace->hittexture)
-				val->string = PRVM_SetTempString(trace->hittexture->name);
-			else
-				val->string = 0;
-		}
 		PRVM_ExecuteProgram (e1->fields.server->touch, "QC function self.touch is missing");
 	}
 
@@ -791,22 +662,17 @@ void SV_Impact (prvm_edict_t *e1, trace_t *trace)
 	{
 		prog->globals.server->self = PRVM_EDICT_TO_PROG(e2);
 		prog->globals.server->other = PRVM_EDICT_TO_PROG(e1);
-		prog->globals.server->trace_allsolid = false;
-		prog->globals.server->trace_startsolid = false;
-		prog->globals.server->trace_fraction = 1;
-		prog->globals.server->trace_inwater = false;
-		prog->globals.server->trace_inopen = true;
-		VectorCopy (e2->fields.server->origin, prog->globals.server->trace_endpos);
-		VectorSet (prog->globals.server->trace_plane_normal, 0, 0, 1);
-		prog->globals.server->trace_plane_dist = 0;
+		VectorCopy(e2->fields.server->origin, prog->globals.server->trace_endpos);
+		VectorNegate(trace->plane.normal, prog->globals.server->trace_plane_normal);
+		prog->globals.server->trace_plane_dist = -trace->plane.dist;
 		prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(e1);
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
+		if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
 			val->_float = 0;
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
+		if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
 			val->_float = 0;
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
+		if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
 			val->_float = 0;
-		if ((val = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
+		if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
 			val->string = 0;
 		PRVM_ExecuteProgram (e2->fields.server->touch, "QC function self.touch is missing");
 	}
@@ -853,7 +719,7 @@ If stepnormal is not NULL, the plane normal of any vertical wall hit will be sto
 */
 // LordHavoc: increased from 5 to 32
 #define MAX_CLIP_PLANES 32
-int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
+int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsupercontentsmask)
 {
 	int blocked, bumpcount;
 	int i, j, impact, numplanes;
@@ -873,7 +739,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
 			break;
 
 		VectorMA(ent->fields.server->origin, time_left, ent->fields.server->velocity, end);
-		trace = SV_Move(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent);
+		trace = SV_Move(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
 #if 0
 		//if (trace.fraction < 0.002)
 		{
@@ -884,7 +750,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
 			start[2] += 3;//0.03125;
 			VectorMA(ent->fields.server->origin, time_left, ent->fields.server->velocity, end);
 			end[2] += 3;//0.03125;
-			testtrace = SV_Move(start, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent);
+			testtrace = SV_Move(start, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
 			if (trace.fraction < testtrace.fraction && !testtrace.startsolid && (testtrace.fraction == 1 || DotProduct(trace.plane.normal, ent->fields.server->velocity) < DotProduct(testtrace.plane.normal, ent->fields.server->velocity)))
 			{
 				Con_Printf("got further (new %f > old %f)\n", testtrace.fraction, trace.fraction);
@@ -899,7 +765,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
 				VectorMA(ent->fields.server->origin, time_left, ent->fields.server->velocity, end);
 				VectorMA(start, 3, planes[i], start);
 				VectorMA(end, 3, planes[i], end);
-				testtrace = SV_Move(start, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent);
+				testtrace = SV_Move(start, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
 				if (trace.fraction < testtrace.fraction)
 				{
 					trace = testtrace;
@@ -945,13 +811,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
 			trace.ent = prog->edicts;
 		}
 
-		if (((int) ent->fields.server->flags & FL_ONGROUND) && ent->fields.server->groundentity == PRVM_EDICT_TO_PROG(trace.ent))
-			impact = false;
-		else
-		{
-			ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
-			impact = true;
-		}
+		impact = !((int) ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent);
 
 		if (trace.plane.normal[2])
 		{
@@ -1074,7 +934,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
 	{
 		// LordHavoc: fix the 'fall to your death in a wedge corner' glitch
 		// flag ONGROUND if there's ground under it
-		trace = SV_Move(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent);
+		trace = SV_Move(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
 	}
 	*/
 
@@ -1095,7 +955,7 @@ void SV_AddGravity (prvm_edict_t *ent)
 	float ent_gravity;
 	prvm_eval_t *val;
 
-	val = PRVM_GETEDICTFIELDVALUE(ent, prog->fieldoffsets.gravity);
+	val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.gravity);
 	if (val!=0 && val->_float)
 		ent_gravity = val->_float;
 	else
@@ -1134,7 +994,7 @@ static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmo
 	else
 		type = MOVE_NORMAL;
 
-	trace = SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, type, ent);
+	trace = SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent));
 	if (trace.bmodelstartsolid && failonbmodelstartsolid)
 		return trace;
 
@@ -1163,6 +1023,8 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 	static prvm_edict_t *checkentities[MAX_EDICTS];
 	model_t *pushermodel;
 	trace_t trace;
+	matrix4x4_t pusherfinalmatrix, pusherfinalimatrix;
+	unsigned short moved_edicts[MAX_EDICTS];
 
 	if (!pusher->fields.server->velocity[0] && !pusher->fields.server->velocity[1] && !pusher->fields.server->velocity[2] && !pusher->fields.server->avelocity[0] && !pusher->fields.server->avelocity[1] && !pusher->fields.server->avelocity[2])
 	{
@@ -1267,6 +1129,12 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 	pusher->fields.server->ltime += movetime;
 	SV_LinkEdict (pusher, false);
 
+	pushermodel = NULL;
+	if (pusher->fields.server->modelindex >= 1 && pusher->fields.server->modelindex < MAX_MODELS)
+		pushermodel = sv.models[(int)pusher->fields.server->modelindex];
+	Matrix4x4_CreateFromQuakeEntity(&pusherfinalmatrix, pusher->fields.server->origin[0], pusher->fields.server->origin[1], pusher->fields.server->origin[2], pusher->fields.server->angles[0], pusher->fields.server->angles[1], pusher->fields.server->angles[2], 1);
+	Matrix4x4_Invert_Simple(&pusherfinalimatrix, &pusherfinalmatrix);
+
 	savesolid = pusher->fields.server->solid;
 
 // see if any solid entities are inside the final position
@@ -1276,6 +1144,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 	for (e = 0;e < numcheckentities;e++)
 	{
 		prvm_edict_t *check = checkentities[e];
+		int checkcontents = SV_GenericHitSuperContentsMask(check);
 		if (check->fields.server->movetype == MOVETYPE_NONE
 		 || check->fields.server->movetype == MOVETYPE_PUSH
 		 || check->fields.server->movetype == MOVETYPE_FOLLOW
@@ -1284,16 +1153,12 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 			continue;
 
 		// if the entity is standing on the pusher, it will definitely be moved
-		if (((int)check->fields.server->flags & FL_ONGROUND) && PRVM_PROG_TO_EDICT(check->fields.server->groundentity) == pusher)
+		// if the entity is not standing on the pusher, but is in the pusher's
+		// final position, move it
+		if (!((int)check->fields.server->flags & FL_ONGROUND) || PRVM_PROG_TO_EDICT(check->fields.server->groundentity) != pusher)
 		{
-			// remove the onground flag for non-players
-			if (check->fields.server->movetype != MOVETYPE_WALK)
-				check->fields.server->flags = (int)check->fields.server->flags & ~FL_ONGROUND;
-		}
-		else
-		{
-			// if the entity is not inside the pusher's final position, leave it alone
-			if (!SV_Move_ClipToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY).startsolid)
+			Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
+			if (!trace.startsolid)
 				continue;
 		}
 
@@ -1313,7 +1178,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 
 		VectorCopy (check->fields.server->origin, check->priv.server->moved_from);
 		VectorCopy (check->fields.server->angles, check->priv.server->moved_fromangles);
-		sv.moved_edicts[num_moved++] = check;
+		moved_edicts[num_moved++] = PRVM_NUM_FOR_EDICT(check);
 
 		// try moving the contacted entity
 		pusher->fields.server->solid = SOLID_NOT;
@@ -1323,8 +1188,15 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 		pusher->fields.server->solid = savesolid; // was SOLID_BSP
 		//Con_Printf("%s:%d frac %f startsolid %d bmodelstartsolid %d allsolid %d\n", __FILE__, __LINE__, trace.fraction, trace.startsolid, trace.bmodelstartsolid, trace.allsolid);
 
+		// this trace.fraction < 1 check causes items to fall off of pushers
+		// if they pass under or through a wall
+		// the groundentity check causes items to fall off of ledges
+		if (check->fields.server->movetype != MOVETYPE_WALK && (trace.fraction < 1 || PRVM_PROG_TO_EDICT(check->fields.server->groundentity) != pusher))
+			check->fields.server->flags = (int)check->fields.server->flags & ~FL_ONGROUND;
+
 		// if it is still inside the pusher, block
-		if (SV_Move_ClipToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY).startsolid)
+		Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
+		if (trace.startsolid)
 		{
 			// try moving the contacted entity a tiny bit further to account for precision errors
 			vec3_t move2;
@@ -1334,7 +1206,8 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 			VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
 			SV_PushEntity (check, move2, true);
 			pusher->fields.server->solid = savesolid;
-			if (SV_Move_ClipToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY).startsolid)
+			Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
+			if (trace.startsolid)
 			{
 				// try moving the contacted entity a tiny bit less to account for precision errors
 				pusher->fields.server->solid = SOLID_NOT;
@@ -1343,7 +1216,8 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 				VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
 				SV_PushEntity (check, move2, true);
 				pusher->fields.server->solid = savesolid;
-				if (SV_Move_ClipToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, 0, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY).startsolid)
+				Collision_ClipToGenericEntity(&trace, pushermodel, pusher->fields.server->frame, pusher->fields.server->mins, pusher->fields.server->maxs, SUPERCONTENTS_BODY, &pusherfinalmatrix, &pusherfinalimatrix, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, checkcontents);
+				if (trace.startsolid)
 				{
 					// still inside pusher, so it's really blocked
 
@@ -1366,7 +1240,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 					// move back any entities we already moved
 					for (i = 0;i < num_moved;i++)
 					{
-						prvm_edict_t *ed = sv.moved_edicts[i];
+						prvm_edict_t *ed = PRVM_EDICT_NUM(moved_edicts[i]);
 						VectorCopy (ed->priv.server->moved_from, ed->fields.server->origin);
 						VectorCopy (ed->priv.server->moved_fromangles, ed->fields.server->angles);
 						SV_LinkEdict (ed, false);
@@ -1434,6 +1308,36 @@ CLIENT MOVEMENT
 ===============================================================================
 */
 
+static float unstickoffsets[] =
+{
+	-1,  0,  0,
+	 1,  0,  0,
+	 0, -1,  0,
+	 0,  1,  0,
+	-1, -1,  0,
+	 1, -1,  0,
+	-1,  1,  0,
+	 1,  1,  0,
+	 0,  0,  -1,
+	 0,  0,  1,
+	 0,  0,  2,
+	 0,  0,  3,
+	 0,  0,  4,
+	 0,  0,  5,
+	 0,  0,  6,
+	 0,  0,  7,
+	 0,  0,  8,
+	 0,  0,  9,
+	 0,  0,  10,
+	 0,  0,  11,
+	 0,  0,  12,
+	 0,  0,  13,
+	 0,  0,  14,
+	 0,  0,  15,
+	 0,  0,  16,
+	 0,  0,  17,
+};
+
 /*
 =============
 SV_CheckStuck
@@ -1444,71 +1348,54 @@ clipping hull.
 */
 void SV_CheckStuck (prvm_edict_t *ent)
 {
-	int i, j, z;
-	vec3_t org;
+	int i;
+	vec3_t offset;
 
-	if (!SV_TestEntityPosition(ent))
+	if (!SV_TestEntityPosition(ent, vec3_origin))
 	{
 		VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
 		return;
 	}
 
-	VectorCopy (ent->fields.server->origin, org);
-
-	for (z=-1 ; z< 18 ; z++)
-		for (i=-1 ; i <= 1 ; i++)
-			for (j=-1 ; j <= 1 ; j++)
-			{
-				ent->fields.server->origin[0] = org[0] + i;
-				ent->fields.server->origin[1] = org[1] + j;
-				ent->fields.server->origin[2] = org[2] + z;
-				if (!SV_TestEntityPosition(ent))
-				{
-					Con_DPrintf("Unstuck player entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), (float)i, (float)j, (float)z);
-					SV_LinkEdict (ent, true);
-					return;
-				}
-			}
+	for (i = 0;i < (int)(sizeof(unstickoffsets) / sizeof(unstickoffsets[0]));i += 3)
+	{
+		if (!SV_TestEntityPosition(ent, unstickoffsets + i))
+		{
+			Con_DPrintf("Unstuck player entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), unstickoffsets[i+0], unstickoffsets[i+1], unstickoffsets[i+2]);
+			SV_LinkEdict (ent, true);
+			return;
+		}
+	}
 
-	VectorCopy (ent->fields.server->oldorigin, ent->fields.server->origin);
-	if (!SV_TestEntityPosition(ent))
+	VectorSubtract(ent->fields.server->oldorigin, ent->fields.server->origin, offset);
+	if (!SV_TestEntityPosition(ent, offset))
 	{
 		Con_DPrintf("Unstuck player entity %i (classname \"%s\") by restoring oldorigin.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
 		SV_LinkEdict (ent, true);
 		return;
 	}
 
-	VectorCopy (org, ent->fields.server->origin);
 	Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
 }
 
 static void SV_UnstickEntity (prvm_edict_t *ent)
 {
-	int i, j, z;
-	vec3_t org;
+	int i;
 
 	// if not stuck in a bmodel, just return
-	if (!SV_TestEntityPosition(ent))
+	if (!SV_TestEntityPosition(ent, vec3_origin))
 		return;
 
-	VectorCopy (ent->fields.server->origin, org);
-
-	for (z=-1 ; z< 18 ; z += 6)
-		for (i=-1 ; i <= 1 ; i++)
-			for (j=-1 ; j <= 1 ; j++)
-			{
-				ent->fields.server->origin[0] = org[0] + i;
-				ent->fields.server->origin[1] = org[1] + j;
-				ent->fields.server->origin[2] = org[2] + z;
-				if (!SV_TestEntityPosition(ent))
-				{
-					Con_DPrintf("Unstuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), (float)i, (float)j, (float)z);
-					SV_LinkEdict (ent, true);
-					return;
-				}
-			}
+	for (i = 0;i < (int)(sizeof(unstickoffsets) / sizeof(unstickoffsets[0]));i += 3)
+	{
+		if (!SV_TestEntityPosition(ent, unstickoffsets + i))
+		{
+			Con_DPrintf("Unstuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname), unstickoffsets[i+0], unstickoffsets[i+1], unstickoffsets[i+2]);
+			SV_LinkEdict (ent, true);
+			return;
+		}
+	}
 
-	VectorCopy (org, ent->fields.server->origin);
 	if (developer.integer >= 100)
 		Con_Printf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
 }
@@ -1629,7 +1516,7 @@ int SV_TryUnstick (prvm_edict_t *ent, vec3_t oldvel)
 		ent->fields.server->velocity[0] = oldvel[0];
 		ent->fields.server->velocity[1] = oldvel[1];
 		ent->fields.server->velocity[2] = 0;
-		clip = SV_FlyMove (ent, 0.1, NULL);
+		clip = SV_FlyMove (ent, 0.1, NULL, SV_GenericHitSuperContentsMask(ent));
 
 		if (fabs(oldorg[1] - ent->fields.server->origin[1]) > 4
 		 || fabs(oldorg[0] - ent->fields.server->origin[0]) > 4)
@@ -1658,7 +1545,7 @@ Only used by players
 */
 void SV_WalkMove (prvm_edict_t *ent)
 {
-	int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity;
+	int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity, hitsupercontentsmask;
 	vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity;
 	trace_t downtrace;
 
@@ -1667,16 +1554,21 @@ void SV_WalkMove (prvm_edict_t *ent)
 	if (sv.frametime <= 0)
 		return;
 
+	hitsupercontentsmask = SV_GenericHitSuperContentsMask(ent);
+
 	SV_CheckVelocity(ent);
 
 	// do a regular slide move unless it looks like you ran into a step
 	oldonground = (int)ent->fields.server->flags & FL_ONGROUND;
-	ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
 
 	VectorCopy (ent->fields.server->origin, start_origin);
 	VectorCopy (ent->fields.server->velocity, start_velocity);
 
-	clip = SV_FlyMove (ent, sv.frametime, NULL);
+	clip = SV_FlyMove (ent, sv.frametime, NULL, hitsupercontentsmask);
+
+	// if the move did not hit the ground at any point, we're not on ground
+	if (!(clip & 1))
+		ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
 
 	SV_CheckVelocity(ent);
 
@@ -1724,7 +1616,7 @@ void SV_WalkMove (prvm_edict_t *ent)
 
 		// move forward
 		ent->fields.server->velocity[2] = 0;
-		clip = SV_FlyMove (ent, sv.frametime, stepnormal);
+		clip = SV_FlyMove (ent, sv.frametime, stepnormal, hitsupercontentsmask);
 		ent->fields.server->velocity[2] += start_velocity[2];
 
 		SV_CheckVelocity(ent);
@@ -1753,8 +1645,8 @@ void SV_WalkMove (prvm_edict_t *ent)
 		if (clip & 2 && sv_wallfriction.integer)
 			SV_WallFriction (ent, stepnormal);
 	}
-	// skip out if stepdown is enabled, moving downward, not in water, and the move started onground and ended offground
-	else if (!(sv_gameplayfix_stepdown.integer && ent->fields.server->waterlevel < 2 && start_velocity[2] < (1.0 / 32.0) && oldonground && !((int)ent->fields.server->flags & FL_ONGROUND)))
+	// don't do the down move if stepdown is disabled, moving upward, not in water, or the move started offground or ended onground
+	else if (!sv_gameplayfix_stepdown.integer || ent->fields.server->waterlevel >= 3 || start_velocity[2] >= (1.0 / 32.0) || !oldonground || ((int)ent->fields.server->flags & FL_ONGROUND))
 		return;
 
 	// move down
@@ -1766,7 +1658,7 @@ void SV_WalkMove (prvm_edict_t *ent)
 	if (downtrace.fraction < 1 && downtrace.plane.normal[2] > 0.7)
 	{
 		// this has been disabled so that you can't jump when you are stepping
-		// up while already jumping (also known as the Quake2 stair jump bug)
+		// up while already jumping (also known as the Quake2 double jump bug)
 #if 0
 		// LordHavoc: disabled this check so you can walk on monsters/players
 		//if (ent->fields.server->solid == SOLID_BSP)
@@ -2040,7 +1932,7 @@ void SV_Physics_Step (prvm_edict_t *ent)
 				ent->fields.server->flags -= FL_ONGROUND;
 				SV_AddGravity(ent);
 				SV_CheckVelocity(ent);
-				SV_FlyMove(ent, sv.frametime, NULL);
+				SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
 				SV_LinkEdict(ent, true);
 			}
 		}
@@ -2051,7 +1943,7 @@ void SV_Physics_Step (prvm_edict_t *ent)
 
 			SV_AddGravity(ent);
 			SV_CheckVelocity(ent);
-			SV_FlyMove(ent, sv.frametime, NULL);
+			SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
 			SV_LinkEdict(ent, true);
 
 			// just hit ground
@@ -2125,20 +2017,75 @@ static void SV_Physics_Entity (prvm_edict_t *ent)
 	}
 }
 
-void SV_Physics_ClientEntity (prvm_edict_t *ent)
+void SV_Physics_ClientMove(void)
 {
-	SV_ApplyClientMove();
+	prvm_edict_t *ent;
+	ent = host_client->edict;
+
+	// call player physics, this needs the proper frametime
+	prog->globals.server->frametime = sv.frametime;
+	SV_ClientThink();
+
+	// call standard client pre-think, with frametime = 0
+	prog->globals.server->time = sv.time;
+	prog->globals.server->frametime = 0;
+	prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
+	PRVM_ExecuteProgram (prog->globals.server->PlayerPreThink, "QC function PlayerPreThink is missing");
+	prog->globals.server->frametime = sv.frametime;
+
 	// make sure the velocity is sane (not a NaN)
 	SV_CheckVelocity(ent);
-	// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
-	if (prog->funcoffsets.SV_PlayerPhysics && sv_playerphysicsqc.integer)
+	// LordHavoc: a hack to ensure that the (rather silly) id1 quakec
+	// player_run/player_stand1 does not horribly malfunction if the
+	// velocity becomes a number that is both == 0 and != 0
+	// (sounds to me like NaN but to be absolutely safe...)
+	if (DotProduct(ent->fields.server->velocity, ent->fields.server->velocity) < 0.0001)
+		VectorClear(ent->fields.server->velocity);
+
+	// perform MOVETYPE_WALK behavior
+	if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
+		SV_AddGravity (ent);
+	SV_CheckStuck (ent);
+	SV_WalkMove (ent);
+
+	SV_CheckVelocity (ent);
+
+	SV_LinkEdict (ent, true);
+
+	SV_CheckVelocity (ent);
+
+	// call standard player post-think, with frametime = 0
+	prog->globals.server->time = sv.time;
+	prog->globals.server->frametime = 0;
+	prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
+	PRVM_ExecuteProgram (prog->globals.server->PlayerPostThink, "QC function PlayerPostThink is missing");
+	prog->globals.server->frametime = sv.frametime;
+
+	if(ent->fields.server->fixangle)
 	{
-		prog->globals.server->time = sv.time;
-		prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
-		PRVM_ExecuteProgram (prog->funcoffsets.SV_PlayerPhysics, "QC function SV_PlayerPhysics is missing");
+		// angle fixing was requested by physics code...
+		// so store the current angles for later use
+		memcpy(host_client->fixangle_angles, ent->fields.server->angles, sizeof(host_client->fixangle_angles));
+		host_client->fixangle_angles_set = TRUE;
+
+		// and clear fixangle for the next frame
+		ent->fields.server->fixangle = 0;
 	}
-	else
-		SV_ClientThink ();
+}
+
+void SV_Physics_ClientEntity(prvm_edict_t *ent)
+{
+	// don't do physics on disconnected clients, FrikBot relies on this
+	if (!host_client->spawned)
+	{
+		memset(&host_client->cmd, 0, sizeof(host_client->cmd));
+		return;
+	}
+
+	// don't run physics here if running asynchronously
+	if (host_client->clmovement_skipphysicsframes <= 0)
+		SV_ClientThink();
+
 	// make sure the velocity is sane (not a NaN)
 	SV_CheckVelocity(ent);
 	// LordHavoc: a hack to ensure that the (rather silly) id1 quakec
@@ -2147,6 +2094,7 @@ void SV_Physics_ClientEntity (prvm_edict_t *ent)
 	// (sounds to me like NaN but to be absolutely safe...)
 	if (DotProduct(ent->fields.server->velocity, ent->fields.server->velocity) < 0.0001)
 		VectorClear(ent->fields.server->velocity);
+
 	// call standard client pre-think
 	prog->globals.server->time = sv.time;
 	prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
@@ -2168,18 +2116,18 @@ void SV_Physics_ClientEntity (prvm_edict_t *ent)
 		SV_Physics_Follow (ent);
 		break;
 	case MOVETYPE_NOCLIP:
-		if (SV_RunThink(ent))
-		{
-			SV_CheckWater(ent);
-			VectorMA(ent->fields.server->origin, sv.frametime, ent->fields.server->velocity, ent->fields.server->origin);
-			VectorMA(ent->fields.server->angles, sv.frametime, ent->fields.server->avelocity, ent->fields.server->angles);
-		}
+		SV_RunThink(ent);
+		SV_CheckWater(ent);
+		VectorMA(ent->fields.server->origin, sv.frametime, ent->fields.server->velocity, ent->fields.server->origin);
+		VectorMA(ent->fields.server->angles, sv.frametime, ent->fields.server->avelocity, ent->fields.server->angles);
 		break;
 	case MOVETYPE_STEP:
 		SV_Physics_Step (ent);
 		break;
 	case MOVETYPE_WALK:
-		if (SV_RunThink (ent))
+		SV_RunThink (ent);
+		// don't run physics here if running asynchronously
+		if (host_client->clmovement_skipphysicsframes <= 0)
 		{
 			if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
 				SV_AddGravity (ent);
@@ -2192,31 +2140,45 @@ void SV_Physics_ClientEntity (prvm_edict_t *ent)
 	case MOVETYPE_BOUNCEMISSILE:
 	case MOVETYPE_FLYMISSILE:
 		// regular thinking
-		if (SV_RunThink (ent))
-			SV_Physics_Toss (ent);
+		SV_RunThink (ent);
+		SV_Physics_Toss (ent);
 		break;
 	case MOVETYPE_FLY:
-		if (SV_RunThink (ent))
-		{
-			SV_CheckWater (ent);
-			SV_WalkMove (ent);
-		}
+		SV_RunThink (ent);
+		SV_CheckWater (ent);
+		SV_WalkMove (ent);
 		break;
 	default:
 		Con_Printf ("SV_Physics_ClientEntity: bad movetype %i\n", (int)ent->fields.server->movetype);
 		break;
 	}
 
+	// decrement the countdown variable used to decide when to go back to
+	// synchronous physics
+	if (host_client->clmovement_skipphysicsframes > 0)
+		host_client->clmovement_skipphysicsframes--;
+
 	SV_CheckVelocity (ent);
 
-	// call standard player post-think
 	SV_LinkEdict (ent, true);
 
 	SV_CheckVelocity (ent);
 
+	// call standard player post-think
 	prog->globals.server->time = sv.time;
 	prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
 	PRVM_ExecuteProgram (prog->globals.server->PlayerPostThink, "QC function PlayerPostThink is missing");
+
+	if(ent->fields.server->fixangle)
+	{
+		// angle fixing was requested by physics code...
+		// so store the current angles for later use
+		memcpy(host_client->fixangle_angles, ent->fields.server->angles, sizeof(host_client->fixangle_angles));
+		host_client->fixangle_angles_set = TRUE;
+
+		// and clear fixangle for the next frame
+		ent->fields.server->fixangle = 0;
+	}
 }
 
 /*
@@ -2249,19 +2211,8 @@ void SV_Physics (void)
 
 	// run physics on the client entities
 	for (i = 1, ent = PRVM_EDICT_NUM(i), host_client = svs.clients;i <= svs.maxclients;i++, ent = PRVM_NEXT_EDICT(ent), host_client++)
-	{
 		if (!ent->priv.server->free)
-		{
-			// don't do physics on disconnected clients, FrikBot relies on this
-			if (!host_client->spawned)
-				memset(&host_client->cmd, 0, sizeof(host_client->cmd));
-			// don't run physics here if running asynchronously
-			else if (host_client->clmovement_skipphysicsframes > 0)
-				host_client->clmovement_skipphysicsframes--;
-			else
 				SV_Physics_ClientEntity(ent);
-		}
-	}
 
 	// run physics on all the non-client entities
 	if (!sv_freezenonclients.integer)
@@ -2287,51 +2238,3 @@ void SV_Physics (void)
 	if (!sv_freezenonclients.integer)
 		sv.time += sv.frametime;
 }
-
-
-trace_t SV_Trace_Toss (prvm_edict_t *tossent, prvm_edict_t *ignore)
-{
-	int i;
-	float gravity;
-	vec3_t move, end;
-	vec3_t original_origin;
-	vec3_t original_velocity;
-	vec3_t original_angles;
-	vec3_t original_avelocity;
-	prvm_eval_t *val;
-	trace_t trace;
-
-	VectorCopy(tossent->fields.server->origin   , original_origin   );
-	VectorCopy(tossent->fields.server->velocity , original_velocity );
-	VectorCopy(tossent->fields.server->angles   , original_angles   );
-	VectorCopy(tossent->fields.server->avelocity, original_avelocity);
-
-	val = PRVM_GETEDICTFIELDVALUE(tossent, prog->fieldoffsets.gravity);
-	if (val != NULL && val->_float != 0)
-		gravity = val->_float;
-	else
-		gravity = 1.0;
-	gravity *= sv_gravity.value * 0.05;
-
-	for (i = 0;i < 200;i++) // LordHavoc: sanity check; never trace more than 10 seconds
-	{
-		SV_CheckVelocity (tossent);
-		tossent->fields.server->velocity[2] -= gravity;
-		VectorMA (tossent->fields.server->angles, 0.05, tossent->fields.server->avelocity, tossent->fields.server->angles);
-		VectorScale (tossent->fields.server->velocity, 0.05, move);
-		VectorAdd (tossent->fields.server->origin, move, end);
-		trace = SV_Move (tossent->fields.server->origin, tossent->fields.server->mins, tossent->fields.server->maxs, end, MOVE_NORMAL, tossent);
-		VectorCopy (trace.endpos, tossent->fields.server->origin);
-
-		if (trace.fraction < 1)
-			break;
-	}
-
-	VectorCopy(original_origin   , tossent->fields.server->origin   );
-	VectorCopy(original_velocity , tossent->fields.server->velocity );
-	VectorCopy(original_angles   , tossent->fields.server->angles   );
-	VectorCopy(original_avelocity, tossent->fields.server->avelocity);
-
-	return trace;
-}
-