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

FF 2 fix for CTB

Browse source
This commit is contained in:
Richard Allen 2002-07-20 18:26:25 +00:00
parent 844a57b5b5
commit 0c8231a740
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.111 2002/07/20 18:26:25 jbravo
// FF 2 fix for CTB
//
// Revision 1.110 2002/07/20 02:25:53 jbravo
// Added the AQDT CTB sounds to the base radio paks
//
@ -2020,6 +2023,8 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (g_gametype.integer == GT_TEAMPLAY && g_friendlyFire.integer == 2 && level.team_round_going) {
return;
}
if (g_gametype.integer == GT_CTF && g_friendlyFire.integer == 2)
return;
if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer == GT_CTF)
Add_TeamWound(attacker, targ, mod);
}