X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=c8f73b83c0af92584afc1b67a64f7a68bfcbda40;hb=b19c27fd82074c42e1aba5b9d293f70f90995d02;hp=a08f5d8bd39c60de43bebdf9e0ea5ed88b19058e;hpb=5d7cc804685137088d18ca459a73328a0a4890fe;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index a08f5d8b..c8f73b83 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -43,6 +43,24 @@ solid_edge items only clip against bsp models.
 
 void SV_Physics_Toss (prvm_edict_t *ent);
 
+int SV_GetPitchSign(prvm_edict_t *ent)
+{
+	dp_model_t *model;
+	if (
+			(model = SV_GetModelFromEdict(ent))
+			?
+			model->type == mod_alias
+			:
+			(
+			 (((unsigned char)PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.pflags)->_float) & PFLAGS_FULLDYNAMIC)
+			 ||
+			 ((gamemode == GAME_TENEBRAE) && ((unsigned int)ent->fields.server->effects & (16 | 32)))
+			)
+	   )
+		return -1;
+	return 1;
+}
+
 /*
 ===============================================================================
 
@@ -77,20 +95,337 @@ int SV_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 		return SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE;
 }
 
+/*
+==================
+SV_TracePoint
+==================
+*/
+trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
+{
+	int i, bodysupercontents;
+	int passedictprog;
+	float pitchsign = 1;
+	prvm_edict_t *traceowner, *touch;
+	trace_t trace;
+	// bounding box of entire move area
+	vec3_t clipboxmins, clipboxmaxs;
+	// size when clipping against monsters
+	vec3_t clipmins2, clipmaxs2;
+	// start and end origin of move
+	vec3_t clipstart;
+	// trace results
+	trace_t cliptrace;
+	// matrices to transform into/out of other entity's space
+	matrix4x4_t matrix, imatrix;
+	// model of other entity
+	dp_model_t *model;
+	// list of entities to test for collisions
+	int numtouchedicts;
+	prvm_edict_t *touchedicts[MAX_EDICTS];
+
+	//return SV_TraceBox(start, vec3_origin, vec3_origin, end, type, passedict, hitsupercontentsmask);
+
+	VectorCopy(start, clipstart);
+	VectorClear(clipmins2);
+	VectorClear(clipmaxs2);
+#if COLLISIONPARANOID >= 3
+	Con_Printf("move(%f %f %f)", clipstart[0], clipstart[1], clipstart[2]);
+#endif
+
+	// clip to world
+	Collision_ClipPointToWorld(&cliptrace, sv.worldmodel, clipstart, hitsupercontentsmask);
+	cliptrace.bmodelstartsolid = cliptrace.startsolid;
+	if (cliptrace.startsolid || cliptrace.fraction < 1)
+		cliptrace.ent = prog->edicts;
+	if (type == MOVE_WORLDONLY)
+		goto finished;
+
+	if (type == MOVE_MISSILE)
+	{
+		// LordHavoc: modified this, was = -15, now -= 15
+		for (i = 0;i < 3;i++)
+		{
+			clipmins2[i] -= 15;
+			clipmaxs2[i] += 15;
+		}
+	}
+
+	// create the bounding box of the entire move
+	for (i = 0;i < 3;i++)
+	{
+		clipboxmins[i] = min(clipstart[i], cliptrace.endpos[i]) + clipmins2[i] - 1;
+		clipboxmaxs[i] = max(clipstart[i], cliptrace.endpos[i]) + clipmaxs2[i] + 1;
+	}
+
+	// debug override to test against everything
+	if (sv_debugmove.integer)
+	{
+		clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+		clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+	}
+
+	// if the passedict is world, make it NULL (to avoid two checks each time)
+	if (passedict == prog->edicts)
+		passedict = NULL;
+	// precalculate prog value for passedict for comparisons
+	passedictprog = PRVM_EDICT_TO_PROG(passedict);
+	// precalculate passedict's owner edict pointer for comparisons
+	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)
+	{
+		// this never happens
+		Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+		numtouchedicts = MAX_EDICTS;
+	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+
+		if (touch->fields.server->solid < SOLID_BBOX)
+			continue;
+		if (type == MOVE_NOMONSTERS && touch->fields.server->solid != SOLID_BSP)
+			continue;
+
+		if (passedict)
+		{
+			// don't clip against self
+			if (passedict == touch)
+				continue;
+			// don't clip owned entities against owner
+			if (traceowner == touch)
+				continue;
+			// don't clip owner against owned entities
+			if (passedictprog == touch->fields.server->owner)
+				continue;
+			// don't clip points against points (they can't collide)
+			if (VectorCompare(touch->fields.server->mins, touch->fields.server->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.server->flags & FL_MONSTER)))
+				continue;
+		}
+
+		bodysupercontents = touch->fields.server->solid == SOLID_CORPSE ? SUPERCONTENTS_CORPSE : SUPERCONTENTS_BODY;
+
+		// might interact, so do an exact clip
+		model = NULL;
+		if ((int) touch->fields.server->solid == SOLID_BSP || type == MOVE_HITMODEL)
+		{
+			model = SV_GetModelFromEdict(touch);
+			pitchsign = SV_GetPitchSign(touch);
+		}
+		if (model)
+			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2], pitchsign * 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);
+		VM_GenerateFrameGroupBlend(touch->priv.server->framegroupblend, touch);
+		VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model);
+		VM_UpdateEdictSkeleton(touch, model, touch->priv.server->frameblend);
+		if (type == MOVE_MISSILE && (int)touch->fields.server->flags & FL_MONSTER)
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipstart, hitsupercontentsmask);
+		else
+			Collision_ClipPointToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, hitsupercontentsmask);
+
+		Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.server->solid == SOLID_BSP);
+	}
+
+finished:
+	return cliptrace;
+}
+
+/*
+==================
+SV_TraceLine
+==================
+*/
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+trace_t SV_TraceLine(const vec3_t start, const vec3_t pEnd, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
+#else
+trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
+#endif
+{
+	int i, bodysupercontents;
+	int passedictprog;
+	float pitchsign = 1;
+	prvm_edict_t *traceowner, *touch;
+	trace_t trace;
+	// bounding box of entire move area
+	vec3_t clipboxmins, clipboxmaxs;
+	// size when clipping against monsters
+	vec3_t clipmins2, clipmaxs2;
+	// start and end origin of move
+	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
+	dp_model_t *model;
+	// list of entities to test for collisions
+	int numtouchedicts;
+	prvm_edict_t *touchedicts[MAX_EDICTS];
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	vec3_t end;
+	vec_t len = 0;
+
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+	{
+		// TRICK: make the trace 1 qu longer!
+		VectorSubtract(pEnd, start, end);
+		len = VectorNormalizeLength(end);
+		VectorMA(pEnd, collision_endposnudge.value, end, end);
+	}
+	else
+		VectorCopy(pEnd, end);
+#endif
+
+	//return SV_TraceBox(start, vec3_origin, vec3_origin, end, type, passedict, hitsupercontentsmask);
+
+	if (VectorCompare(start, end))
+		return SV_TracePoint(start, type, passedict, hitsupercontentsmask);
+
+	VectorCopy(start, clipstart);
+	VectorCopy(end, clipend);
+	VectorClear(clipmins2);
+	VectorClear(clipmaxs2);
+#if COLLISIONPARANOID >= 3
+	Con_Printf("move(%f %f %f,%f %f %f)", clipstart[0], clipstart[1], clipstart[2], clipend[0], clipend[1], clipend[2]);
+#endif
+
+	// clip to world
+	Collision_ClipLineToWorld(&cliptrace, sv.worldmodel, clipstart, clipend, hitsupercontentsmask);
+	cliptrace.bmodelstartsolid = cliptrace.startsolid;
+	if (cliptrace.startsolid || cliptrace.fraction < 1)
+		cliptrace.ent = prog->edicts;
+	if (type == MOVE_WORLDONLY)
+		goto finished;
+
+	if (type == MOVE_MISSILE)
+	{
+		// LordHavoc: modified this, was = -15, now -= 15
+		for (i = 0;i < 3;i++)
+		{
+			clipmins2[i] -= 15;
+			clipmaxs2[i] += 15;
+		}
+	}
+
+	// create the bounding box of the entire move
+	for (i = 0;i < 3;i++)
+	{
+		clipboxmins[i] = min(clipstart[i], cliptrace.endpos[i]) + clipmins2[i] - 1;
+		clipboxmaxs[i] = max(clipstart[i], cliptrace.endpos[i]) + clipmaxs2[i] + 1;
+	}
+
+	// debug override to test against everything
+	if (sv_debugmove.integer)
+	{
+		clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+		clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+	}
+
+	// if the passedict is world, make it NULL (to avoid two checks each time)
+	if (passedict == prog->edicts)
+		passedict = NULL;
+	// precalculate prog value for passedict for comparisons
+	passedictprog = PRVM_EDICT_TO_PROG(passedict);
+	// precalculate passedict's owner edict pointer for comparisons
+	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)
+	{
+		// this never happens
+		Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+		numtouchedicts = MAX_EDICTS;
+	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+
+		if (touch->fields.server->solid < SOLID_BBOX)
+			continue;
+		if (type == MOVE_NOMONSTERS && touch->fields.server->solid != SOLID_BSP)
+			continue;
+
+		if (passedict)
+		{
+			// don't clip against self
+			if (passedict == touch)
+				continue;
+			// don't clip owned entities against owner
+			if (traceowner == touch)
+				continue;
+			// don't clip owner against owned entities
+			if (passedictprog == touch->fields.server->owner)
+				continue;
+			// don't clip points against points (they can't collide)
+			if (VectorCompare(touch->fields.server->mins, touch->fields.server->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.server->flags & FL_MONSTER)))
+				continue;
+		}
+
+		bodysupercontents = touch->fields.server->solid == SOLID_CORPSE ? SUPERCONTENTS_CORPSE : SUPERCONTENTS_BODY;
+
+		// might interact, so do an exact clip
+		model = NULL;
+		if ((int) touch->fields.server->solid == SOLID_BSP || type == MOVE_HITMODEL)
+		{
+			model = SV_GetModelFromEdict(touch);
+			pitchsign = SV_GetPitchSign(touch);
+		}
+		if (model)
+			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2], pitchsign * 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);
+		VM_GenerateFrameGroupBlend(touch->priv.server->framegroupblend, touch);
+		VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model);
+		VM_UpdateEdictSkeleton(touch, model, touch->priv.server->frameblend);
+		if (type == MOVE_MISSILE && (int)touch->fields.server->flags & FL_MONSTER)
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
+		else
+			Collision_ClipLineToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.server->mins, touch->fields.server->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipend, hitsupercontentsmask);
+
+		Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.server->solid == SOLID_BSP);
+	}
+
+finished:
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+		Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd);
+#endif
+	return cliptrace;
+}
+
 /*
 ==================
 SV_Move
 ==================
 */
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
 #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, int hitsupercontentsmask)
