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

Bob's laser should ignore Teeka.

This commit is contained in:
Steve 2018-03-31 19:04:34 +01:00
parent 14dbe2b39c
commit 55b163873d
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/entities/bullets/laser.c
View File

@ -48,14 +48,21 @@ static void tick(void)
static void touch(Entity *other) static void touch(Entity *other)
{ {
Bullet *b; Bullet *b;
int canHit;
b = (Bullet*)self; b = (Bullet*)self;
if (b->alive == ALIVE_ALIVE) if (b->alive == ALIVE_ALIVE)
{ {
if (other != b->owner) canHit = (
{ other != NULL &&
if (other != NULL && (!(other->flags & EF_IGNORE_BULLETS)) && b->owner->type != other->type) other != b->owner &&
(!(other->flags & EF_IGNORE_BULLETS)) &&
b->owner->type != other->type &&
!((b->owner->type == ET_TEEKA && other->type == ET_BOB) || (b->owner->type == ET_BOB && other->type == ET_TEEKA))
);
if (canHit)
{ {
if (other->flags & EF_EXPLODES) if (other->flags & EF_EXPLODES)
{ {
@ -86,5 +93,4 @@ static void touch(Entity *other)
} }
} }
} }
}
} }