From 76fff0707e81c06b0750e200c185f209d82f5daa Mon Sep 17 00:00:00 2001 From: Steve Date: Mon, 2 May 2016 11:58:43 +0100 Subject: [PATCH] Permit friendly fire against craft that are disabled. --- src/battle/bullets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle/bullets.c b/src/battle/bullets.c index 6af5c0a..e324b85 100644 --- a/src/battle/bullets.c +++ b/src/battle/bullets.c @@ -166,7 +166,7 @@ static void checkCollisions(Bullet *b) if (b->owner != e && e->health > 0 && collision(b->x - b->w / 2, b->y - b->h / 2, b->w, b->h, e->x - e->w / 2, e->y - e->h / 2, e->w, e->h)) { - if (b->owner->side == e->side && !app.gameplay.friendlyFire) + if (b->owner->side == e->side && !app.gameplay.friendlyFire && (!(e->flags & EF_DISABLED))) { b->damage = 0; }