Index: src/structure.c
===================================================================
--- src/structure.c	(revision 6442)
+++ src/structure.c	(working copy)
@@ -5780,19 +5780,20 @@
 
 	for (num = 0, psCurr = apsDroidLists[selectedPlayer]; psCurr; psCurr = psCurr->psNext)
 	{
-		if (psCurr->psTarget && psCurr->player == psStructure->player)
+		if (psCurr->psTarget && psCurr->player == psStructure->player
+			&& psCurr->psTarget->id == psStructure->id)
 		{
-			hasindirect = 0;
-			weapontype = asWeaponStats[psCurr->asWeaps[0].nStat].movementModel;
-
-			if(weapontype == MM_INDIRECT || weapontype == MM_HOMINGINDIRECT)
+			if (isVtolDroid(psCurr))
 			{
-				hasindirect = 1;
+				num++;
 			}
-
-			if (psCurr->psTarget->id == psStructure->id && hasindirect)
+			else
 			{
-				num++;
+				weapontype = asWeaponStats[psCurr->asWeaps[0].nStat].movementModel;
+				if(weapontype == MM_INDIRECT || weapontype == MM_HOMINGINDIRECT)
+				{
+					num++;
+				}
 			}
 		}
 	}