+trace_t SV_TraceBox_(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t pEnd, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
+#else
+trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t pEnd, int type, prvm_edict_t *passedict, int hitsupercontentsmask)
+#endif
 #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, int hitsupercontentsmask)
+#if COLLISIONPARANOID >= 1
+trace_t SV_TraceBox_(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_TraceBox(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
 #endif
 {
 	vec3_t hullmins, hullmaxs;
 	int i, bodysupercontents;
 	int passedictprog;
+	float pitchsign = 1;
 	qboolean pointtrace;
 	prvm_edict_t *traceowner, *touch;
 	trace_t trace;
@@ -107,10 +442,37 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	// matrices to transform into/out of other entity's space
 	matrix4x4_t matrix, imatrix;
 	// model of other entity
-	model_t *model;
+	dp_model_t *model;
 	// list of entities to test for collisions
 	int numtouchedicts;
 	prvm_edict_t *touchedicts[MAX_EDICTS];
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	vec3_t end;
+	vec_t len = 0;
+
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+	{
+		// TRICK: make the trace 1 qu longer!
+		VectorSubtract(pEnd, start, end);
+		len = VectorNormalizeLength(end);
+		VectorMA(pEnd, collision_endposnudge.value, end, end);
+	}
+	else
+		VectorCopy(pEnd, end);
+#endif
+
+	if (VectorCompare(mins, maxs))
+	{
+		vec3_t shiftstart, shiftend;
+		VectorAdd(start, mins, shiftstart);
+		VectorAdd(end, mins, shiftend);
+		if (VectorCompare(start, end))
+			trace = SV_TracePoint(shiftstart, type, passedict, hitsupercontentsmask);
+		else
+			trace = SV_TraceLine(shiftstart, shiftend, type, passedict, hitsupercontentsmask);
+		VectorSubtract(trace.endpos, mins, trace.endpos);
+		return trace;
+	}
 
 	VectorCopy(start, clipstart);
 	VectorCopy(end, clipend);
@@ -128,7 +490,7 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	if (cliptrace.startsolid || cliptrace.fraction < 1)
 		cliptrace.ent = prog->edicts;
 	if (type == MOVE_WORLDONLY)
-		return cliptrace;
+		goto finished;
 
 	if (type == MOVE_MISSILE)
 	{
@@ -214,38 +576,44 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 		model = NULL;
 		if ((int) touch->fields.server->solid == SOLID_BSP || type == MOVE_HITMODEL)
 		{
-			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];
+			model = SV_GetModelFromEdict(touch);
+			pitchsign = SV_GetPitchSign(touch);
 		}
 		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);
+			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2], pitchsign * 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);
+		VM_GenerateFrameGroupBlend(touch->priv.server->framegroupblend, touch);
+		VM_FrameBlendFromFrameGroupBlend(touch->priv.server->frameblend, touch->priv.server->framegroupblend, model);
+		VM_UpdateEdictSkeleton(touch, model, touch->priv.server->frameblend);
+		if (type == MOVE_MISSILE && (int)touch->fields.server->flags & FL_MONSTER)
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, 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_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, 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);
 	}
 
+finished:
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+		Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd);
+#endif
 	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, int hitsupercontentsmask)
+trace_t SV_TraceBox(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, hitsupercontentsmask);
+	trace = SV_TraceBox_(start, mins, maxs, end, type, passedict, hitsupercontentsmask);
 	if (passedict)
 	{
 		VectorCopy(trace.endpos, temp);
-		endstuck = SV_Move_(temp, mins, maxs, temp, type, passedict, hitsupercontentsmask).startsolid;
+		endstuck = SV_TraceBox_(temp, mins, maxs, temp, type, passedict, hitsupercontentsmask).startsolid;
 #if COLLISIONPARANOID < 3
 		if (trace.startsolid || endstuck)
 #endif
@@ -255,6 +623,59 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 }
 #endif
 
+int SV_PointSuperContents(const vec3_t point)
+{
+	int supercontents = 0;
+	int i;
+	prvm_edict_t *touch;
+	vec3_t transformed;
+	// matrices to transform into/out of other entity's space
+	matrix4x4_t matrix, imatrix;
+	// model of other entity
+	dp_model_t *model;
+	int frame;
+	// list of entities to test for collisions
+	int numtouchedicts;
+	prvm_edict_t *touchedicts[MAX_EDICTS];
+
+	// get world supercontents at this point
+	if (sv.worldmodel && sv.worldmodel->PointSuperContents)
+		supercontents = sv.worldmodel->PointSuperContents(sv.worldmodel, 0, point);
+
+	// if sv_gameplayfix_swiminbmodels is off we're done
+	if (!sv_gameplayfix_swiminbmodels.integer)
+		return supercontents;
+
+	// get list of entities at this point
+	numtouchedicts = World_EntitiesInBox(&sv.world, point, point, MAX_EDICTS, touchedicts);
+	if (numtouchedicts > MAX_EDICTS)
+	{
+		// this never happens
+		Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+		numtouchedicts = MAX_EDICTS;
+	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+
+		// we only care about SOLID_BSP for pointcontents
+		if (touch->fields.server->solid != SOLID_BSP)
+			continue;
+
+		// might interact, so do an exact clip
+		model = SV_GetModelFromEdict(touch);
+		if (!model || !model->PointSuperContents)
+			continue;
+		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);
+		Matrix4x4_Invert_Simple(&imatrix, &matrix);
+		Matrix4x4_Transform(&imatrix, point, transformed);
+		frame = (int)touch->fields.server->frame;
+		supercontents |= model->PointSuperContents(model, bound(0, frame, (model->numframes - 1)), transformed);
+	}
+
+	return supercontents;
+}
+
 /*
 ===============================================================================
 
@@ -263,11 +684,46 @@ Linking entities into the world culling system
 ===============================================================================
 */
 
+void SV_LinkEdict_TouchAreaGrid_Call(prvm_edict_t *touch, prvm_edict_t *ent)
+{
+	prvm_eval_t *val;
+	prog->globals.server->self = PRVM_EDICT_TO_PROG(touch);
+	prog->globals.server->other = PRVM_EDICT_TO_PROG(ent);
+	prog->globals.server->time = sv.time;
+	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 (touch->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;
+	prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(ent);
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
+		val->_float = 0;
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
+		val->_float = 0;
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
+		val->_float = 0;
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
+		val->string = 0;
+	PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
+}
+
 void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent)
 {
 	int i, numtouchedicts, old_self, old_other;
 	prvm_edict_t *touch, *touchedicts[MAX_EDICTS];
 
+	if (ent == prog->edicts)
+		return;		// don't add the world
+
+	if (ent->priv.server->free)
+		return;
+
+	if (ent->fields.server->solid == SOLID_NOT)
+		return;
+
 	// build a list of edicts to touch, because the link loop can be corrupted
 	// by IncreaseEdicts called during touch functions
 	numtouchedicts = World_EntitiesInBox(&sv.world, ent->priv.server->areamins, ent->priv.server->areamaxs, MAX_EDICTS, touchedicts);
@@ -285,44 +741,55 @@ void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent)
 		touch = touchedicts[i];
 		if (touch != ent && (int)touch->fields.server->solid == SOLID_TRIGGER && touch->fields.server->touch)
 		{
-			prvm_eval_t *val;
-			prog->globals.server->self = PRVM_EDICT_TO_PROG(touch);
-			prog->globals.server->other = PRVM_EDICT_TO_PROG(ent);
-			prog->globals.server->time = sv.time;
-			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 (touch->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;
-			prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(ent);
-			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
-				val->_float = 0;
-			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
-				val->_float = 0;
-			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
-				val->_float = 0;
-			if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
-				val->string = 0;
-			PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
+			SV_LinkEdict_TouchAreaGrid_Call(touch, ent);
 		}
 	}
 	prog->globals.server->self = old_self;
 	prog->globals.server->other = old_other;
 }
 
