From dcbb2891ae2a66252a60820987213e98bef03272 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 16 Sep 2016 21:55:24 +0000 Subject: [PATCH] Fix warning: suggest parentheses around '&&' within '||' [-Wparentheses] git-svn-id: https://svn.eduke32.com/eduke32@5863 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index b4387fc19..02fea35fa 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -259,8 +259,8 @@ static int A_FindTargetSprite(const spritetype *pSprite, int projAng, int projec (GTFLAGS(GAMETYPE_TDM) && g_player[P_Get(spriteNum)].ps->team == g_player[playerNum].ps->team))) continue; - if ((gotShrinker && sprite[spriteNum].xrepeat < 30) - && (PN(spriteNum) == SHARK || (!(PN(spriteNum) >= GREENSLIME && PN(spriteNum) <= GREENSLIME + 7))) + if ((gotShrinker && sprite[spriteNum].xrepeat < 30 + && (PN(spriteNum) == SHARK || !(PN(spriteNum) >= GREENSLIME && PN(spriteNum) <= GREENSLIME + 7))) || (gotFreezer && sprite[spriteNum].pal == 1)) continue; }