zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 00:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not target teammates (#187)

Browse source
This commit is contained in:
CommonLoon102 2019-09-22 16:17:06 +00:00 committed by Christoph Oelckers
parent a9fcee742d
commit c2e8cc6607
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/blood/src/weapon.cpp
View file

@ -325,6 +325,8 @@ void UpdateAimVector(PLAYER * pPlayer)
pSprite = &sprite[nSprite]; pSprite = &sprite[nSprite];
if (pSprite == pPSprite) if (pSprite == pPSprite)
continue; continue;
if (!gGameOptions.bFriendlyFire && IsTargetTeammate(pPlayer, pSprite))
continue;
if (pSprite->hitag&32) if (pSprite->hitag&32)
continue; continue;
if (!(pSprite->hitag&8)) if (!(pSprite->hitag&8))
@ -379,6 +381,8 @@ void UpdateAimVector(PLAYER * pPlayer)
for (nSprite = headspritestat[4]; nSprite >= 0; nSprite = nextspritestat[nSprite]) for (nSprite = headspritestat[4]; nSprite >= 0; nSprite = nextspritestat[nSprite])
{ {
pSprite = &sprite[nSprite]; pSprite = &sprite[nSprite];
if (!gGameOptions.bFriendlyFire && IsTargetTeammate(pPlayer, pSprite))
continue;
if (!(pSprite->hitag&8)) if (!(pSprite->hitag&8))
continue; continue;
int x2 = pSprite->x; int x2 = pSprite->x;