Clean up super sensor handling. The WSS is not a counter-battery sensor

since a while ago, so remove superfluous and bad checks.
Warzone2100 · Mar 15, 2013 · 983d77d · 983d77d
1 parent d80cad9
commit 983d77d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/action.cpp b/src/action.cpp
@@ -1661,8 +1661,7 @@ void actionUpdateDroid(DROID *psDroid)
 		// align the turret
 		actionTargetTurret(psDroid, psDroid->psActionTarget[0], &psDroid->asWeaps[0]);
 
-		// WSS shouldn't get a free pass to hit anything on map
+		if (order->type != DORDER_HOLD && !cbSensorDroid(psDroid))
-		if (order->type != DORDER_HOLD && !cbSensorDroid(psDroid) && !asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type != SUPER_SENSOR)
 		{
 			// make sure the target is within sensor range
 			const int xdiff = (SDWORD)psDroid->pos.x - (SDWORD)psDroid->psActionTarget[0]->pos.x;

diff --git a/src/droid.cpp b/src/droid.cpp
@@ -3282,12 +3282,8 @@ bool cbSensorDroid(DROID *psDroid)
 	{
 		return false;
 	}
-
+	if (asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type == VTOL_CB_SENSOR
-	/*Super Sensor works as any type*/
+	    || asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type == INDIRECT_CB_SENSOR)
-	if (asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type ==
-		VTOL_CB_SENSOR ||
-		asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type ==
-		INDIRECT_CB_SENSOR)
 	{
 		return true;
 	}
@@ -3302,18 +3298,13 @@ bool standardSensorDroid(DROID *psDroid)
 	{
 		return false;
 	}
-
+	if (asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type == VTOL_INTERCEPT_SENSOR
-	/*Super Sensor works as any type*/
+	    || asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type == STANDARD_SENSOR
-	if (asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type ==
+	    || asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type == SUPER_SENSOR)
-		VTOL_INTERCEPT_SENSOR ||
-		asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type ==
-		STANDARD_SENSOR ||
-		asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type ==
-		SUPER_SENSOR)
 	{
 		return true;
 	}
-	
+
 	return false;
 }
 

diff --git a/src/visibility.cpp b/src/visibility.cpp
@@ -526,8 +526,7 @@ static void processVisibilitySelf(BASE_OBJECT *psObj)
 		setSeenByInstantly(psStruct->psTarget[0], psObj->player, UBYTE_MAX);
 	}
 	DROID *psDroid = castDroid(psObj);
-	// WSS shouldn't get a free pass to hit anything on map
+	if (psDroid != NULL && psDroid->action == DACTION_OBSERVE && cbSensorDroid(psDroid))
-	if (psDroid != NULL && psDroid->action == DACTION_OBSERVE && cbSensorDroid(psDroid) && asSensorStats[psDroid->asBits[COMP_SENSOR].nStat].type != SUPER_SENSOR)
 	{
 		// Anyone commenting this out will get a knee capping from John.
 		// You have been warned!!