From 01108419dbd99c6bd16d0cebcd455dd2210026af Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel@wz2100.net>
Date: Mon, 7 Jul 2008 12:58:18 +0000
Subject: [PATCH] Did I say vtolHappy was somewhat error prone?  * Fix a bug in
 r5409 where I accidentily reversed the weapon-reloaded logic  * Merge two
 nested if-statements

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5410 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/droid.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/droid.c b/src/droid.c
index 1fa15f849..f49433657 100644
--- a/src/droid.c
+++ b/src/droid.c
@@ -4591,12 +4591,10 @@ BOOL vtolHappy(const DROID* psDroid)
 
 		for (i = 0; i < psDroid->numWeaps; ++i)
 		{
-			if (asWeaponStats[psDroid->asWeaps[i].nStat].vtolAttackRuns > 0)
+			if (asWeaponStats[psDroid->asWeaps[i].nStat].vtolAttackRuns > 0
+			 && psDroid->sMove.iAttackRuns[i] != 0)
 			{
-				if (psDroid->sMove.iAttackRuns[i] == 0)
-				{
-					return false;
-				}
+				return false;
 			}
 		}