X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=7863325352bb26b74021443293213d284c7e6e5e;hb=a0017eda3f6ec89608af44b0c1d3255befc354d3;hp=b62de11953fd02ba6afecc467c53c16d0d58b638;hpb=8a08fa2bc3ead266b6449b731f9a81be78ae0b56;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index b62de119..78633253 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1128,16 +1128,14 @@ 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;
-qboolean SV_Impact (prvm_edict_t *e1, trace_t *trace)
+void 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;
 
@@ -1145,8 +1143,6 @@ qboolean 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;
@@ -1179,8 +1175,6 @@ qboolean 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);
 }
 
 
@@ -1223,7 +1217,7 @@ If stepnormal is not NULL, the plane normal of any vertical wall hit will be sto
 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)
+static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, float *stepnormal, int hitsupercontentsmask, float stepheight)
 {
 	int blocked, bumpcount;
 	int i, j, numplanes;
@@ -1236,6 +1230,11 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo
 	if (time <= 0)
 		return 0;
 	gravity = 0;
+
+	if(sv_gameplayfix_nogravityonground.integer)
+		if((int)ent->fields.server->flags & FL_ONGROUND)
+			applygravity = false;
+
 	if (applygravity)
 	{
 		if (sv_gameplayfix_gravityunaffectedbyticrate.integer)
@@ -1260,9 +1259,6 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo
 			break;
 
 		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
@@ -1271,64 +1267,6 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo
 			break;
 		}
 
-#if 0
-		//if (trace.fraction < 0.002)
-		{
-#if 1
-			vec3_t start;
-			trace_t testtrace;
-			VectorCopy(ent->fields.server->origin, start);
-			start[2] += 3;//0.03125;
-			VectorMA(ent->fields.server->origin, time_left, ent->fields.server->velocity, end);
-			end[2] += 3;//0.03125;
-			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);
-				trace = testtrace;
-			}
-#endif
-#if 0
-			//j = -1;
-			for (i = 0;i < numplanes;i++)
-			{
-				VectorCopy(ent->fields.server->origin, start);
-				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_TraceBox(start, ent->fields.server->mins, ent->fields.server->maxs, end, MOVE_NORMAL, ent, hitsupercontentsmask);
-				if (trace.fraction < testtrace.fraction)
-				{
-					trace = testtrace;
-					VectorCopy(start, ent->fields.server->origin);
-					//j = i;
-				}
-			}
-			//if (j >= 0)
-			//	VectorAdd(ent->fields.server->origin, planes[j], start);
-#endif
-		}
-#endif
-
-#if 0
-		Con_Printf("entity %i bump %i: velocity %f %f %f trace %f", ent - prog->edicts, bumpcount, ent->fields.server->velocity[0], ent->fields.server->velocity[1], ent->fields.server->velocity[2], trace.fraction);
-		if (trace.fraction < 1)
-			Con_Printf(" : %f %f %f", trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]);
-		Con_Print("\n");
-#endif
-
-#if 0
-		if (trace.bmodelstartsolid)
-		{
-			// LordHavoc: note: this code is what makes entities stick in place
-			// if embedded in world only (you can walk through other objects if
-			// stuck)
-			// entity is trapped in another solid
-			VectorClear(ent->fields.server->velocity);
-			return 3;
-		}
-#endif
-
 		if (trace.fraction == 1)
 			break;
 		if (trace.plane.normal[2])
@@ -1348,9 +1286,43 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo
 				ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(trace.ent);
 			}
 		}
