walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Don't allow Bob and Teeka to shoot one another.

This commit is contained in:
Steve 2018-03-07 21:37:54 +00:00
parent 9270607d6e
commit e577d7e16f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/entities/bullets/bullet.c
View File

@ -101,14 +101,10 @@ static void touch(Entity *other)
canHit = ( canHit = (
other != b->owner && other != b->owner &&
(!(other->flags & EF_IGNORE_BULLETS)) && (!(other->flags & EF_IGNORE_BULLETS)) &&
b->owner->type != other->type b->owner->type != other->type &&
!((b->owner->type == ET_TEEKA && other->type == ET_BOB) || (b->owner->type == ET_BOB && other->type == ET_TEEKA))
); );
if (b->owner->type == ET_TEEKA && other->type == ET_BOB)
{
canHit = 0;
}
if (canHit) if (canHit)
{ {
swapSelf(other); swapSelf(other);