Merge pull request #498 from GoogleFrog/decloakLosOption

Added the modrule decloakRequiresLineOfSight
spring · Mar 23, 2020 · cb54625 · cb54625
2 parents a942be9 + 5ddef55
commit cb54625
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/rts/Sim/Misc/ModInfo.cpp b/rts/Sim/Misc/ModInfo.cpp
@@ -85,6 +85,7 @@ void CModInfo::ResetState()
 
 		requireSonarUnderWater = true;
 		alwaysVisibleOverridesCloaked = false;
+		decloakRequiresLineOfSight = false;
 		separateJammers = true;
 	}
 	{
@@ -252,6 +253,7 @@ void CModInfo::Init(const std::string& modFileName)
 
 		requireSonarUnderWater = sensors.GetBool("requireSonarUnderWater", requireSonarUnderWater);
 		alwaysVisibleOverridesCloaked = sensors.GetBool("alwaysVisibleOverridesCloaked", alwaysVisibleOverridesCloaked);
+		decloakRequiresLineOfSight = sensors.GetBool("decloakRequiresLineOfSight", decloakRequiresLineOfSight);
 		separateJammers = sensors.GetBool("separateJammers", separateJammers);
 
 		// losMipLevel is used as index to readMap->mipHeightmaps,

diff --git a/rts/Sim/Misc/ModInfo.h b/rts/Sim/Misc/ModInfo.h
@@ -136,8 +136,10 @@ class CModInfo
 
 	/// when underwater, units are not in LOS unless also in sonar
 	bool requireSonarUnderWater;
-	///
+	/// when unit->alwaysVisible is true, it is visible even when cloaked
 	bool alwaysVisibleOverridesCloaked;
+	/// ignore enemies when checking decloak if they are further than their spherical sight range
+	bool decloakRequiresLineOfSight;
 	/// should _all_ allyteams share the same jammermap
 	bool separateJammers;
 

diff --git a/rts/Sim/Units/Unit.cpp b/rts/Sim/Units/Unit.cpp
@@ -2395,7 +2395,7 @@ bool CUnit::GetNewCloakState(bool stunCheck) {
 	const CUnit* closestEnemy = this;
 
 	if (!stunCheck)
-		closestEnemy = CGameHelper::GetClosestEnemyUnitNoLosTest(this, midPos, decloakDistance, allyteam, unitDef->decloakSpherical, false);
+		closestEnemy = CGameHelper::GetClosestEnemyUnitNoLosTest(this, midPos, decloakDistance, allyteam, unitDef->decloakSpherical, modInfo.decloakRequiresLineOfSight);
 
 	return (eventHandler.AllowUnitCloak(this, closestEnemy));
 }