rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No kicking teammates in TP

This commit is contained in:
Richard Allen 2002-03-03 02:20:58 +00:00
parent 440a4a69f5
commit cfe94c1d40
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reaction/game/g_weapon.c
View File

@ -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;