+		else if (stepheight)
+		{
+			// step - handle it immediately
+			vec3_t org;
+			vec3_t steppush;
+			trace_t steptrace;
+			trace_t steptrace2;
+			trace_t steptrace3;
+			//Con_Printf("step %f %f %f : ", ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
+			VectorSet(steppush, 0, 0, stepheight);
+			VectorCopy(ent->fields.server->origin, org);
+			SV_PushEntity(&steptrace, ent, steppush, false, false);
+			//Con_Printf("%f %f %f : ", ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
+			SV_PushEntity(&steptrace2, ent, push, false, false);
+			//Con_Printf("%f %f %f : ", ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
+			VectorSet(steppush, 0, 0, org[2] - ent->fields.server->origin[2]);
+			SV_PushEntity(&steptrace3, ent, steppush, false, false);
+			//Con_Printf("%f %f %f : ", ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
+			// accept the new position if it made some progress...
+			if (fabs(ent->fields.server->origin[0] - org[0]) >= 0.03125 || fabs(ent->fields.server->origin[1] - org[1]) >= 0.03125)
+			{
+				//Con_Printf("accepted (delta %f %f %f)\n", ent->fields.server->origin[0] - org[0], ent->fields.server->origin[1] - org[1], ent->fields.server->origin[2] - org[2]);
+				trace = steptrace2;
+				VectorCopy(ent->fields.server->origin, trace.endpos);
+				time_left *= 1 - trace.fraction;
+				numplanes = 0;
+				continue;
+			}
+			else
+			{
+				//Con_Printf("REJECTED (delta %f %f %f)\n", ent->fields.server->origin[0] - org[0], ent->fields.server->origin[1] - org[1], ent->fields.server->origin[2] - org[2]);
+				VectorCopy(org, ent->fields.server->origin);
+			}
+		}
 		else
 		{
-			// step
+			// step - return it to caller
 			blocked |= 2;
 			// save the trace for player extrafriction
 			if (stepnormal)
@@ -1388,47 +1360,42 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, flo
 		VectorCopy(trace.plane.normal, planes[numplanes]);
 		numplanes++;
 
-		if (sv_newflymove.integer)
-			ClipVelocity(ent->fields.server->velocity, trace.plane.normal, ent->fields.server->velocity, 1);
-		else
+		// modify original_velocity so it parallels all of the clip planes
+		for (i = 0;i < numplanes;i++)
 		{
-			// modify original_velocity so it parallels all of the clip planes
-			for (i = 0;i < numplanes;i++)
+			ClipVelocity(original_velocity, planes[i], new_velocity, 1);
+			for (j = 0;j < numplanes;j++)
 			{
-				ClipVelocity(original_velocity, planes[i], new_velocity, 1);
-				for (j = 0;j < numplanes;j++)
+				if (j != i)
 				{
-					if (j != i)
-					{
-						// not ok
-						if (DotProduct(new_velocity, planes[j]) < 0)
-							break;
-					}
+					// not ok
+					if (DotProduct(new_velocity, planes[j]) < 0)
+						break;
 				}
-				if (j == numplanes)
-					break;
 			}
+			if (j == numplanes)
+				break;
+		}
 
-			if (i != numplanes)
-			{
-				// go along this plane
-				VectorCopy(new_velocity, ent->fields.server->velocity);
-			}
-			else
+		if (i != numplanes)
+		{
+			// go along this plane
+			VectorCopy(new_velocity, ent->fields.server->velocity);
+		}
+		else
+		{
+			// go along the crease
+			if (numplanes != 2)
 			{
-				// go along the crease
-				if (numplanes != 2)
-				{
-					VectorClear(ent->fields.server->velocity);
-					blocked = 7;
-					break;
-				}
-				CrossProduct(planes[0], planes[1], dir);
-				// LordHavoc: thanks to taniwha of QuakeForge for pointing out this fix for slowed falling in corners
-				VectorNormalize(dir);
-				d = DotProduct(dir, ent->fields.server->velocity);
-				VectorScale(dir, d, ent->fields.server->velocity);
+				VectorClear(ent->fields.server->velocity);
+				blocked = 7;
+				break;
 			}
+			CrossProduct(planes[0], planes[1], dir);
+			// LordHavoc: thanks to taniwha of QuakeForge for pointing out this fix for slowed falling in corners
+			VectorNormalize(dir);
+			d = DotProduct(dir, ent->fields.server->velocity);
+			VectorScale(dir, d, ent->fields.server->velocity);
 		}
 
 		// if current velocity is against the original velocity,
@@ -1500,7 +1467,7 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q
 {
 	int type;
 	int bump;
-	vec3_t original;
+	vec3_t original, original_velocity;
 	vec3_t end;
 
 	VectorCopy(ent->fields.server->origin, original);
@@ -1530,8 +1497,11 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q
 	if (trace->bmodelstartsolid && failonbmodelstartsolid)
 		return true;
 
-
 	VectorCopy (trace->endpos, ent->fields.server->origin);
+
+	VectorCopy(ent->fields.server->origin, original);
+	VectorCopy(ent->fields.server->velocity, original_velocity);
+
 	SV_LinkEdict(ent);
 
 #if 0
@@ -1546,9 +1516,9 @@ static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, q
 		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);
+		SV_Impact (ent, trace);
 
-	return true;
+	return VectorCompare(ent->fields.server->origin, original) && VectorCompare(ent->fields.server->velocity, original_velocity);
 }
 
 
