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

Make it OK to frag teammates after rounds are over (no -1)

This commit is contained in:
Richard Allen 2002-02-24 18:49:21 +00:00
parent bede62fd3b
commit f3c0f0548d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
reaction/game/g_combat.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.44 2002/02/24 18:49:21 jbravo
// Make it OK to frag teammates after rounds are over (no -1)
//
// Revision 1.43 2002/02/22 02:13:13 jbravo
// Fixed a few bugs and did some cleanups
//
@ -768,7 +771,6 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
break;
// JBravo: adding a default here to catch potential bugs
default:
G_Printf("Unknown Means of Death!\n");
break;
}
@ -782,8 +784,11 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
if (attacker && attacker->client) {
attacker->client->lastkilled_client = self->s.number;
// JBravo: make it OK to frag teammates after rounds are over.
if (attacker == self || OnSameTeam (self, attacker)) {
AddScore(attacker, self->r.currentOrigin, -1);
if (level.team_round_going) {
AddScore(attacker, self->r.currentOrigin, -1);
}
} else {
// Increase number of kills this life for attacker
// JBravo: unless we are in teamplay