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

Permit friendly fire against craft that are disabled.

This commit is contained in:
Steve 2016-05-02 11:58:43 +01:00
parent db78edb5a3
commit 76fff0707e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/bullets.c
View File

@ -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 != 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; b->damage = 0;
} }