When targetting using sensors, use action target of droids doing DACT…

…ION_OBSERVE. Previous behaviour was to use order target, independently of whether the droid was doing DORDER_OBSERVE. Artillery no longer shoots at oil barrels being picked up by sensor tanks. Fixes ticket:1281.
Warzone2100 · Mar 10, 2012 · 42017f5 · 42017f5
1 parent af5f329
commit 42017f5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ai.cpp b/src/ai.cpp
@@ -186,7 +186,12 @@ static BASE_OBJECT *aiSearchSensorTargets(BASE_OBJECT *psObj, int weapon_slot, W
 			DROID		*psDroid = (DROID *)psSensor;
 
 			ASSERT_OR_RETURN(NULL, psDroid->droidType == DROID_SENSOR, "A non-sensor droid in a sensor list is non-sense");
-			psTemp = psDroid->order.psObj;
+			// Skip non-observing droids.
+			if (psDroid->action != DACTION_OBSERVE)
+			{
+				continue;
+			}
+			psTemp = psDroid->psActionTarget[0];
 			isCB = cbSensorDroid(psDroid);
 			isRD = objRadarDetector((BASE_OBJECT *)psDroid);
 		}