reuse iconHandler

rts/Game/Game.cpp

@@ -503,7 +503,7 @@ void CGame::LoadDefs(LuaParser* defsParser)
 
 	{
 		loadscreen->SetLoadMessage("Loading Radar Icons");
-		icon::iconHandler = new icon::CIconHandler();
+		icon::iconHandler.Init();
 	}
 	{
 		ScopedOnceTimer timer("Game::LoadDefs (Sound)");
@@ -831,7 +831,7 @@ void CGame::KillMisc()
 void CGame::KillRendering()
 {
 	LOG("[Game::%s][1]", __func__);
-	spring::SafeDelete(icon::iconHandler);
+	icon::iconHandler.Kill();
 	spring::SafeDelete(geometricObjects);
 	worldDrawer.Kill();
 }

rts/Lua/LuaUnsyncedCtrl.cpp

@@ -1690,7 +1690,7 @@ int LuaUnsyncedCtrl::AddUnitIcon(lua_State* L)
 	const float  size      = luaL_optnumber(L, 3, 1.0f);
 	const float  dist      = luaL_optnumber(L, 4, 1.0f);
 	const bool   radAdjust = luaL_optboolean(L, 5, false);
-	lua_pushboolean(L, icon::iconHandler->AddIcon(iconName, texName,
+	lua_pushboolean(L, icon::iconHandler.AddIcon(iconName, texName,
 	                                        size, dist, radAdjust));
 	return 1;
 }
@@ -1701,8 +1701,7 @@ int LuaUnsyncedCtrl::FreeUnitIcon(lua_State* L)
 	if (CLuaHandle::GetHandleSynced(L))
 		return 0;
 
-	const string iconName  = luaL_checkstring(L, 1);
-	lua_pushboolean(L, icon::iconHandler->FreeIcon(iconName));
+	lua_pushboolean(L, icon::iconHandler.FreeIcon(luaL_checkstring(L, 1)));
 	return 1;
 }
 
@@ -2179,7 +2178,7 @@ int LuaUnsyncedCtrl::SetUnitDefIcon(lua_State* L)
 	if (ud == nullptr)
 		return 0;
 
-	ud->iconType = icon::iconHandler->GetIcon(luaL_checksstring(L, 2));
+	ud->iconType = icon::iconHandler.GetIcon(luaL_checksstring(L, 2));
 
 	// set decoys to the same icon
 	if (ud->decoyDef != nullptr)

rts/Rendering/IconHandler.cpp

@@ -9,15 +9,14 @@
 #include <cmath>
 
 #include "Rendering/GL/myGL.h"
-#include "Rendering/GL/VertexArray.h"
 #include "System/Log/ILog.h"
 #include "Lua/LuaParser.h"
 #include "Textures/Bitmap.h"
 #include "System/Exceptions.h"
 
 namespace icon {
 
-CIconHandler* iconHandler = nullptr;
+CIconHandler iconHandler;
 
 static CIconData dummyIconData[CIconHandler::ICON_DATA_OFFSET];
 
@@ -27,12 +26,21 @@ static CIconData dummyIconData[CIconHandler::ICON_DATA_OFFSET];
 //  CIconHandler
 //
 
-CIconHandler::~CIconHandler()
+void CIconHandler::Kill()
 {
 	glDeleteTextures(1, &defTexID);
 
+	defTexID = 0;
+	numIcons = 0;
+
 	dummyIconData[ SAFETY_DATA_IDX] = {};
 	dummyIconData[DEFAULT_DATA_IDX] = {};
+
+	iconMap.clear();
+
+	for (CIconData& id: iconData) {
+		id = {};
+	}
 }
 
 
@@ -53,6 +61,7 @@ bool CIconHandler::LoadIcons(const std::string& filename)
 
 	for (const std::string& iconName : iconNames) {
 		const LuaTable iconTable = iconTypes.SubTable(iconName);
+
 		AddIcon(
 			iconName,
 			iconTable.GetString("bitmap",       ""),
@@ -214,7 +223,8 @@ CIcon::CIcon()
 {
 	CIconData* data = nullptr;
 
-	if (iconHandler != nullptr) {
+	// use default data if handler is initialized
+	if (iconHandler.defTexID != 0) {
 		data = &dummyIconData[dataIdx = CIconHandler::DEFAULT_DATA_IDX];
 	} else {
 		data = &dummyIconData[dataIdx = CIconHandler::SAFETY_DATA_IDX];
@@ -226,28 +236,28 @@ CIcon::CIcon()
 
 CIcon::CIcon(unsigned int idx)
 {
-	iconHandler->GetIconDataMut(dataIdx = idx)->Ref();
+	iconHandler.GetIconDataMut(dataIdx = idx)->Ref();
 }
 
 CIcon::CIcon(const CIcon& icon)
 {
-	iconHandler->GetIconDataMut(dataIdx = icon.dataIdx)->Ref();
+	iconHandler.GetIconDataMut(dataIdx = icon.dataIdx)->Ref();
 }
 
 CIcon::~CIcon()
 {
 	// NB: icons can outlive the handler
-	UnRefData(iconHandler);
+	UnRefData(&iconHandler);
 }
 
 
 CIcon& CIcon::operator=(const CIcon& icon)
 {
 	if (dataIdx != icon.dataIdx) {
-		CIconData* iconData = iconHandler->GetIconDataMut(dataIdx);
+		CIconData* iconData = iconHandler.GetIconDataMut(dataIdx);
 
 		iconData->UnRef();
-		iconData = iconHandler->GetIconDataMut(dataIdx = icon.dataIdx);
+		iconData = iconHandler.GetIconDataMut(dataIdx = icon.dataIdx);
 		iconData->Ref();
 	}
 
@@ -262,8 +272,8 @@ void CIcon::UnRefData(CIconHandler* ih) {
 	dataIdx = CIconHandler::SAFETY_DATA_IDX;
 }
 
-const CIconData* CIcon::operator->()  const { return iconHandler->GetIconData(dataIdx); }
-const CIconData* CIcon::GetIconData() const { return iconHandler->GetIconData(dataIdx); }
+const CIconData* CIcon::operator->()  const { return iconHandler.GetIconData(dataIdx); }
+const CIconData* CIcon::GetIconData() const { return iconHandler.GetIconData(dataIdx); }
 
 
 

rts/Rendering/IconHandler.h

@@ -97,10 +97,12 @@ namespace icon {
 		friend class CIcon;
 
 		public:
-			CIconHandler() { LoadIcons("gamedata/icontypes.lua"); }
-			~CIconHandler();
+			CIconHandler() = default;
 			CIconHandler(const CIconHandler&) = delete; // no-copy
 
+			void Init() { LoadIcons("gamedata/icontypes.lua"); }
+			void Kill();
+
 			bool AddIcon(
 				const std::string& iconName,
 				const std::string& texName,
@@ -150,7 +152,7 @@ namespace icon {
 			std::array<CIconData, 2048> iconData;
 	};
 
-	extern CIconHandler* iconHandler;
+	extern CIconHandler iconHandler;
 }
 
 #endif // ICON_HANDLER_H

rts/Rendering/UnitDrawer.cpp

@@ -717,7 +717,7 @@ void CUnitDrawer::DrawUnitIcon(CUnit* unit, GL::RenderDataBufferTC* buffer, bool
 	const icon::CIconData* iconData = nullptr;
 
 	if (useDefaultIcon) {
-		iconData = icon::iconHandler->GetDefaultIconData();
+		iconData = icon::iconHandler.GetDefaultIconData();
 	} else {
 		iconData = unit->unitDef->iconType.GetIconData();
 	}
@@ -1580,7 +1580,7 @@ inline const icon::CIconData* GetUnitIcon(const CUnit* unit) {
 		return (unitDef->iconType.GetIconData());
 
 	if ((losStatus & LOS_INRADAR) != 0)
-		iconData = icon::iconHandler->GetDefaultIconData();
+		iconData = icon::iconHandler.GetDefaultIconData();
 
 	return iconData;
 }

rts/Sim/Units/UnitDef.cpp

@@ -477,7 +477,7 @@ UnitDef::UnitDef(const LuaTable& udTable, const std::string& unitName, int id)
 	category = CCategoryHandler::Instance()->GetCategories(udTable.GetString("category", ""));
 	noChaseCategory = CCategoryHandler::Instance()->GetCategories(udTable.GetString("noChaseCategory", ""));
 
-	iconType = icon::iconHandler->GetIcon(udTable.GetString("iconType", "default"));
+	iconType = icon::iconHandler.GetIcon(udTable.GetString("iconType", "default"));
 
 	shieldWeaponDef    = nullptr;
 	stockpileWeaponDef = nullptr;