From cfe94c1d404ce0ad760824209be7e7622a3af1b0 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Sun, 3 Mar 2002 02:20:58 +0000
Subject: [PATCH] No kicking teammates in TP

---
 reaction/game/g_weapon.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/reaction/game/g_weapon.c b/reaction/game/g_weapon.c
index 10a601b4..62274b0f 100644
--- a/reaction/game/g_weapon.c
+++ b/reaction/game/g_weapon.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.36  2002/03/03 02:20:58  jbravo
+// No kicking teammates in TP
+//
 // Revision 1.35  2002/01/27 14:02:51  jbravo
 // Make the right effect when rounds hit the new SURF_HARDMETAL surface.
 //
@@ -102,6 +105,13 @@ qboolean JumpKick( gentity_t *ent )
 		return qfalse;
 	}
 
+// JBravo: no kicking teammates while rounds are going
+	if (g_gametype.integer == GT_TEAMPLAY) {
+		if (ent->client->sess.sessionTeam == traceEnt->client->sess.sessionTeam &&
+			level.team_round_going)
+				return qfalse;
+	}
+
 	if (ent->client->ps.powerups[PW_QUAD] ) {
 		G_AddEvent( ent, EV_POWERUP_QUAD, 0 );
 		s_quadFactor = g_quadfactor.value;