+static void RotateBBox(const vec3_t mins, const vec3_t maxs, const vec3_t angles, vec3_t rotatedmins, vec3_t rotatedmaxs)
+{
+	vec3_t v, u;
+	matrix4x4_t m;
+	Matrix4x4_CreateFromQuakeEntity(&m, 0, 0, 0, angles[PITCH], angles[YAW], angles[ROLL], 1.0);
+
+	v[0] = mins[0]; v[1] = mins[1]; v[2] = mins[2]; Matrix4x4_Transform(&m, v, u);
+		VectorCopy(u, rotatedmins); VectorCopy(u, rotatedmaxs);
+	v[0] = maxs[0]; v[1] = mins[1]; v[2] = mins[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+	v[0] = mins[0]; v[1] = maxs[1]; v[2] = mins[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+	v[0] = maxs[0]; v[1] = maxs[1]; v[2] = mins[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+	v[0] = mins[0]; v[1] = mins[1]; v[2] = maxs[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+	v[0] = maxs[0]; v[1] = mins[1]; v[2] = maxs[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+	v[0] = mins[0]; v[1] = maxs[1]; v[2] = maxs[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+	v[0] = maxs[0]; v[1] = maxs[1]; v[2] = maxs[2]; Matrix4x4_Transform(&m, v, u);
+		if(rotatedmins[0] > u[0]) rotatedmins[0] = u[0]; if(rotatedmins[1] > u[1]) rotatedmins[1] = u[1]; if(rotatedmins[2] > u[2]) rotatedmins[2] = u[2];
+		if(rotatedmaxs[0] < u[0]) rotatedmaxs[0] = u[0]; if(rotatedmaxs[1] < u[1]) rotatedmaxs[1] = u[1]; if(rotatedmaxs[2] < u[2]) rotatedmaxs[2] = u[2];
+}
+
 /*
 ===============
 SV_LinkEdict
 
 ===============
 */
-void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
+void SV_LinkEdict (prvm_edict_t *ent)
 {
-	model_t *model;
+	dp_model_t *model;
 	vec3_t mins, maxs;
+	int modelindex;
 
 	if (ent == prog->edicts)
 		return;		// don't add the world
@@ -330,20 +797,33 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 	if (ent->priv.server->free)
 		return;
 
+	modelindex = (int)ent->fields.server->modelindex;
+	if (modelindex < 0 || modelindex >= MAX_MODELS)
+	{
+		Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
+		modelindex = 0;
+	}
+	model = SV_GetModelByIndex(modelindex);
+
+	VM_GenerateFrameGroupBlend(ent->priv.server->framegroupblend, ent);
+	VM_FrameBlendFromFrameGroupBlend(ent->priv.server->frameblend, ent->priv.server->framegroupblend, model);
+	VM_UpdateEdictSkeleton(ent, model, ent->priv.server->frameblend);
+
 // set the abs box
 
-	if (ent->fields.server->solid == SOLID_BSP)
+	if (ent->fields.server->movetype == MOVETYPE_PHYSICS)
+	{
+		// TODO maybe should do this for rotating SOLID_BSP too? Would behave better with rotating doors
+		// TODO special handling for spheres?
+		RotateBBox(ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->angles, mins, maxs);
+		VectorAdd(ent->fields.server->origin, mins, mins);
+		VectorAdd(ent->fields.server->origin, maxs, maxs);
+	}
+	else if (ent->fields.server->solid == SOLID_BSP)
 	{
-		int modelindex = (int)ent->fields.server->modelindex;
-		if (modelindex < 0 || modelindex > MAX_MODELS)
-		{
-			Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
-			modelindex = 0;
-		}
-		model = sv.models[modelindex];
 		if (model != NULL)
 		{
-			if (!model->TraceBox)
+			if (!model->TraceBox && developer.integer >= 1)
 				Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
 
 			if (ent->fields.server->angles[0] || ent->fields.server->angles[2] || ent->fields.server->avelocity[0] || ent->fields.server->avelocity[2])
@@ -404,10 +884,6 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 	VectorCopy(maxs, ent->fields.server->absmax);
 
 	World_LinkEdict(&sv.world, ent, mins, maxs);
-
-	// if touch_triggers, call touch on all entities overlapping this box
-	if (touch_triggers && ent->fields.server->solid != SOLID_NOT)
-		SV_LinkEdict_TouchAreaGrid(ent);
 }
 
 /*
@@ -427,11 +903,13 @@ returns true if the entity is in solid currently
 */
 static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset)
 {
+	int contents;
 	vec3_t org;
 	trace_t trace;
+	contents = SV_GenericHitSuperContentsMask(ent);
 	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)
+	trace = SV_TraceBox(org, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NOMONSTERS, ent, contents);
+	if (trace.startsupercontents & contents)
 		return true;
 	else
 	{
@@ -455,14 +933,27 @@ static int SV_TestEntityPosition (prvm_edict_t *ent, vec3_t offset)
 				v[0] = (i & 1) ? m2[0] : m1[0];
 				v[1] = (i & 2) ? m2[1] : m1[1];
 				v[2] = (i & 4) ? m2[2] : m1[2];
-				if (SV_PointSuperContents(v) & SUPERCONTENTS_SOLID)
+				if (SV_PointSuperContents(v) & contents)
 					return true;
 			}
 		}
 	}
 	// if the trace found a better position for the entity, move it there
 	if (VectorDistance2(trace.endpos, ent->fields.server->origin) >= 0.0001)
+	{
+#if 0
+		// please switch back to this code when trace.endpos sometimes being in solid bug is fixed
 		VectorCopy(trace.endpos, ent->fields.server->origin);
+#else
+		// verify if the endpos is REALLY outside solid
+		VectorCopy(trace.endpos, org);
+		trace = SV_TraceBox(org, ent->fields.server->mins, ent->fields.server->maxs, org, MOVE_NOMONSTERS, ent, contents);
+		if(trace.startsolid)
+			Con_Printf("SV_TestEntityPosition: trace.endpos detected to be in solid. NOT using it.\n");
+		else
+			VectorCopy(org, ent->fields.server->origin);
+#endif
+	}
 	return false;
 }
 
@@ -552,16 +1043,22 @@ void SV_CheckVelocity (prvm_edict_t *ent)
 	{
 		if (IS_NAN(ent->fields.server->velocity[i]))
 		{
-			Con_Printf("Got a NaN velocity on %s\n", PRVM_GetString(ent->fields.server->classname));
+			Con_Printf("Got a NaN velocity on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(ent->fields.server->classname));
 			ent->fields.server->velocity[i] = 0;
 		}
 		if (IS_NAN(ent->fields.server->origin[i]))
 		{
-			Con_Printf("Got a NaN origin on %s\n", PRVM_GetString(ent->fields.server->classname));
+			Con_Printf("Got a NaN origin on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(ent->fields.server->classname));
 			ent->fields.server->origin[i] = 0;
 		}
 	}
 
+	// LordHavoc: a hack to ensure that the (rather silly) id1 quakec
+	// player_run/player_stand1 does not horribly malfunction if the
+	// velocity becomes a denormalized float
+	if (VectorLength2(ent->fields.server->velocity) < 0.0001)
+		VectorClear(ent->fields.server->velocity);
+
 	// LordHavoc: max velocity fix, inspired by Maddes's source fixes, but this is faster
 	wishspeed = DotProduct(ent->fields.server->velocity, ent->fields.server->velocity);
 	if (wishspeed > sv_maxvelocity.value * sv_maxvelocity.value)
@@ -614,14 +1111,16 @@ qboolean SV_RunThink (prvm_edict_t *ent)
 SV_Impact
 
 Two entities have touched, so run their touch functions
+returns true if the impact kept the origin of the touching entity intact
 ==================
 */
 extern void VM_SetTraceGlobals(const trace_t *trace);
 extern sizebuf_t vm_tempstringsbuf;
-void SV_Impact (prvm_edict_t *e1, trace_t *trace)
+qboolean SV_Impact (prvm_edict_t *e1, trace_t *trace)
 {
 	int restorevm_tempstringsbuf_cursize;
 	int old_self, old_other;
+	vec3_t org;
 	prvm_edict_t *e2 = (prvm_edict_t *)trace->ent;
 	prvm_eval_t *val;
 
@@ -629,6 +1128,8 @@ void SV_Impact (prvm_edict_t *e1, trace_t *trace)
 	old_other = prog->globals.server->other;
 	restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
 
+	VectorCopy(e1->fields.server->origin, org);
+
 	VM_SetTraceGlobals(trace);
 
 	prog->globals.server->time = sv.time;
@@ -661,6 +1162,8 @@ void SV_Impact (prvm_edict_t *e1, trace_t *trace)
 	prog->globals.server->self = old_self;
 	prog->globals.server->other = old_other;
 	vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+
+	return VectorCompare(e1->fields.server->origin, org);
 }
 
 
@@ -696,20 +1199,39 @@ Returns the clipflags if the velocity was modified (hit something solid)
 1 = floor
 2 = wall / step
 4 = dead stop
+8 = teleported by touch method
 If stepnormal is not NULL, the plane normal of any vertical wall hit will be stored
 ============
 */
-// LordHavoc: increased from 5 to 32
-#define MAX_CLIP_PLANES 32
-int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsupercontentsmask)
+static float SV_Gravity (prvm_edict_t *ent);
+static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, qboolean dolink);
+#define MAX_CLIP_PLANES 5
+static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, float *stepnormal, int hitsupercontentsmask)
 {
 	int blocked, bumpcount;
-	int i, j, impact, numplanes;
-	float d, time_left;
-	vec3_t dir, end, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity;
+	int i, j, numplanes;
+	float d, time_left, gravity;
+	vec3_t dir, push, planes[MAX_CLIP_PLANES], primal_velocity, original_velocity, new_velocity;
+#if 0
+	vec3_t end;
+#endif
 	trace_t trace;
 	if (time <= 0)
 		return 0;
+	gravity = 0;
+	if (applygravity)
+	{
+		if (sv_gameplayfix_gravityunaffectedbyticrate.integer)
+		{
+			gravity = SV_Gravity(ent) * 0.5f;
+			ent->fields.server->velocity[2] -= gravity;
+		}
+		else
+		{
+			applygravity = false;
+			ent->fields.server->velocity[2] -= SV_Gravity(ent);
+		}
+	}
 	blocked = 0;
 	VectorCopy(ent->fields.server->velocity, original_velocity);
 	VectorCopy(ent->fields.server->velocity, primal_velocity);
@@ -720,8 +1242,18 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 		if (!ent->fields.server->velocity[0] && !ent->fields.server->velocity[1] && !ent->fields.server->velocity[2])
 			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, hitsupercontentsmask);
+		VectorScale(ent->fields.server->velocity, time_left, push);
+#if 0
+		VectorAdd(ent->fields.server->origin, push, end);
+#endif
+		if(!SV_PushEntity(&trace, ent, push, false, false))
+		{
+			// we got teleported by a touch function
+			// let's abort the move
+			blocked |= 8;
+			break;
+		}
+
 #if 0
 		//if (trace.fraction < 0.002)
 		{
@@ -732,7 +1264,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 			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, hitsupercontentsmask);
+			testtrace = SV_TraceBox(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);
@@ -747,7 +1279,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 				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, hitsupercontentsmask);
+				testtrace = SV_TraceBox(start, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
 				if (trace.fraction < testtrace.fraction)
 				{
 					trace = testtrace;
@@ -780,27 +1312,21 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 		}
 #endif
 
-		// break if it moved the entire distance
 		if (trace.fraction == 1)
-		{
-			VectorCopy(trace.endpos, ent->fields.server->origin);
 			break;
-		}
-
-		if (!trace.ent)
-		{
-			Con_Printf ("SV_FlyMove: !trace.ent");
-			trace.ent = prog->edicts;
-		}
-
-		impact = !((int) ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent);
-
 		if (trace.plane.normal[2])
 		{
 			if (trace.plane.normal[2] > 0.7)
 			{
 				// floor
 				blocked |= 1;
+
+				if (!trace.ent)
+				{
+					Con_Printf ("SV_FlyMove: !trace.ent");
+					trace.ent = prog->edicts;
+				}
+
 				ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
 				ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
 			}
@@ -813,25 +1339,13 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 			if (stepnormal)
 				VectorCopy(trace.plane.normal, stepnormal);
 		}
-
 		if (trace.fraction >= 0.001)
 		{
 			// actually covered some distance
-			VectorCopy(trace.endpos, ent->fields.server->origin);
 			VectorCopy(ent->fields.server->velocity, original_velocity);
 			numplanes = 0;
 		}
 
-		// run the impact function
-		if (impact)
-		{
-			SV_Impact(ent, &trace);
-
-			// break if removed by the impact function
-			if (ent->priv.server->free)
-				break;
-		}
-
 		time_left *= 1 - trace.fraction;
 
 		// clipped to another plane
@@ -916,23 +1430,25 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 	{
 		// 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, hitsupercontentsmask);
+		trace = SV_TraceBox(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
 	}
 	*/
 
 	// LordHavoc: this came from QW and allows you to get out of water more easily
-	if (sv_gameplayfix_qwplayerphysics.integer && ((int)ent->fields.server->flags & FL_WATERJUMP))
+	if (sv_gameplayfix_easierwaterjump.integer && ((int)ent->fields.server->flags & FL_WATERJUMP) && !(blocked & 8))
 		VectorCopy(primal_velocity, ent->fields.server->velocity);
+	if (applygravity && !((int)ent->fields.server->flags & FL_ONGROUND))
+		ent->fields.server->velocity[2] -= gravity;
 	return blocked;
 }
 
 /*
 ============
-SV_AddGravity
+SV_Gravity
 
 ============
 */
-void SV_AddGravity (prvm_edict_t *ent)
+static float SV_Gravity (prvm_edict_t *ent)
 {
 	float ent_gravity;
 	prvm_eval_t *val;
@@ -942,7 +1458,7 @@ void SV_AddGravity (prvm_edict_t *ent)
 		ent_gravity = val->_float;
 	else
 		ent_gravity = 1.0;
-	ent->fields.server->velocity[2] -= ent_gravity * sv_gravity.value * sv.frametime;
+	return ent_gravity * sv_gravity.value * sv.frametime;
 }
 
 
@@ -959,14 +1475,18 @@ PUSHMOVE
 SV_PushEntity
 
 Does not change the entities velocity at all
+The trace struct is filled with the trace that has been done.
+Returns true if the push did not result in the entity being teleported by QC code.
 ============
 */
-static trace_t SV_PushEntity (prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid)
+static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean failonbmodelstartsolid, qboolean dolink)
 {
 	int type;
-	trace_t trace;
+	int bump;
+	vec3_t original;
 	vec3_t end;
 
+	VectorCopy(ent->fields.server->origin, original);
 	VectorAdd (ent->fields.server->origin, push, end);
 
 	if (ent->fields.server->movetype == MOVETYPE_FLYMISSILE)
@@ -976,16 +1496,42 @@ 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, SV_GenericHitSuperContentsMask(ent));
-	if (trace.bmodelstartsolid && failonbmodelstartsolid)
-		return trace;
+	*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)
+	{
+		vec_t nudge = -trace->startdepth + sv_gameplayfix_nudgeoutofsolid_bias.value;
+		VectorMA(ent->fields.server->origin, nudge, trace->startdepthnormal, ent->fields.server->origin);
+		*trace = SV_TraceBox(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent));
+		bump++;
+		if (bump > 10)
+		{
+			VectorCopy(original, ent->fields.server->origin);
+			break;
+		}
+	}
+	if (trace->bmodelstartsolid && failonbmodelstartsolid)
+		return true;
 
