Make sure that a droid's weapon can actually damage the target before…

… getting orders to pursue the target. Patch by Kreuvf & vexed fixes ticket:4134
Warzone2100 · Dec 4, 2013 · af746f5 · af746f5
1 parent cc70e11
commit af746f5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/ai.cpp b/src/ai.cpp
@@ -1166,6 +1166,20 @@ void aiUpdateDroid(DROID *psDroid)
 	}
 }
 
+/* Check if any of our weapons can hit the target... */
+bool checkAnyWeaponsTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget)
+{
+	DROID *psDroid = (DROID *) psObject;
+	for (int i = 0;i < psDroid->numWeaps;i++)
+	{
+		if (validTarget(psObject, psTarget, i))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
 /* Set of rules which determine whether the weapon associated with the object can fire on the propulsion type of the target. */
 bool validTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget, int weapon_slot)
 {

diff --git a/src/ai.h b/src/ai.h
@@ -80,5 +80,6 @@ bool aiChooseSensorTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget);
 /*set of rules which determine whether the weapon associated with the object
 can fire on the propulsion type of the target*/
 bool validTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget, int weapon_slot);
-
+// Check if any of the weapons can target the target
+bool checkAnyWeaponsTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget);
 #endif // __INCLUDED_SRC_AI_H__
diff --git a/src/order.cpp b/src/order.cpp
@@ -1025,7 +1025,7 @@ void orderUpdateDroid(DROID *psDroid)
 				psFireTarget = psSpotter->psTarget[0];
 			}
 
-			if (psFireTarget && !psFireTarget->died)
+			if (psFireTarget && !psFireTarget->died && checkAnyWeaponsTarget(psDroid, psFireTarget))
 			{
 				bAttack = false;
 				if (isVtolDroid(psDroid))