From 3496ff251ae5c6386120e7017a1f27fd38ace4ca Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Fri, 13 May 2016 08:36:26 +0100
Subject: [PATCH] Don't create a bullet that is BT_NONE when using combined
 guns.

---
 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 57ce049..193b73a 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -399,7 +399,7 @@ void fireGuns(Entity *owner)
 
 	for (i = 0 ; i < MAX_FIGHTER_GUNS ; i++)
 	{
-		if (owner->guns[i].type == owner->selectedGunType || (owner->guns[i].type != BT_NONE && owner->combinedGuns))
+		if (owner->guns[i].type != BT_NONE && (owner->guns[i].type == owner->selectedGunType || owner->combinedGuns))
 		{
 			s = sin(TO_RAIDANS(owner->angle));
 			c = cos(TO_RAIDANS(owner->angle));