-	VectorCopy (trace.endpos, ent->fields.server->origin);
-	SV_LinkEdict (ent, true);
 
-	if (ent->fields.server->solid >= SOLID_TRIGGER && trace.ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace.ent)))
-		SV_Impact (ent, &trace);
-	return trace;
+	VectorCopy (trace->endpos, ent->fields.server->origin);
+	SV_LinkEdict(ent);
+
+#if 0
+	if(!trace->startsolid)
+	if(SV_TraceBox(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, type, ent, SV_GenericHitSuperContentsMask(ent)).startsolid)
+	{
+		Con_Printf("something eeeeevil happened\n");
+	}
+#endif
+
+	if (dolink)
+		SV_LinkEdict_TouchAreaGrid(ent);
+
+	if((ent->fields.server->solid >= SOLID_TRIGGER && trace->ent && (!((int)ent->fields.server->flags & FL_ONGROUND) || ent->fields.server->groundentity != PRVM_EDICT_TO_PROG(trace->ent))))
+		return SV_Impact (ent, trace);
+
+	return true;
 }
 
 
@@ -998,13 +1544,16 @@ SV_PushMove
 void SV_PushMove (prvm_edict_t *pusher, float movetime)
 {
 	int i, e, index;
+	int pusherowner, pusherprog;
+	int checkcontents;
+	qboolean rotated;
 	float savesolid, movetime2, pushltime;
 	vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org;
 	int num_moved;
 	int numcheckentities;
 	static prvm_edict_t *checkentities[MAX_EDICTS];
-	model_t *pushermodel;
-	trace_t trace;
+	dp_model_t *pushermodel;
+	trace_t trace, trace2;
 	matrix4x4_t pusherfinalmatrix, pusherfinalimatrix;
 	unsigned short moved_edicts[MAX_EDICTS];
 
@@ -1031,7 +1580,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 		pusher->fields.server->angles[1] -= 360.0 * floor(pusher->fields.server->angles[1] * (1.0 / 360.0));
 		pusher->fields.server->angles[2] -= 360.0 * floor(pusher->fields.server->angles[2] * (1.0 / 360.0));
 		pusher->fields.server->ltime += movetime;
-		SV_LinkEdict (pusher, false);
+		SV_LinkEdict(pusher);
 		return;
 	default:
 		Con_Printf("SV_PushMove: entity #%i, unrecognized solid type %f\n", PRVM_NUM_FOR_EDICT(pusher), pusher->fields.server->solid);
@@ -1043,7 +1592,11 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 		Con_Printf("SV_PushMove: entity #%i has an invalid modelindex %f\n", PRVM_NUM_FOR_EDICT(pusher), pusher->fields.server->modelindex);
 		return;
 	}
