From 07cbae15c9e69dafd263edc14ddc36404f111612 Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 6 Sep 2016 04:25:36 +0000 Subject: [PATCH] Fix autoaim. Oops. git-svn-id: https://svn.eduke32.com/eduke32@5854 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 1ad38594b..b4387fc19 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -249,7 +249,7 @@ static int A_FindTargetSprite(const spritetype *pSprite, int projAng, int projec for (bssize_t spriteNum=headspritestat[aimstats[k]]; spriteNum >= 0; spriteNum=nextspritestat[spriteNum]) { if ((sprite[spriteNum].xrepeat > 0 && sprite[spriteNum].extra >= 0 && - (sprite[spriteNum].cstat & (257 + 32768)) == 257) || + (sprite[spriteNum].cstat & (257 + 32768)) == 257) && (A_CheckEnemySprite(&sprite[spriteNum]) || k < 2)) { if (A_CheckEnemySprite(&sprite[spriteNum]) || PN(spriteNum) == APLAYER || PN(spriteNum) == SHARK) @@ -259,9 +259,9 @@ 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) || - (gotFreezer && sprite[spriteNum].pal == 1)) + if ((gotShrinker && sprite[spriteNum].xrepeat < 30) + && (PN(spriteNum) == SHARK || (!(PN(spriteNum) >= GREENSLIME && PN(spriteNum) <= GREENSLIME + 7))) + || (gotFreezer && sprite[spriteNum].pal == 1)) continue; }