From 7ae37ce9f0f14e9cbd718b778c7715f0c7dfd7b7 Mon Sep 17 00:00:00 2001
From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 4 Mar 2002 11:09:40 +0000
Subject: [PATCH] greatly improved movetype bounce stopping check to consider
 the angle of the surface

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1607 d7cf8633-e32d-0410-b094-e92efae38249
---
 sv_phys.c | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/sv_phys.c b/sv_phys.c
index d4f73a31..ff2b16c3 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1164,7 +1164,7 @@ 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);
 
@@ -1195,13 +1195,13 @@ void SV_CheckWaterTransition (edict_t *ent)
 		ent->v.waterlevel = 1;
 		return;
 	}
-	
+
 	if (cont <= CONTENTS_WATER)
 	{
 		if (ent->v.watertype == CONTENTS_EMPTY)
 		{	// just crossed into water
 			SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
-		}		
+		}
 		ent->v.watertype = cont;
 		ent->v.waterlevel = 1;
 	}
@@ -1210,7 +1210,7 @@ void SV_CheckWaterTransition (edict_t *ent)
 		if (ent->v.watertype != CONTENTS_EMPTY)
 		{	// just crossed into water
 			SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
-		}		
+		}
 		ent->v.watertype = CONTENTS_EMPTY;
 		ent->v.waterlevel = cont;
 	}
@@ -1275,11 +1275,30 @@ void SV_Physics_Toss (edict_t *ent)
 	ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, backoff);
 
 // stop if on ground
-	if (trace.plane.normal[2] > 0.7)
+	if (ent->v.movetype == MOVETYPE_BOUNCEMISSILE)
+		ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
+	else if (ent->v.movetype == MOVETYPE_BOUNCE)
+	{
+		if (trace.plane.normal[2] > 0.7)
+		{
+			// LordHavoc: fixed grenades not bouncing when fired down a slope
+			if (DotProduct(trace.plane.normal, ent->v.velocity) < 100)
+			//if (ent->v.velocity[2] < 60)
+			{
+				ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
+				ent->v.groundentity = EDICT_TO_PROG(trace.ent);
+				VectorClear (ent->v.velocity);
+				VectorClear (ent->v.avelocity);
+			}
+			else
+				ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
+		}
+		else
+			ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
+	}
+	else
 	{
-		// LordHavoc: fixed grenades not bouncing when fired down a slope
-		if (fabs(ent->v.velocity[2]) < 60 || (ent->v.movetype != MOVETYPE_BOUNCE && ent->v.movetype != MOVETYPE_BOUNCEMISSILE))
-		//if (ent->v.velocity[2] < 60 || (ent->v.movetype != MOVETYPE_BOUNCE && ent->v.movetype != MOVETYPE_BOUNCEMISSILE))
+		if (trace.plane.normal[2] > 0.7)
 		{
 			ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
 			ent->v.groundentity = EDICT_TO_PROG(trace.ent);
@@ -1289,8 +1308,6 @@ void SV_Physics_Toss (edict_t *ent)
 		else
 			ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
 	}
-	else
-		ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
 
 // check for in water
 	SV_CheckWaterTransition (ent);
@@ -1427,9 +1444,9 @@ void SV_Physics (void)
 			break;
 		}
 	}
-	
+
 	if (pr_global_struct->force_retouch)
-		pr_global_struct->force_retouch--;	
+		pr_global_struct->force_retouch--;
 
 	// LordHavoc: endframe support
 	if (EndFrameQC)
-- 
2.39.2