-	pushermodel = sv.models[index];
+	pushermodel = SV_GetModelByIndex(index);
+	pusherowner = pusher->fields.server->owner;
+	pusherprog = PRVM_EDICT_TO_PROG(pusher);
+
+	rotated = VectorLength2(pusher->fields.server->angles) + VectorLength2(pusher->fields.server->avelocity) > 0;
 
 	movetime2 = movetime;
 	VectorScale(pusher->fields.server->velocity, movetime2, move1);
@@ -1109,11 +1662,9 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 	VectorMA (pusher->fields.server->origin, movetime, pusher->fields.server->velocity, pusher->fields.server->origin);
 	VectorMA (pusher->fields.server->angles, movetime, pusher->fields.server->avelocity, pusher->fields.server->angles);
 	pusher->fields.server->ltime += movetime;
-	SV_LinkEdict (pusher, false);
+	SV_LinkEdict(pusher);
 
-	pushermodel = NULL;
-	if (pusher->fields.server->modelindex >= 1 && pusher->fields.server->modelindex < MAX_MODELS)
-		pushermodel = sv.models[(int)pusher->fields.server->modelindex];
+	pushermodel = SV_GetModelFromEdict(pusher);
 	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);
 
@@ -1126,26 +1677,47 @@ 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
-		 || check->fields.server->movetype == MOVETYPE_NOCLIP
-		 || check->fields.server->movetype == MOVETYPE_FAKEPUSH)
+		int movetype = (int)check->fields.server->movetype;
+		switch(movetype)
+		{
+		case MOVETYPE_NONE:
+		case MOVETYPE_PUSH:
+		case MOVETYPE_FOLLOW:
+		case MOVETYPE_NOCLIP:
+		case MOVETYPE_FAKEPUSH:
+			continue;
+		default:
+			break;
+		}
+
+		if (check->fields.server->owner == pusherprog)
+			continue;
+
+		if (pusherowner == PRVM_EDICT_TO_PROG(check))
 			continue;
 
+		//Con_Printf("%i %s ", PRVM_NUM_FOR_EDICT(check), PRVM_GetString(check->fields.server->classname));
+
+		// tell any MOVETYPE_STEP entity that it may need to check for water transitions
+		check->priv.server->waterposition_forceupdate = true;
+
+		checkcontents = SV_GenericHitSuperContentsMask(check);
+
 		// if the entity is standing on the pusher, it will definitely be moved
 		// 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)
 		{
-			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);
+			Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, 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);
+			//trace = SV_TraceBox(check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin, MOVE_NOMONSTERS, check, checkcontents);
 			if (!trace.startsolid)
+			{
+				//Con_Printf("- not in solid\n");
 				continue;
+			}
 		}
 
-
-		if (forward[0] != 1 || left[1] != 1) // quick way to check if any rotation is used
+		if (rotated)
 		{
 			vec3_t org2;
 			VectorSubtract (check->fields.server->origin, pusher->fields.server->origin, org);
@@ -1158,13 +1730,30 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 		else
 			VectorCopy (move1, move);
 
+		//Con_Printf("- pushing %f %f %f\n", move[0], move[1], move[2]);
+
 		VectorCopy (check->fields.server->origin, check->priv.server->moved_from);
 		VectorCopy (check->fields.server->angles, check->priv.server->moved_fromangles);
 		moved_edicts[num_moved++] = PRVM_NUM_FOR_EDICT(check);
 
+		// physics objects need better collisions than this code can do
+		if (movetype == MOVETYPE_PHYSICS)
+		{
+			VectorAdd(check->fields.server->origin, move, check->fields.server->origin);
+			SV_LinkEdict(check);
+			SV_LinkEdict_TouchAreaGrid(check);
+			continue;
+		}
+
 		// try moving the contacted entity
 		pusher->fields.server->solid = SOLID_NOT;
-		trace = SV_PushEntity (check, move, true);
+		if(!SV_PushEntity (&trace, check, move, true, true))
+		{
+			// entity "check" got teleported
+			check->fields.server->angles[1] += trace.fraction * moveangle[1];
+			pusher->fields.server->solid = savesolid; // was SOLID_BSP
+			continue; // pushed enough
+		}
 		// FIXME: turn players specially
 		check->fields.server->angles[1] += trace.fraction * moveangle[1];
 		pusher->fields.server->solid = savesolid; // was SOLID_BSP
@@ -1177,7 +1766,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 			check->fields.server->flags = (int)check->fields.server->flags & ~FL_ONGROUND;
 
 		// if it is still inside the pusher, block
-		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);
+		Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, 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
@@ -1186,9 +1775,13 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 			VectorScale(move, 1.1, move2);
 			VectorCopy (check->priv.server->moved_from, check->fields.server->origin);
 			VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
-			SV_PushEntity (check, move2, true);
+			if(!SV_PushEntity (&trace2, check, move2, true, true))
+			{
+				// entity "check" got teleported
+				continue;
+			}
 			pusher->fields.server->solid = savesolid;
-			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);
+			Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, 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
@@ -1196,9 +1789,13 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 				VectorScale(move, 0.9, move2);
 				VectorCopy (check->priv.server->moved_from, check->fields.server->origin);
 				VectorCopy (check->priv.server->moved_fromangles, check->fields.server->angles);
-				SV_PushEntity (check, move2, true);
+				if(!SV_PushEntity (&trace2, check, move2, true, true))
+				{
+					// entity "check" got teleported
+					continue;
+				}
 				pusher->fields.server->solid = savesolid;
-				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);
+				Collision_ClipToGenericEntity(&trace, pushermodel, pusher->priv.server->frameblend, &pusher->priv.server->skeleton, 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
@@ -1217,7 +1814,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 					VectorCopy (pushorig, pusher->fields.server->origin);
 					VectorCopy (pushang, pusher->fields.server->angles);
 					pusher->fields.server->ltime = pushltime;
-					SV_LinkEdict (pusher, false);
+					SV_LinkEdict(pusher);
 
 					// move back any entities we already moved
 					for (i = 0;i < num_moved;i++)
@@ -1225,7 +1822,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 						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);
+						SV_LinkEdict(ed);
 					}
 
 					// if the pusher has a "blocked" function, call it, otherwise just stay in place until the obstacle is gone
@@ -1292,94 +1889,127 @@ CLIENT MOVEMENT
 
 static float unstickoffsets[] =
 {
+	// poutting -/+z changes first as they are least weird
+	 0,  0,  -1,
+	 0,  0,  1,
+	 // x or y changes
 	-1,  0,  0,
 	 1,  0,  0,
 	 0, -1,  0,
 	 0,  1,  0,
+	 // x and y changes
 	-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
+typedef enum unstickresult_e
+{
+	UNSTICK_STUCK = 0,
+	UNSTICK_GOOD = 1,
+	UNSTICK_UNSTUCK = 2
+}
+unstickresult_t;
 
-This is a big hack to try and fix the rare case of getting stuck in the world
-clipping hull.
-=============
-*/
-void SV_CheckStuck (prvm_edict_t *ent)
+unstickresult_t SV_UnstickEntityReturnOffset (prvm_edict_t *ent, vec3_t offset)
 {
-	int i;
-	vec3_t offset;
+	int i, maxunstick;
 
+	// if not stuck in a bmodel, just return
 	if (!SV_TestEntityPosition(ent, vec3_origin))
-	{
-		VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
-		return;
-	}
+		return UNSTICK_GOOD;
 
 	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(unstickoffsets + i, offset);
+			SV_LinkEdict(ent);
+			//SV_LinkEdict_TouchAreaGrid(ent);
+			return UNSTICK_UNSTUCK;
 		}
 	}
 
