From e577d7e16f6952f00e7adeadb5c16aecbe3cd4b3 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 7 Mar 2018 21:37:54 +0000 Subject: [PATCH] Don't allow Bob and Teeka to shoot one another. --- src/entities/bullets/bullet.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/entities/bullets/bullet.c b/src/entities/bullets/bullet.c index 0dcf73b..7afab56 100644 --- a/src/entities/bullets/bullet.c +++ b/src/entities/bullets/bullet.c @@ -101,14 +101,10 @@ static void touch(Entity *other) canHit = ( other != b->owner && (!(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) { swapSelf(other);