X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=978768fe907c13f954da50f14300cf2cfe70009a;hb=2f70889e776978ab1746211afc7723e04140fe4b;hp=f85429b4dbed37ac37aa7d138a6ca20dcb1ab1dd;hpb=16742571f9a7d696a654668febdc10b4f4affd57;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index f85429b4..978768fe 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -39,44 +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"};
-cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0", "disables collision detection optimizations for debugging purposes"};
-
-cvar_t sv_sound_watersplash = {0, "sv_sound_watersplash", "misc/h2ohit1.wav", "sound to play when MOVETYPE_FLY/TOSS/BOUNCE/STEP entity enters or leaves water (empty cvar disables the sound)"};
-cvar_t sv_sound_land = {0, "sv_sound_land", "demon/dland2.wav", "sound to play when MOVETYPE_STEP entity hits the ground at high speed (empty cvar disables the sound)"};
-
-// TODO: move this extern to server.h
-extern cvar_t sv_clmovement_waitforinput;
-
 #define	MOVE_EPSILON	0.01
 
 void SV_Physics_Toss (prvm_edict_t *ent);
 
-void SV_Phys_Init (void)
-{
-	Cvar_RegisterVariable(&sv_stepheight);
-	Cvar_RegisterVariable(&sv_jumpstep);
-	Cvar_RegisterVariable(&sv_wallfriction);
-	Cvar_RegisterVariable(&sv_newflymove);
-	Cvar_RegisterVariable(&sv_freezenonclients);
-	Cvar_RegisterVariable(&sv_playerphysicsqc);
-	Cvar_RegisterVariable(&sv_debugmove);
-
-	Cvar_RegisterVariable(&sv_sound_watersplash);
-	Cvar_RegisterVariable(&sv_sound_land);
-}
-
 /*
 ===============================================================================
 
@@ -102,6 +68,8 @@ int SV_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 		}
 		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;
 	}
@@ -121,7 +89,7 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 #endif
 {
 	vec3_t hullmins, hullmaxs;
-	int i;
+	int i, bodysupercontents;
 	int passedictprog;
 	qboolean pointtrace;
 	prvm_edict_t *traceowner, *touch;
@@ -240,6 +208,8 @@ 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
 		model = NULL;
 		if ((int) touch->fields.server->solid == SOLID_BSP || type == MOVE_HITMODEL)
@@ -248,15 +218,17 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 			// 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];
-			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);
 		}
+		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, SUPERCONTENTS_BODY, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
+			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, SUPERCONTENTS_BODY, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
+			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);
 	}
 
@@ -297,7 +269,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)
 	{
@@ -371,7 +343,7 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 		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])
@@ -453,9 +425,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, SUPERCONTENTS_SOLID);
+	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
@@ -465,10 +440,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;}
@@ -483,8 +459,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;
 }
 
 /*
@@ -509,7 +488,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");
 	}
 }
@@ -544,6 +523,8 @@ int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents)
 				PRVM_G_FLOAT(OFS_PARM0) = ent->fields.server->watertype;
 				// New Contents
 				PRVM_G_FLOAT(OFS_PARM1) = nContents;
+				// Assign Self
+				prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
 			// Execute VM Function
 			PRVM_ExecuteProgram(contentstransition->function, "contentstransition: NULL function");
 		}
@@ -604,22 +585,27 @@ Returns false if the entity removed itself.
 */
 qboolean SV_RunThink (prvm_edict_t *ent)
 {
-	float thinktime;
-
-	thinktime = ent->fields.server->nextthink;
-	if (thinktime <= 0 || thinktime > sv.time + sv.frametime)
-		return true;
+	int iterations;
 
 	// don't let things stay in the past.
 	// it is possible to start that way by a trigger with a local time.
-	if (thinktime < sv.time)
-		thinktime = sv.time;
+	if (ent->fields.server->nextthink <= 0 || ent->fields.server->nextthink > sv.time + sv.frametime)
+		return true;
 
-	ent->fields.server->nextthink = 0;
-	prog->globals.server->time = thinktime;
-	prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
-	prog->globals.server->other = PRVM_EDICT_TO_PROG(prog->edicts);
-	PRVM_ExecuteProgram (ent->fields.server->think, "QC function self.think is missing");
+	for (iterations = 0;iterations < 128  && !ent->priv.server->free;iterations++)
+	{
+		prog->globals.server->time = max(sv.time, ent->fields.server->nextthink);
+		ent->fields.server->nextthink = 0;
+		prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
+		prog->globals.server->other = PRVM_EDICT_TO_PROG(prog->edicts);
+		PRVM_ExecuteProgram (ent->fields.server->think, "QC function self.think is missing");
+		// mods often set nextthink to time to cause a think every frame,
+		// we don't want to loop in that case, so exit if the new nextthink is
+		// <= the time the qc was told, also exit if it is past the end of the
+		// frame
+		if (ent->fields.server->nextthink <= prog->globals.server->time || ent->fields.server->nextthink > sv.time + sv.frametime || !sv_gameplayfix_multiplethinksperframe.integer)
+			break;
+	}
 	return !ent->priv.server->free;
 }
 