-	VectorSubtract(ent->fields.server->oldorigin, ent->fields.server->origin, offset);
-	if (!SV_TestEntityPosition(ent, offset))
+	maxunstick = (int) ((ent->fields.server->maxs[2] - ent->fields.server->mins[2]) * 0.36);
+	// magic number 0.36 allows unsticking by up to 17 units with the largest supported bbox
+
+	for(i = 2; i <= maxunstick; ++i)
 	{
-		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;
+		VectorClear(offset);
+		offset[2] = -i;
+		if (!SV_TestEntityPosition(ent, offset))
+		{
+			SV_LinkEdict(ent);
+			//SV_LinkEdict_TouchAreaGrid(ent);
+			return UNSTICK_UNSTUCK;
+		}
+		offset[2] = i;
+		if (!SV_TestEntityPosition(ent, offset))
+		{
+			SV_LinkEdict(ent);
+			//SV_LinkEdict_TouchAreaGrid(ent);
+			return UNSTICK_UNSTUCK;
+		}
 	}
 
-	Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+	return UNSTICK_STUCK;
 }
 
-static void SV_UnstickEntity (prvm_edict_t *ent)
+qboolean SV_UnstickEntity (prvm_edict_t *ent)
 {
-	int i;
+	vec3_t offset;
+	switch(SV_UnstickEntityReturnOffset(ent, offset))
+	{
+		case UNSTICK_GOOD:
+			return true;
+		case UNSTICK_UNSTUCK:
+			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), offset[0], offset[1], offset[2]);
+			return true;
+		case UNSTICK_STUCK:
+			if (developer.integer >= 100)
+				Con_Printf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+			return false;
+		default:
+			Con_Printf("SV_UnstickEntityReturnOffset returned a value outside its enum.\n");
+			return false;
+	}
+}
 
-	// if not stuck in a bmodel, just return
-	if (!SV_TestEntityPosition(ent, vec3_origin))
-		return;
+/*
+=============
+SV_CheckStuck
 
-	for (i = 0;i < (int)(sizeof(unstickoffsets) / sizeof(unstickoffsets[0]));i += 3)
+This is a big hack to try and fix the rare case of getting stuck in the world
+clipping hull.
+=============
+*/
+void SV_CheckStuck (prvm_edict_t *ent)
+{
+	vec3_t offset;
+
+	switch(SV_UnstickEntityReturnOffset(ent, offset))
 	{
-		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;
-		}
+		case UNSTICK_GOOD:
+			VectorCopy (ent->fields.server->origin, ent->fields.server->oldorigin);
+			break;
+		case UNSTICK_UNSTUCK:
+			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), offset[0], offset[1], offset[2]);
+			break;
+		case UNSTICK_STUCK:
+			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);
+				//SV_LinkEdict_TouchAreaGrid(ent);
+			}
+			else
+				Con_DPrintf("Stuck player entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
+			break;
+		default:
+			Con_Printf("SV_UnstickEntityReturnOffset returned a value outside its enum.\n");
 	}
-
-	if (developer.integer >= 100)
-		Con_Printf("Stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(ent->fields.server->classname));
 }
 
 
@@ -1492,7 +2122,7 @@ int SV_TryUnstick (prvm_edict_t *ent, vec3_t oldvel)
 			case 7: dir[0] = -2; dir[1] = -2; break;
 		}
 
-		SV_PushEntity (ent, dir, false);
+		SV_PushEntity (&trace, ent, dir, false, true);
 
 		// retry the original move
 		ent->fields.server->velocity[0] = oldvel[0];
@@ -1527,15 +2157,20 @@ Only used by players
 */
 void SV_WalkMove (prvm_edict_t *ent)
 {
-	int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity, hitsupercontentsmask;
+	int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity, hitsupercontentsmask, type;
 	vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity;
-	trace_t downtrace;
+	trace_t downtrace, trace;
+	qboolean applygravity;
 
 	// if frametime is 0 (due to client sending the same timestamp twice),
 	// don't move
 	if (sv.frametime <= 0)
 		return;
 
+	SV_CheckStuck (ent);
+
+	applygravity = !SV_CheckWater (ent) && ent->fields.server->movetype == MOVETYPE_WALK && ! ((int)ent->fields.server->flags & FL_WATERJUMP);
+
 	hitsupercontentsmask = SV_GenericHitSuperContentsMask(ent);
 
 	SV_CheckVelocity(ent);
@@ -1546,19 +2181,33 @@ void SV_WalkMove (prvm_edict_t *ent)
 	VectorCopy (ent->fields.server->origin, start_origin);
 	VectorCopy (ent->fields.server->velocity, start_velocity);
 
-	clip = SV_FlyMove (ent, sv.frametime, NULL, hitsupercontentsmask);
+	clip = SV_FlyMove (ent, sv.frametime, applygravity, 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;
+	if(!(clip & 1))
+		// only try this if there was no floor in the way in the trace (no,
+		// this check seems to be not REALLY necessary, because if clip & 1,
+		// our trace will hit that thing too)
+	{
+		VectorSet(upmove, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2] + 1);
+		VectorSet(downmove, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2] - 1);
+		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
+		else
+			type = MOVE_NORMAL;
+		trace = SV_TraceBox(upmove, ent->fields.server->mins, ent->fields.server->maxs, downmove, type, ent, SV_GenericHitSuperContentsMask(ent));
+		if(trace.fraction >= 1 || trace.plane.normal[2] <= 0.7)
+			ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
+	}
 
 	SV_CheckVelocity(ent);
+	SV_LinkEdict(ent);
+	SV_LinkEdict_TouchAreaGrid(ent);
 
-	VectorCopy(ent->fields.server->origin, originalmove_origin);
-	VectorCopy(ent->fields.server->velocity, originalmove_velocity);
-	originalmove_clip = clip;
-	originalmove_flags = (int)ent->fields.server->flags;
-	originalmove_groundentity = ent->fields.server->groundentity;
+	if(clip & 8) // teleport
+		return;
 
 	if ((int)ent->fields.server->flags & FL_WATERJUMP)
 		return;
@@ -1566,6 +2215,12 @@ void SV_WalkMove (prvm_edict_t *ent)
 	if (sv_nostep.integer)
 		return;
 
+	VectorCopy(ent->fields.server->origin, originalmove_origin);
+	VectorCopy(ent->fields.server->velocity, originalmove_velocity);
+	originalmove_clip = clip;
+	originalmove_flags = (int)ent->fields.server->flags;
+	originalmove_groundentity = ent->fields.server->groundentity;
+
 	// if move didn't block on a step, return
 	if (clip & 2)
 	{
@@ -1593,15 +2248,26 @@ void SV_WalkMove (prvm_edict_t *ent)
 		// move up
 		VectorClear (upmove);
 		upmove[2] = sv_stepheight.value;
-		// FIXME: don't link?
-		SV_PushEntity(ent, upmove, false);
+		if(!SV_PushEntity(&trace, ent, upmove, false, true))
+		{
+			// we got teleported when upstepping... must abort the move
+			return;
+		}
 
 		// move forward
 		ent->fields.server->velocity[2] = 0;
-		clip = SV_FlyMove (ent, sv.frametime, stepnormal, hitsupercontentsmask);
+		clip = SV_FlyMove (ent, sv.frametime, applygravity, stepnormal, hitsupercontentsmask);
 		ent->fields.server->velocity[2] += start_velocity[2];
+		if(clip & 8)
+		{
+			// we got teleported when upstepping... must abort the move
+			// note that z velocity handling may not be what QC expects here, but we cannot help it
+			return;
+		}
 
 		SV_CheckVelocity(ent);
+		SV_LinkEdict(ent);
+		SV_LinkEdict_TouchAreaGrid(ent);
 
 		// check for stuckness, possibly due to the limited precision of floats
 		// in the clipping hulls
@@ -1634,8 +2300,11 @@ void SV_WalkMove (prvm_edict_t *ent)
 	// move down
 	VectorClear (downmove);
 	downmove[2] = -sv_stepheight.value + start_velocity[2]*sv.frametime;
-	// FIXME: don't link?
-	downtrace = SV_PushEntity (ent, downmove, false);
+	if(!SV_PushEntity (&downtrace, ent, downmove, false, true))
+	{
+		// we got teleported when downstepping... must abort the move
+		return;
+	}
 
 	if (downtrace.fraction < 1 && downtrace.plane.normal[2] > 0.7)
 	{
@@ -1665,6 +2334,8 @@ void SV_WalkMove (prvm_edict_t *ent)
 	}
 
 	SV_CheckVelocity(ent);
+	SV_LinkEdict(ent);
+	SV_LinkEdict_TouchAreaGrid(ent);
 }
 
 //============================================================================
@@ -1710,7 +2381,8 @@ void SV_Physics_Follow (prvm_edict_t *ent)
 		ent->fields.server->origin[2] = v[0] * vu[0] + v[1] * vu[1] + v[2] * vu[2] + e->fields.server->origin[2];
 	}
 	VectorAdd (e->fields.server->angles, ent->fields.server->v_angle, ent->fields.server->angles);
