can return case with any weapon in hand
This commit is contained in:
parent
4b3295f1be
commit
9c52ce8f10
|
@ -5,6 +5,9 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
// $Log$
|
// $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
|
// 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
|
// 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;
|
int team;
|
||||||
gclient_t *cl = other->client;
|
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
|
// figure out what team this flag is
|
||||||
if (strcmp(ent->classname, "team_CTF_redflag") == 0) {
|
if (strcmp(ent->classname, "team_CTF_redflag") == 0) {
|
||||||
team = TEAM_RED;
|
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");
|
PrintMsg(other, "Don't know what team the flag is on.\n");
|
||||||
return 0;
|
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
|
// GT_CTF
|
||||||
if (team == cl->sess.sessionTeam) {
|
if (team == cl->sess.sessionTeam) {
|
||||||
return Team_TouchOurFlag(ent, other, team);
|
return Team_TouchOurFlag(ent, other, team);
|
||||||
|
|
Loading…
Reference in New Issue