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

can return case with any weapon in hand

This commit is contained in:
Bryce Hutchings 2002-07-19 04:29:02 +00:00
parent 4b3295f1be
commit 9c52ce8f10
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reaction/game/g_team.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.12 2002/07/19 04:29:02 niceass
// can return case with any weapon in hand
//
// Revision 1.11 2002/06/29 04:15:15 jbravo
// CTF is now CTB. no weapons while the case is in hand other than pistol or knife
//
@ -804,10 +807,6 @@ int Pickup_Team(gentity_t * ent, gentity_t * other)
int team;
gclient_t *cl = other->client;
// JBravo: no picking up case if you have a two handed weapon.
if (other->client->ps.weapon != WP_PISTOL && other->client->ps.weapon != WP_KNIFE) {
return 0;
}
// figure out what team this flag is
if (strcmp(ent->classname, "team_CTF_redflag") == 0) {
team = TEAM_RED;
@ -817,6 +816,12 @@ int Pickup_Team(gentity_t * ent, gentity_t * other)
PrintMsg(other, "Don't know what team the flag is on.\n");
return 0;
}
// JBravo: no picking up [the enemy case-NiceAss] case if you have a two handed weapon.
if (other->client->ps.weapon != WP_PISTOL && other->client->ps.weapon != WP_KNIFE &&
team != cl->sess.sessionTeam) {
return 0;
}
// GT_CTF
if (team == cl->sess.sessionTeam) {
return Team_TouchOurFlag(ent, other, team);