@@ -2174,7 +2144,13 @@ Only used by players
 */
 void SV_WalkMove (prvm_edict_t *ent)
 {
-	int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity, hitsupercontentsmask, type;
+	int clip;
+	int oldonground;
+	//int originalmove_clip;
+	int originalmove_flags;
+	int originalmove_groundentity;
+	int hitsupercontentsmask;
+	int type;
 	vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity;
 	trace_t downtrace, trace;
 	qboolean applygravity;
@@ -2198,7 +2174,7 @@ 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, applygravity, NULL, hitsupercontentsmask);
+	clip = SV_FlyMove (ent, sv.frametime, applygravity, NULL, hitsupercontentsmask, sv_gameplayfix_stepmultipletimes.integer ? sv_stepheight.value : 0);
 
 	if(sv_gameplayfix_downtracesupportsongroundflag.integer)
 	if(!(clip & 1))
@@ -2238,7 +2214,7 @@ void SV_WalkMove (prvm_edict_t *ent)
 
 	VectorCopy(ent->fields.server->origin, originalmove_origin);
 	VectorCopy(ent->fields.server->velocity, originalmove_velocity);
-	originalmove_clip = clip;
+	//originalmove_clip = clip;
 	originalmove_flags = (int)ent->fields.server->flags;
 	originalmove_groundentity = ent->fields.server->groundentity;
 
@@ -2277,7 +2253,7 @@ void SV_WalkMove (prvm_edict_t *ent)
 
 		// move forward
 		ent->fields.server->velocity[2] = 0;
-		clip = SV_FlyMove (ent, sv.frametime, applygravity, stepnormal, hitsupercontentsmask);
+		clip = SV_FlyMove (ent, sv.frametime, applygravity, stepnormal, hitsupercontentsmask, 0);
 		ent->fields.server->velocity[2] += start_velocity[2];
 		if(clip & 8)
 		{
@@ -2653,7 +2629,7 @@ void SV_Physics_Step (prvm_edict_t *ent)
 			{
 				ent->fields.server->flags -= FL_ONGROUND;
 				SV_CheckVelocity(ent);
-				SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent));
+				SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent), 0);
 				SV_LinkEdict(ent);
 				SV_LinkEdict_TouchAreaGrid(ent);
 				ent->priv.server->waterposition_forceupdate = true;
@@ -2665,7 +2641,7 @@ void SV_Physics_Step (prvm_edict_t *ent)
 			int hitsound = ent->fields.server->velocity[2] < sv_gravity.value * -0.1;
 
 			SV_CheckVelocity(ent);
-			SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent));
+			SV_FlyMove(ent, sv.frametime, true, NULL, SV_GenericHitSuperContentsMask(ent), 0);
 			SV_LinkEdict(ent);
 			SV_LinkEdict_TouchAreaGrid(ent);