mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
Fix autoaim. Oops.
git-svn-id: https://svn.eduke32.com/eduke32@5854 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
b3273dbebf
commit
07cbae15c9
1 changed files with 4 additions and 4 deletions
|
@ -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])
|
for (bssize_t spriteNum=headspritestat[aimstats[k]]; spriteNum >= 0; spriteNum=nextspritestat[spriteNum])
|
||||||
{
|
{
|
||||||
if ((sprite[spriteNum].xrepeat > 0 && sprite[spriteNum].extra >= 0 &&
|
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))
|
(A_CheckEnemySprite(&sprite[spriteNum]) || k < 2))
|
||||||
{
|
{
|
||||||
if (A_CheckEnemySprite(&sprite[spriteNum]) || PN(spriteNum) == APLAYER || PN(spriteNum) == SHARK)
|
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)))
|
(GTFLAGS(GAMETYPE_TDM) && g_player[P_Get(spriteNum)].ps->team == g_player[playerNum].ps->team)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ((gotShrinker && sprite[spriteNum].xrepeat < 30) || PN(spriteNum) == SHARK ||
|
if ((gotShrinker && sprite[spriteNum].xrepeat < 30)
|
||||||
!(PN(spriteNum) >= GREENSLIME && PN(spriteNum) <= GREENSLIME + 7) ||
|
&& (PN(spriteNum) == SHARK || (!(PN(spriteNum) >= GREENSLIME && PN(spriteNum) <= GREENSLIME + 7)))
|
||||||
(gotFreezer && sprite[spriteNum].pal == 1))
|
|| (gotFreezer && sprite[spriteNum].pal == 1))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue