X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=f592b08e40f53010a205140b5f0df78b95aaded5;hb=fe08cee338d3d75443d4705e071468b5f30a465f;hp=f79b104d52bccb5c41bdcc2a4550f8a425278cc3;hpb=ded1118040e7d6a4a7def619a550e458428ba94e;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index f79b104d..f592b08e 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -521,7 +521,7 @@ trace_t SV_PushEntity (edict_t *ent, vec3_t push, vec3_t pushangles)
 	ent->v->angles[1] += trace.fraction * pushangles[1];
 	SV_LinkEdict (ent, true);
 
-	if (trace.ent && (!((int)ent->v->flags & FL_ONGROUND) || ent->v->groundentity != EDICT_TO_PROG(trace.ent)))
+	if (trace.fraction < 1 && trace.ent && (!((int)ent->v->flags & FL_ONGROUND) || ent->v->groundentity != EDICT_TO_PROG(trace.ent)))
 		SV_Impact (ent, trace.ent);
 	return trace;
 }
@@ -778,10 +778,7 @@ void SV_Physics_Pusher (edict_t *ent)
 		pr_global_struct->self = EDICT_TO_PROG(ent);
 		pr_global_struct->other = EDICT_TO_PROG(sv.edicts);
 		PR_ExecuteProgram (ent->v->think, "NULL think function");
-		if (ent->e->free)
-			return;
 	}
-
 }
 
 
@@ -857,18 +854,18 @@ qboolean SV_CheckWater (edict_t *ent)
 
 	ent->v->waterlevel = 0;
 	ent->v->watertype = CONTENTS_EMPTY;