@@ -631,14 +617,17 @@ Two entities have touched, so run their touch functions
 ==================
 */
 extern void VM_SetTraceGlobals(const trace_t *trace);
+extern sizebuf_t vm_tempstringsbuf;
 void SV_Impact (prvm_edict_t *e1, trace_t *trace)
 {
+	int restorevm_tempstringsbuf_cursize;
 	int old_self, old_other;
 	prvm_edict_t *e2 = (prvm_edict_t *)trace->ent;
 	prvm_eval_t *val;
 
 	old_self = prog->globals.server->self;
 	old_other = prog->globals.server->other;
+	restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
 
 	VM_SetTraceGlobals(trace);
 
@@ -671,6 +660,7 @@ 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;
 }
 
 
@@ -803,13 +793,7 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal, int hitsuperco
 			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])
 		{
@@ -1022,6 +1006,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 	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])
 	{
@@ -1141,6 +1126,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
@@ -1149,16 +1135,11 @@ 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
-			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, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+			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;
 		}
@@ -1179,7 +1160,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;
@@ -1189,8 +1170,14 @@ 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
-		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, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+		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
@@ -1201,7 +1188,7 @@ 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;
-			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, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+			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
@@ -1211,7 +1198,7 @@ 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;
-				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, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+				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
@@ -1235,7 +1222,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);
@@ -1303,6 +1290,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
@@ -1313,71 +1330,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));
 }
@@ -1527,7 +1527,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;
 
@@ -1536,16 +1536,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, SV_GenericHitSuperContentsMask(ent));
+	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);
 
@@ -1593,7 +1598,7 @@ void SV_WalkMove (prvm_edict_t *ent)
 
 		// move forward
 		ent->fields.server->velocity[2] = 0;
-		clip = SV_FlyMove (ent, sv.frametime, stepnormal, SV_GenericHitSuperContentsMask(ent));
+		clip = SV_FlyMove (ent, sv.frametime, stepnormal, hitsupercontentsmask);
 		ent->fields.server->velocity[2] += start_velocity[2];
 
 		SV_CheckVelocity(ent);
@@ -1622,8 +1627,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
@@ -1635,7 +1640,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)
@@ -1985,7 +1990,7 @@ static void SV_Physics_Entity (prvm_edict_t *ent)
 	case MOVETYPE_FLYMISSILE:
 	case MOVETYPE_FLY:
 		// regular thinking
-		if (SV_RunThink (ent) && runmove)
+		if (SV_RunThink (ent) && (runmove || !sv_gameplayfix_delayprojectiles.integer))
 			SV_Physics_Toss (ent);
 		break;
 	default:
@@ -1994,20 +1999,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
@@ -2016,6 +2076,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);
@@ -2037,18 +2098,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);
@@ -2061,31 +2122,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;
+	}
 }
 
 /*
@@ -2118,19 +2193,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)