qf/game-source
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/game-source synced 2025-04-06 07:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

make intended precedence explicit

Browse source
This commit is contained in:
Bill Currie 2003-09-23 16:36:35 +00:00
parent 3493b80dd0
commit 698f7e322d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ctf/src/client.qc
View file

@ -1725,10 +1725,10 @@ void(entity targ, entity attacker) ClientObituary =
bprint("'s flag carrier\n");
}
}
if (((attacker.team == TEAM_COLOR1) &&
(head.classname == "item_flag_team1")) ||
((attacker.team == TEAM_COLOR2) &&
(head.classname == "item_flag_team2"))
if ((((attacker.team == TEAM_COLOR1)
&& (head.classname == "item_flag_team1"))
|| ((attacker.team == TEAM_COLOR2)
&& (head.classname == "item_flag_team2")))
&& (!flag_radius)) { // prevents redundant points awarded
// target was near attacker's flag
attacker.frags = attacker.frags +

2
ctf/src/triggers.qc
View file

@ -630,7 +630,7 @@ void() trigger_push =
void() trigger_monsterjump_touch =
{
if ( other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER )
if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER )
return;
// set XY even if not on ground, so the jump will clear lips