fix #6070

spring · Nov 10, 2018 · faac1d4 · faac1d4
1 parent fafa97a
commit faac1d4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/rts/Lua/LuaUnsyncedCtrl.cpp b/rts/Lua/LuaUnsyncedCtrl.cpp
@@ -100,9 +100,6 @@
 #include <SDL_clipboard.h>
 #include <SDL_mouse.h>
 
-using std::min;
-using std::max;
-
 // MinGW defines this for a WINAPI function
 #undef SendMessage
 #undef CreateDirectory
@@ -2203,16 +2200,17 @@ int LuaUnsyncedCtrl::SetUnitDefIcon(lua_State* L)
 	const auto& decoyMap = unitDefHandler->GetDecoyDefIDs();
 	const auto decoyMapIt = decoyMap.find((ud->decoyDef != nullptr)? ud->decoyDef->id: ud->id);
 
-	if (decoyMapIt == decoyMap.end())
-		return 0;
-
-	const auto& decoySet = decoyMapIt->second;
+	if (decoyMapIt != decoyMap.end()) {
+		const auto& decoySet = decoyMapIt->second;
 
-	for (const int decoyDefID: decoySet) {
-		const UnitDef* decoyDef = unitDefHandler->GetUnitDefByID(decoyDefID);
-		decoyDef->iconType = ud->iconType;
+		for (const int decoyDefID: decoySet) {
+			const UnitDef* decoyDef = unitDefHandler->GetUnitDefByID(decoyDefID);
+			decoyDef->iconType = ud->iconType;
+		}
 	}
 
+	// FIXME: the icon-system is garbage, rewrite it
+	unitDrawer->UpdateUnitDefMiniMapIcons(ud);
 	return 0;
 }
 

diff --git a/rts/Rendering/UnitDrawer.cpp b/rts/Rendering/UnitDrawer.cpp
@@ -40,6 +40,7 @@
 #include "Sim/Units/UnitDef.h"
 #include "Sim/Units/UnitDefHandler.h"
 #include "Sim/Units/Unit.h"
+#include "Sim/Units/UnitHandler.h"
 
 #include "System/Config/ConfigHandler.h"
 #include "System/FileSystem/FileHandler.h"
@@ -1780,6 +1781,16 @@ void CUnitDrawer::DrawUnitMiniMapIcons() const {
 	}
 }
 
+
+void CUnitDrawer::UpdateUnitDefMiniMapIcons(const UnitDef* ud)
+{
+	for (int teamNum = 0; teamNum < teamHandler.ActiveTeams(); teamNum++) {
+		for (const CUnit* unit: unitHandler.GetUnitsByTeamAndDef(teamNum, ud->id)) {
+			UpdateUnitMiniMapIcon(unit, true, false);
+		}
+	}
+}
+
 void CUnitDrawer::UpdateUnitMiniMapIcon(const CUnit* unit, bool forced, bool killed) {
 	CUnit* u = const_cast<CUnit*>(unit);
 

diff --git a/rts/Rendering/UnitDrawer.h b/rts/Rendering/UnitDrawer.h
@@ -214,6 +214,7 @@ class CUnitDrawer: public CEventClient
 public:
 	void DrawUnitIcons();
 	void DrawUnitMiniMapIcon(const CUnit* unit, CVertexArray* va) const;
+	void UpdateUnitDefMiniMapIcons(const UnitDef* ud);
 private:
 	void UpdateUnitMiniMapIcon(const CUnit* unit, bool forced, bool killed);
 	void UpdateUnitIconState(CUnit* unit);