-	cont = Mod_PointContents(point, sv.worldmodel);
+	cont = SV_PointQ1Contents(point);
 	if (cont <= CONTENTS_WATER)
 	{
 		ent->v->watertype = cont;
 		ent->v->waterlevel = 1;
 		point[2] = ent->v->origin[2] + (ent->v->mins[2] + ent->v->maxs[2])*0.5;
-		cont = Mod_PointContents(point, sv.worldmodel);
+		cont = SV_PointQ1Contents(point);
 		if (cont <= CONTENTS_WATER)
 		{
 			ent->v->waterlevel = 2;
 			point[2] = ent->v->origin[2] + ent->v->view_ofs[2];
-			cont = Mod_PointContents(point, sv.worldmodel);
+			cont = SV_PointQ1Contents(point);
 			if (cont <= CONTENTS_WATER)
 				ent->v->waterlevel = 3;
 		}
@@ -889,19 +886,15 @@ void SV_WallFriction (edict_t *ent, float *stepnormal)
 	vec3_t forward, into, side;
 
 	AngleVectors (ent->v->v_angle, forward, NULL, NULL);
-	d = DotProduct (stepnormal, forward);
-
-	d += 0.5;
-	if (d >= 0)
-		return;
-
-	// cut the tangential velocity
-	i = DotProduct (stepnormal, ent->v->velocity);
-	VectorScale (stepnormal, i, into);
-	VectorSubtract (ent->v->velocity, into, side);
-
-	ent->v->velocity[0] = side[0] * (1 + d);
-	ent->v->velocity[1] = side[1] * (1 + d);
+	if ((d = DotProduct (stepnormal, forward) + 0.5) < 0)
+	{
+		// cut the tangential velocity
+		i = DotProduct (stepnormal, ent->v->velocity);
+		VectorScale (stepnormal, i, into);
+		VectorSubtract (ent->v->velocity, into, side);
+		ent->v->velocity[0] = side[0] * (1 + d);
+		ent->v->velocity[1] = side[1] * (1 + d);
+	}
 }
 
 /*
@@ -973,6 +966,8 @@ void SV_WalkMove (edict_t *ent)
 	vec3_t upmove, downmove, oldorg, oldvel, nosteporg, nostepvel, stepnormal;
 	trace_t downtrace;
 
+	SV_CheckVelocity(ent);
+
 	// do a regular slide move unless it looks like you ran into a step
 	oldonground = (int)ent->v->flags & FL_ONGROUND;
 	ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
@@ -982,6 +977,8 @@ void SV_WalkMove (edict_t *ent)
 
 	clip = SV_FlyMove (ent, sv.frametime, NULL);
 
+	SV_CheckVelocity(ent);
+
 	// if move didn't block on a step, return
 	if ( !(clip & 2) )
 		return;
@@ -997,10 +994,9 @@ void SV_WalkMove (edict_t *ent)
 			return;
 	}
 
-	if (sv_nostep.integer)
-		return;
+	SV_CheckVelocity(ent);
 
-	if ( (int)ent->v->flags & FL_WATERJUMP )
+	if (sv_nostep.integer || (int)ent->v->flags & FL_WATERJUMP )
 		return;
 
 	VectorCopy (ent->v->origin, nosteporg);
@@ -1059,6 +1055,8 @@ void SV_WalkMove (edict_t *ent)
 		VectorCopy (nosteporg, ent->v->origin);
 		VectorCopy (nostepvel, ent->v->velocity);
 	}
+
+	SV_CheckVelocity(ent);
 }
 
 //============================================================================
@@ -1107,25 +1105,6 @@ void SV_Physics_Follow (edict_t *ent)
 	SV_LinkEdict (ent, true);
 }
 
-/*
-=============
-SV_Physics_Noclip
-
-A moving object that doesn't obey physics
-=============
-*/
-void SV_Physics_Noclip (edict_t *ent)
-{
-	// regular thinking
-	if (!SV_RunThink (ent))
-		return;
-
-	VectorMA (ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles);
-	VectorMA (ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin);
-
-	SV_LinkEdict (ent, false);
-}
-
 /*
 ==============================================================================
 
@@ -1143,7 +1122,7 @@ SV_CheckWaterTransition
 void SV_CheckWaterTransition (edict_t *ent)
 {
 	int cont;
-	cont = Mod_PointContents(ent->v->origin, sv.worldmodel);
+	cont = SV_PointQ1Contents(ent->v->origin);
 	if (!ent->v->watertype)
 	{
 		// just spawned here
@@ -1168,7 +1147,7 @@ void SV_CheckWaterTransition (edict_t *ent)
 			SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 
 		ent->v->watertype = CONTENTS_EMPTY;
-		ent->v->waterlevel = cont;
+		ent->v->waterlevel = 0;
 	}
 }
 
@@ -1192,7 +1171,6 @@ void SV_Physics_Toss (edict_t *ent)
 // if onground, return without moving
 	if ((int)ent->v->flags & FL_ONGROUND)
 	{
-		VectorClear(ent->v->velocity);
 		if (ent->v->groundentity == 0)
 			return;
 		// if ent was supported by a brush model on previous frame,
@@ -1289,50 +1267,25 @@ will fall if the floor is pulled out from under them.
 */
 void SV_Physics_Step (edict_t *ent)
 {
-	int flags, fall, hitsound;
-
-	// freefall if not fly/swim
-	fall = true;
-	flags = (int)ent->v->flags;
-	if (flags & (FL_FLY | FL_SWIM))
+	// freefall if not onground/fly/swim
+	if (!((int)ent->v->flags & (FL_ONGROUND | FL_FLY | FL_SWIM)))
 	{
-		if (flags & FL_FLY)
-			fall = false;
-		else if ((flags & FL_SWIM) && Mod_PointContents(ent->v->origin, sv.worldmodel) != CONTENTS_EMPTY)
-			fall = false;
-	}
-	if (fall && (flags & FL_ONGROUND) && ent->v->groundentity == 0)
-		fall = false;
-
-	if (fall)
-	{
-		if (ent->v->velocity[2] < sv_gravity.value*-0.1)
-		{
-			hitsound = true;
-			if (flags & FL_ONGROUND)
-				hitsound = false;
-		}
-		else
-			hitsound = false;
+		int hitsound = ent->v->velocity[2] < sv_gravity.value * -0.1;
 
-		SV_AddGravity (ent);
-		SV_CheckVelocity (ent);
-		SV_FlyMove (ent, sv.frametime, NULL);
-		SV_LinkEdict (ent, false);
+		SV_AddGravity(ent);
+		SV_CheckVelocity(ent);
+		SV_FlyMove(ent, sv.frametime, NULL);
+		SV_LinkEdict(ent, false);
 
 		// just hit ground
-		if ((int)ent->v->flags & FL_ONGROUND)
-		{
-			VectorClear(ent->v->velocity);
-			if (hitsound)
-				SV_StartSound (ent, 0, "demon/dland2.wav", 255, 1);
-		}
+		if (hitsound && (int)ent->v->flags & FL_ONGROUND)
+			SV_StartSound(ent, 0, "demon/dland2.wav", 255, 1);
 	}
 
 // regular thinking
-	SV_RunThink (ent);
+	SV_RunThink(ent);
 
-	SV_CheckWaterTransition (ent);
+	SV_CheckWaterTransition(ent);
 }
 
 //============================================================================
@@ -1368,7 +1321,7 @@ void SV_Physics (void)
 
 		if (i > 0 && i <= svs.maxclients)
 		{
-			if (!svs.clients[i-1].active)
+			if (!svs.clients[i-1].spawned)
 				continue;
 			// connected slot
 			// call standard client pre-think
@@ -1394,17 +1347,15 @@ void SV_Physics (void)
 			SV_Physics_Follow (ent);
 			break;
 		case MOVETYPE_NOCLIP:
-			if (i > 0 && i <= svs.maxclients)
+			if (SV_RunThink(ent))
 			{
-				if (SV_RunThink (ent))
-				{
-					SV_CheckWater (ent);
-					VectorMA (ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin);
-					VectorMA (ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles);
-				}
+				SV_CheckWater(ent);
+				VectorMA(ent->v->origin, sv.frametime, ent->v->velocity, ent->v->origin);
+				VectorMA(ent->v->angles, sv.frametime, ent->v->avelocity, ent->v->angles);
 			}
-			else
-				SV_Physics_Noclip (ent);
+			// relink normal entities here, players always get relinked so don't relink twice
+			if (!(i > 0 && i <= svs.maxclients))
+				SV_LinkEdict(ent, false);
 			break;
 		case MOVETYPE_STEP:
 			SV_Physics_Step (ent);