-	SV_LinkEdict (ent, true);
+	SV_LinkEdict(ent);
+	//SV_LinkEdict_TouchAreaGrid(ent);
 }
 
 /*
@@ -1773,10 +2445,14 @@ void SV_Physics_Toss (prvm_edict_t *ent)
 {
 	trace_t trace;
 	vec3_t move;
+	vec_t movetime;
+	int bump;
+	prvm_edict_t *groundentity;
 
 // if onground, return without moving
 	if ((int)ent->fields.server->flags & FL_ONGROUND)
 	{
+		groundentity = PRVM_PROG_TO_EDICT(ent->fields.server->groundentity);
 		if (ent->fields.server->velocity[2] >= (1.0 / 32.0) && sv_gameplayfix_upwardvelocityclearsongroundflag.integer)
 		{
 			// don't stick to ground if onground and moving upward
@@ -1787,12 +2463,18 @@ void SV_Physics_Toss (prvm_edict_t *ent)
 			// we can trust FL_ONGROUND if groundentity is world because it never moves
 			return;
 		}
-		else if (ent->priv.server->suspendedinairflag && PRVM_PROG_TO_EDICT(ent->fields.server->groundentity)->priv.server->free)
+		else if (ent->priv.server->suspendedinairflag && groundentity->priv.server->free)
 		{
 			// if ent was supported by a brush model on previous frame,
 			// and groundentity is now freed, set groundentity to 0 (world)
 			// which leaves it suspended in the air
 			ent->fields.server->groundentity = 0;
+			if (sv_gameplayfix_noairborncorpse_allowsuspendeditems.integer)
+				return;
+		}
+		else if (BoxesOverlap(ent->priv.server->cullmins, ent->priv.server->cullmaxs, groundentity->priv.server->cullmins, groundentity->priv.server->cullmaxs))
+		{
+			// don't slide if still touching the groundentity
 			return;
 		}
 	}
@@ -1802,41 +2484,69 @@ void SV_Physics_Toss (prvm_edict_t *ent)
 
 // add gravity
 	if (ent->fields.server->movetype == MOVETYPE_TOSS || ent->fields.server->movetype == MOVETYPE_BOUNCE)
-		SV_AddGravity (ent);
+		ent->fields.server->velocity[2] -= SV_Gravity(ent);
 
 // move angles
 	VectorMA (ent->fields.server->angles, sv.frametime, ent->fields.server->avelocity, ent->fields.server->angles);
 
-// move origin
-	VectorScale (ent->fields.server->velocity, sv.frametime, move);
-	trace = SV_PushEntity (ent, move, true);
-	if (ent->priv.server->free)
-		return;
-	if (trace.bmodelstartsolid)
+	movetime = sv.frametime;
+	for (bump = 0;bump < MAX_CLIP_PLANES && movetime > 0;bump++)
 	{
-		// try to unstick the entity
-		SV_UnstickEntity(ent);
-		trace = SV_PushEntity (ent, move, false);
+	// move origin
+		VectorScale (ent->fields.server->velocity, movetime, move);
+		if(!SV_PushEntity (&trace, ent, move, true, true))
+			return; // teleported
 		if (ent->priv.server->free)
 			return;
-	}
-
-	if (trace.fraction < 1)
-	{
+		if (trace.bmodelstartsolid)
+		{
+			// try to unstick the entity
+			SV_UnstickEntity(ent);
+			if(!SV_PushEntity (&trace, ent, move, false, true))
+				return; // teleported
+			if (ent->priv.server->free)
+				return;
+		}
+		if (trace.fraction == 1)
+			break;
+		movetime *= 1 - min(1, trace.fraction);
 		if (ent->fields.server->movetype == MOVETYPE_BOUNCEMISSILE)
 		{
-			ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 2.0);
+			prvm_eval_t *val;
+			float bouncefactor = 1.0f;
+			val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.bouncefactor);
+			if (val!=0 && val->_float)
+				bouncefactor = val->_float;
+
+			ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 1 + bouncefactor);
 			ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
 		}
 		else if (ent->fields.server->movetype == MOVETYPE_BOUNCE)
 		{
-			float d;
-			ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 1.5);
+			float d, ent_gravity;
+			prvm_eval_t *val;
+			float bouncefactor = 0.5f;
+			float bouncestop = 60.0f / 800.0f;
+
+			val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.bouncefactor);
+			if (val!=0 && val->_float)
+				bouncefactor = val->_float;
+
+			val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.bouncestop);
+			if (val!=0 && val->_float)
+				bouncestop = val->_float;
+
+			ClipVelocity (ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 1 + bouncefactor);
 			// LordHavoc: fixed grenades not bouncing when fired down a slope
+			val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.gravity);
+			if (val!=0 && val->_float)
+				ent_gravity = val->_float;
+			else
+				ent_gravity = 1.0;
 			if (sv_gameplayfix_grenadebouncedownslopes.integer)
 			{
 				d = DotProduct(trace.plane.normal, ent->fields.server->velocity);
-				if (trace.plane.normal[2] > 0.7 && fabs(d) < 60)
+				if (trace.plane.normal[2] > 0.7 && fabs(d) < sv_gravity.value * bouncestop * ent_gravity)
 				{
 					ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
 					ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
@@ -1848,7 +2558,7 @@ void SV_Physics_Toss (prvm_edict_t *ent)
 			}
 			else
 			{
-				if (trace.plane.normal[2] > 0.7 && ent->fields.server->velocity[2] < 60)
+				if (trace.plane.normal[2] > 0.7 && ent->fields.server->velocity[2] < sv_gravity.value * bouncestop * ent_gravity)
 				{
 					ent->fields.server->flags = (int)ent->fields.server->flags | FL_ONGROUND;
 					ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
@@ -1874,6 +2584,8 @@ void SV_Physics_Toss (prvm_edict_t *ent)
 			else
 				ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
 		}
+		if (!sv_gameplayfix_slidemoveprojectiles.integer || (ent->fields.server->movetype != MOVETYPE_BOUNCE && ent->fields.server->movetype == MOVETYPE_BOUNCEMISSILE) || ((int)ent->fields.server->flags & FL_ONGROUND))
+			break;
 	}
 
 // check for in water
@@ -1902,6 +2614,13 @@ will fall if the floor is pulled out from under them.
 void SV_Physics_Step (prvm_edict_t *ent)
 {
 	int flags = (int)ent->fields.server->flags;
+
+	// DRESK
+	// Backup Velocity in the event that movetypesteplandevent is called,
+	// to provide a parameter with the entity's velocity at impact.
+	prvm_eval_t *movetypesteplandevent;
+	vec3_t backupVelocity;
+	VectorCopy(ent->fields.server->velocity, backupVelocity);
 	// don't fall at all if fly/swim
 	if (!(flags & (FL_FLY | FL_SWIM)))
 	{
@@ -1909,13 +2628,14 @@ void SV_Physics_Step (prvm_edict_t *ent)
 		{
 			// freefall if onground and moving upward
 			// freefall if not standing on a world surface (it may be a lift or trap door)
-			if ((ent->fields.server->velocity[2] >= (1.0 / 32.0) && sv_gameplayfix_upwardvelocityclearsongroundflag.integer) || ent->fields.server->groundentity)
+			if (ent->fields.server->velocity[2] >= (1.0 / 32.0) && sv_gameplayfix_upwardvelocityclearsongroundflag.integer)
 			{
 				ent->fields.server->flags -= FL_ONGROUND;
-				SV_AddGravity(ent);
 				SV_CheckVelocity(ent);
-				SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
-				SV_LinkEdict(ent, true);
+				SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent));
+				SV_LinkEdict(ent);
+				SV_LinkEdict_TouchAreaGrid(ent);
+				ent->priv.server->waterposition_forceupdate = true;
 			}
 		}
 		else
@@ -1923,31 +2643,64 @@ void SV_Physics_Step (prvm_edict_t *ent)
 			// freefall if not onground
 			int hitsound = ent->fields.server->velocity[2] < sv_gravity.value * -0.1;
 
-			SV_AddGravity(ent);
 			SV_CheckVelocity(ent);
-			SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
-			SV_LinkEdict(ent, true);
+			SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent));
+			SV_LinkEdict(ent);
+			SV_LinkEdict_TouchAreaGrid(ent);
 
 			// just hit ground
-			if (hitsound && (int)ent->fields.server->flags & FL_ONGROUND && sv_sound_land.string)
-				SV_StartSound(ent, 0, sv_sound_land.string, 255, 1);
+			if (hitsound && (int)ent->fields.server->flags & FL_ONGROUND)
+			{
+				// DRESK - Check for Entity Land Event Function
+				movetypesteplandevent = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.movetypesteplandevent);
+
+				if(movetypesteplandevent->function)
+				{ // Valid Function; Execute
+					// Prepare Parameters
+						// Assign Velocity at Impact
+						PRVM_G_VECTOR(OFS_PARM0)[0] = backupVelocity[0];
+						PRVM_G_VECTOR(OFS_PARM0)[1] = backupVelocity[1];
+						PRVM_G_VECTOR(OFS_PARM0)[2] = backupVelocity[2];
+						// Assign Self
+						prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
+					// Execute VM Function
+					PRVM_ExecuteProgram(movetypesteplandevent->function, "movetypesteplandevent: NULL function");
+				}
+				else
+				// Check for Engine Landing Sound
+				if(sv_sound_land.string)
+					SV_StartSound(ent, 0, sv_sound_land.string, 255, 1);
+			}
+			ent->priv.server->waterposition_forceupdate = true;
 		}
 	}
 
 // regular thinking
-	SV_RunThink(ent);
+	if (!SV_RunThink(ent))
+		return;
 
-	SV_CheckWaterTransition(ent);
+	if (ent->priv.server->waterposition_forceupdate || !VectorCompare(ent->fields.server->origin, ent->priv.server->waterposition_origin))
+	{
+		ent->priv.server->waterposition_forceupdate = false;
+		VectorCopy(ent->fields.server->origin, ent->priv.server->waterposition_origin);
+		SV_CheckWaterTransition(ent);
+	}
 }
 
 //============================================================================
 
 static void SV_Physics_Entity (prvm_edict_t *ent)
 {
-	// don't run a move on newly spawned projectiles as it messes up movement
-	// interpolation and rocket trails
+	// don't run think/move on newly spawned projectiles as it messes up
+	// movement interpolation and rocket trails, and is inconsistent with
+	// respect to entities spawned in the same frame
+	// (if an ent spawns a higher numbered ent, it moves in the same frame,
+	//  but if it spawns a lower numbered ent, it doesn't - this never moves
+	//  ents in the first frame regardless)
 	qboolean runmove = ent->priv.server->move;
 	ent->priv.server->move = true;
+	if (!runmove && sv_gameplayfix_delayprojectiles.integer > 0)
+		return;
 	switch ((int) ent->fields.server->movetype)
 	{
 	case MOVETYPE_PUSH:
@@ -1969,20 +2722,14 @@ static void SV_Physics_Entity (prvm_edict_t *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_LinkEdict(ent, false);
+		SV_LinkEdict(ent);
 		break;
 	case MOVETYPE_STEP:
 		SV_Physics_Step (ent);
 		break;
 	case MOVETYPE_WALK:
 		if (SV_RunThink (ent))
-		{
-			if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
-				SV_AddGravity (ent);
-			SV_CheckStuck (ent);
 			SV_WalkMove (ent);
-			SV_LinkEdict (ent, true);
-		}
 		break;
 	case MOVETYPE_TOSS:
 	case MOVETYPE_BOUNCE:
@@ -1990,9 +2737,16 @@ static void SV_Physics_Entity (prvm_edict_t *ent)
 	case MOVETYPE_FLYMISSILE:
 	case MOVETYPE_FLY:
 		// regular thinking
-		if (SV_RunThink (ent) && (runmove || !sv_gameplayfix_delayprojectiles.integer))
+		if (SV_RunThink (ent))
 			SV_Physics_Toss (ent);
 		break;
+	case MOVETYPE_PHYSICS:
+		if (SV_RunThink(ent))
+		{
+			SV_LinkEdict(ent);
+			SV_LinkEdict_TouchAreaGrid(ent);
+		}
+		break;
 	default:
 		Con_Printf ("SV_Physics: bad movetype %i\n", (int)ent->fields.server->movetype);
 		break;
@@ -2017,25 +2771,10 @@ void SV_Physics_ClientMove(void)
 
 	// make sure the velocity is sane (not a NaN)
 	SV_CheckVelocity(ent);
-	// 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;
@@ -2055,33 +2794,81 @@ void SV_Physics_ClientMove(void)
 	}
 }
 
-void SV_Physics_ClientEntity(prvm_edict_t *ent)
+static void SV_Physics_ClientEntity_PreThink(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;
-	}
+
+	// make sure the velocity is sane (not a NaN)
+	SV_CheckVelocity(ent);
 
 	// don't run physics here if running asynchronously
-	if (host_client->clmovement_skipphysicsframes <= 0)
+	if (host_client->clmovement_inputtimeout <= 0)
+	{
 		SV_ClientThink();
+		//host_client->cmd.time = max(host_client->cmd.time, sv.time);
+	}
 
-	// make sure the velocity is sane (not a NaN)
+	// make sure the velocity is still sane (not a NaN)
 	SV_CheckVelocity(ent);
-	// 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);
 
 	// call standard client pre-think
 	prog->globals.server->time = sv.time;
 	prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
-	PRVM_ExecuteProgram (prog->globals.server->PlayerPreThink, "QC function PlayerPreThink is missing");
-	SV_CheckVelocity (ent);
+	PRVM_ExecuteProgram(prog->globals.server->PlayerPreThink, "QC function PlayerPreThink is missing");
+
+	// make sure the velocity is still sane (not a NaN)
+	SV_CheckVelocity(ent);
+}
+
+static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent)
+{
+	// don't do physics on disconnected clients, FrikBot relies on this
+	if (!host_client->spawned)
+		return;
+
+	// make sure the velocity is sane (not a NaN)
+	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");
+
+	// make sure the velocity is still sane (not a NaN)
+	SV_CheckVelocity(ent);
+
+	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;
+	}
+
+	// decrement the countdown variable used to decide when to go back to
+	// synchronous physics
+	if (host_client->clmovement_inputtimeout > sv.frametime)
+		host_client->clmovement_inputtimeout -= sv.frametime;
+	else
+		host_client->clmovement_inputtimeout = 0;
+}
+
+static 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;
+	}
+
+	// make sure the velocity is sane (not a NaN)
+	SV_CheckVelocity(ent);
 
 	switch ((int) ent->fields.server->movetype)
 	{
@@ -2109,13 +2896,8 @@ void SV_Physics_ClientEntity(prvm_edict_t *ent)
 	case MOVETYPE_WALK:
 		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);
-			SV_CheckStuck (ent);
+		if (host_client->clmovement_inputtimeout <= 0)
 			SV_WalkMove (ent);
-		}
 		break;
 	case MOVETYPE_TOSS:
 	case MOVETYPE_BOUNCE:
@@ -2127,40 +2909,22 @@ void SV_Physics_ClientEntity(prvm_edict_t *ent)
 		break;
 	case MOVETYPE_FLY:
 		SV_RunThink (ent);
-		SV_CheckWater (ent);
 		SV_WalkMove (ent);
 		break;
+	case MOVETYPE_PHYSICS:
+		SV_RunThink (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);
 
-	SV_LinkEdict (ent, true);
+	SV_LinkEdict(ent);
+	SV_LinkEdict_TouchAreaGrid(ent);
 
 	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;
-	}
 }
 
 /*
@@ -2181,6 +2945,9 @@ void SV_Physics (void)
 	prog->globals.server->frametime = sv.frametime;
 	PRVM_ExecuteProgram (prog->globals.server->StartFrame, "QC function StartFrame is missing");
 
+	// run physics engine
+	World_Physics_Frame(&sv.world, sv.frametime, sv_gravity.value);
+
 //
 // treat each object in turn
 //
@@ -2189,18 +2956,50 @@ void SV_Physics (void)
 	if (prog->globals.server->force_retouch > 0)
 		for (i = 1, ent = PRVM_EDICT_NUM(i);i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
 			if (!ent->priv.server->free)
-				SV_LinkEdict (ent, true);	// force retouch even for stationary
+				SV_LinkEdict_TouchAreaGrid(ent); // force retouch even for stationary
+
+	if (sv_gameplayfix_consistentplayerprethink.integer)
+	{
+		// run physics on the client entities in 3 stages
+		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)
+				SV_Physics_ClientEntity_PreThink(ent);
+
+		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)
+				SV_Physics_ClientEntity(ent);
 
-	// 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)
+		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)
+				SV_Physics_ClientEntity_PostThink(ent);
+	}
+	else
+	{
+		// 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)
+			{
+				SV_Physics_ClientEntity_PreThink(ent);
 				SV_Physics_ClientEntity(ent);
+				SV_Physics_ClientEntity_PostThink(ent);
+			}
+		}
+	}
 
 	// run physics on all the non-client entities
 	if (!sv_freezenonclients.integer)
+	{
 		for (;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
 			if (!ent->priv.server->free)
 				SV_Physics_Entity(ent);
+		// make a second pass to see if any ents spawned this frame and make
+		// sure they run their move/think
+		if (sv_gameplayfix_delayprojectiles.integer < 0)
+			for (i = svs.maxclients + 1, ent = PRVM_EDICT_NUM(i);i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
+				if (!ent->priv.server->move && !ent->priv.server->free)
+					SV_Physics_Entity(ent);
+	}
 
 	if (prog->globals.server->force_retouch > 0)
 		prog->globals.server->force_retouch = max(0, prog->globals.server->force_retouch - 1);
@@ -2215,7 +3014,7 @@ void SV_Physics (void)
 	}
 
 	// decrement prog->num_edicts if the highest number entities died
-	for (;PRVM_EDICT_NUM(prog->num_edicts - 1)->priv.server->free;prog->num_edicts--);
+	for (;PRVM_ED_CanAlloc(PRVM_EDICT_NUM(prog->num_edicts - 1));prog->num_edicts--);
 
 	if (!sv_freezenonclients.integer)
 		sv.time += sv.frametime;