rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-10 23:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Players can now use the kill cmd, plummet and kill teammates after rounds in

Browse source 
tp without loosing frags.
This commit is contained in:
Richard Allen 2002-08-27 07:50:55 +00:00
parent 3d32afa310
commit f5c7b279a5
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/ChangeLog
View file

@ -55,6 +55,7 @@
* Removed the cd key menu * Removed the cd key menu
* Fixed dropped weapons and items blocking doors and other movers. * Fixed dropped weapons and items blocking doors and other movers.
* Added ref say command to talk to everyone, dead or alive * Added ref say command to talk to everyone, dead or alive
* Players can now use the kill cmd, plummet and kill teammates after rounds in tp without loosing frags.

8
reaction/game/g_combat.c
View file

@ -5,6 +5,10 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.122 2002/08/27 07:50:55 jbravo
// Players can now use the kill cmd, plummet and kill teammates after rounds in
// tp without loosing frags.
//
// Revision 1.121 2002/08/27 01:25:22 jbravo // Revision 1.121 2002/08/27 01:25:22 jbravo
// Fixed scoring in TOURNAMENT mode and made it a legit gametype. // Fixed scoring in TOURNAMENT mode and made it a legit gametype.
// //
@ -1302,6 +1306,8 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
ResetKills(self); ResetKills(self);
// JBravo: make it OK to frag teammates after rounds are over. // JBravo: make it OK to frag teammates after rounds are over.
if (attacker == self) { if (attacker == self) {
if (g_gametype.integer == GT_TEAMPLAY && !level.team_round_going) {
} else
AddScore(attacker, self->r.currentOrigin, -1); AddScore(attacker, self->r.currentOrigin, -1);
} else if (OnSameTeam(self, attacker)) { } else if (OnSameTeam(self, attacker)) {
if (g_gametype.integer == GT_TEAMPLAY && level.team_round_going) { if (g_gametype.integer == GT_TEAMPLAY && level.team_round_going) {
@ -1372,6 +1378,8 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
attacker->client->lastKillTime = level.time; attacker->client->lastKillTime = level.time;
} }
} else { } else {
if (g_gametype.integer == GT_TEAMPLAY && !level.team_round_going) {
} else
AddScore(self, self->r.currentOrigin, -1); AddScore(self, self->r.currentOrigin, -1);
} }