Make leaving dead ghosts behind optional when staticRadarGhost is dis…

…abled.
beyond-all-reason · Jan 9, 2025 · fcbb300 · fcbb300
1 parent 7197698
commit fcbb300
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/rts/Lua/LuaSyncedCtrl.cpp b/rts/Lua/LuaSyncedCtrl.cpp
@@ -2694,6 +2694,7 @@ int LuaSyncedCtrl::SetUnitSeismicSignature(lua_State* L)
  *
  * @number unitID
  * @bool staticRadarGhost
+ * @bool[opt] leaveDeadGhost leave a dead ghost behind if disabling and the unit had a live static ghost.
  * @treturn nil
  */
 int LuaSyncedCtrl::SetUnitStaticRadarGhost(lua_State* L)
@@ -2706,7 +2707,7 @@ int LuaSyncedCtrl::SetUnitStaticRadarGhost(lua_State* L)
 	bool prevValue = unit->staticRadarGhost;
 	unit->SetStaticRadarGhost(luaL_checkboolean(L, 2));
 	if (prevValue != unit->staticRadarGhost)
-		unitDrawer->SetUnitStaticRadarGhost(unit);
+		unitDrawer->SetUnitStaticRadarGhost(unit, luaL_optboolean(L, 3, false));
 	return 0;
 }
 

diff --git a/rts/Rendering/Units/UnitDrawer.h b/rts/Rendering/Units/UnitDrawer.h
@@ -54,7 +54,7 @@ class CUnitDrawer : public CModelDrawerBase<CUnitDrawerData, CUnitDrawer>
 	static const std::vector<CUnit*>& GetUnsortedUnits() { return modelDrawerData->GetUnsortedObjects(); }
 
 	static void ClearPreviousDrawFlags() { modelDrawerData->ClearPreviousDrawFlags(); }
-	static void SetUnitStaticRadarGhost(const CUnit* unit) { modelDrawerData->SetUnitStaticRadarGhost(unit); }
+	static void SetUnitStaticRadarGhost(const CUnit* unit, const bool leaveDeadGhost) { modelDrawerData->SetUnitStaticRadarGhost(unit, leaveDeadGhost); }
 public:
 	// DrawUnit*
 	virtual void DrawUnitNoTrans(const CUnit* unit, uint32_t preList, uint32_t postList, bool lodCall, bool noLuaCall) const = 0;

diff --git a/rts/Rendering/Units/UnitDrawerData.cpp b/rts/Rendering/Units/UnitDrawerData.cpp
@@ -679,12 +679,12 @@ void CUnitDrawerData::UnitLeftLos(const CUnit* unit, int allyTeam)
 	UpdateUnitIcon(unit, false, false);
 }
 
-void CUnitDrawerData::SetUnitStaticRadarGhost(const CUnit* unit)
+void CUnitDrawerData::SetUnitStaticRadarGhost(const CUnit* unit, const bool leaveDeadGhost)
 {
 	if (unit->staticRadarGhost)
 		return;
 
-	if (UpdateUnitGhosts(unit, true))
+	if (UpdateUnitGhosts(unit, leaveDeadGhost))
 		UpdateUnitIcon(unit, false, true);
 }
 

diff --git a/rts/Rendering/Units/UnitDrawerData.h b/rts/Rendering/Units/UnitDrawerData.h
@@ -61,7 +61,7 @@ class CUnitDrawerData : public CUnitDrawerDataBase {
 
 	void PlayerChanged(int playerNum) override;
 	bool UpdateUnitGhosts(const CUnit* unit, const bool addNewGhost);
-	void SetUnitStaticRadarGhost(const CUnit* unit);
+	void SetUnitStaticRadarGhost(const CUnit* unit, const bool leaveDeadGhost);
 public:
 	class TempDrawUnit {
 		CR_DECLARE_STRUCT(TempDrawUnit)