fix #6306

spring · Sep 22, 2019 · ca1557c · ca1557c · FLOZi · Sep 22, 2019
1 parent a73df2d
commit ca1557c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/rts/Game/GameHelper.cpp b/rts/Game/GameHelper.cpp
@@ -791,20 +791,24 @@ CUnit* CGameHelper::GetClosestEnemyUnitNoLosTest(
 	const float3& pos,
 	float searchRadius,
 	int searchAllyteam,
-	bool sphere,
+	bool testSphere,
 	bool canBeBlind
 ) {
-	if (sphere) {
+	CUnit* closestUnit = nullptr;
+
+	if (testSphere) {
 		// includes target radius
 		Query::ClosestUnit_InLos q(pos, searchRadius, canBeBlind);
 		QueryUnits(Filter::Enemy(excludeUnit, searchAllyteam), q);
-		return q.GetClosestUnit();
+		closestUnit = q.GetClosestUnit();
 	} else {
-		// cylinder (doesn't include target radius)
+		// excludes target radius
 		Query::ClosestUnit_InLos_Cylinder q(pos, searchRadius, canBeBlind);
 		QueryUnits(Filter::Enemy(excludeUnit, searchAllyteam), q);
-		return q.GetClosestUnit();
+		closestUnit = q.GetClosestUnit();
 	}
+
+	return closestUnit;
 }
 
 CUnit* CGameHelper::GetClosestFriendlyUnit(const CUnit* excludeUnit, const float3& pos, float searchRadius, int searchAllyteam)

diff --git a/rts/Game/GameHelper.h b/rts/Game/GameHelper.h
@@ -68,7 +68,7 @@ class CGameHelper
 		const float3& pos,
 		float searchRadius,
 		int searchAllyteam,
-		bool sphere,
+		bool testSphere,
 		bool canBeBlind
 	);
 	static CUnit* GetClosestFriendlyUnit(const CUnit* excludeUnit, const float3& pos, float searchRadius, int searchAllyteam);

diff --git a/rts/Lua/LuaSyncedRead.cpp b/rts/Lua/LuaSyncedRead.cpp
@@ -2516,21 +2516,16 @@ int LuaSyncedRead::GetUnitNearestEnemy(lua_State* L)
 	if (unit == nullptr)
 		return 0;
 
-	const float range = luaL_optnumber(L, 2, 1.0e9f);
-	const bool useLos =
-		!CLuaHandle::GetHandleFullRead(L) || !lua_isboolean(L, 3) || lua_toboolean(L, 3);
-	const CUnit* target = nullptr;
+	const bool wantLOS = !lua_isboolean(L, 3) || lua_toboolean(L, 3);
+	const bool testLOS = !CLuaHandle::GetHandleFullRead(L) || wantLOS;
 
-	if (useLos) {
-		target = CGameHelper::GetClosestEnemyUnit(unit, unit->pos, range, unit->allyteam);
-	} else {
-		target = CGameHelper::GetClosestEnemyUnitNoLosTest(unit, unit->pos, range, unit->allyteam, false, true);
-	}
+	const CUnit* target = CGameHelper::GetClosestEnemyUnitNoLosTest(unit, unit->pos, luaL_optnumber(L, 2, 1.0e9f), unit->allyteam, false, !testLOS);
 
 	if (target != nullptr) {
 		lua_pushnumber(L, target->id);
 		return 1;
 	}
+
 	return 0;
 }
 

diff --git a/rts/Sim/Units/Unit.cpp b/rts/Sim/Units/Unit.cpp
@@ -2390,6 +2390,8 @@ bool CUnit::GetNewCloakState(bool stunCheck) {
 	assert(wantCloak);
 
 	// grab nearest enemy wrt our default decloak-distance
+	// (pass NoLosTest=true s.t. gadgets can decide how to
+	// react to cloaked enemy units within decloakDistance)
 	// Lua code can do more elaborate scans if it wants to
 	// and has access to cloakCost{Moving}/decloakDistance
 	//
@@ -2398,7 +2400,7 @@ bool CUnit::GetNewCloakState(bool stunCheck) {
 	const CUnit* closestEnemy = this;
 
 	if (!stunCheck)
-		closestEnemy = CGameHelper::GetClosestEnemyUnitNoLosTest(nullptr, midPos, decloakDistance, allyteam, unitDef->decloakSpherical, false);
+		closestEnemy = CGameHelper::GetClosestEnemyUnitNoLosTest(this, midPos, decloakDistance, allyteam, unitDef->decloakSpherical, true);
 
 	return (eventHandler.AllowUnitCloak(this, closestEnemy));
 }