.

Author: Fernando-A-Rocha

Client/core/CSettings.cpp

@@ -1019,8 +1019,8 @@ void CSettings::CreateGUI()
     m_pRadarMapImageCombo = reinterpret_cast<CGUIComboBox*>(pManager->CreateComboBox(pTabAdvanced, ""));
     m_pRadarMapImageCombo->SetPosition(CVector2D(vecTemp.fX + fIndentX, vecTemp.fY - 1.0f));
     m_pRadarMapImageCombo->SetSize(CVector2D(fComboWidth, 95.0f));
-    m_pRadarMapImageCombo->AddItem(_("1024 x 1024 (Default)"))->SetData((void*)0);
-    m_pRadarMapImageCombo->AddItem(_("2048 x 2048"))->SetData((void*)1);
+    m_pRadarMapImageCombo->AddItem(_("1024 x 1024 (Default)"));
+    m_pRadarMapImageCombo->AddItem(_("2048 x 2048"));
     m_pRadarMapImageCombo->SetReadOnly(true);
     vecTemp.fY += fLineHeight;
 
@@ -3565,7 +3565,7 @@ void CSettings::SaveData()
     {
         int iSelected = (int)pSelected->GetData();
         CVARS_SET("radar_map_image", iSelected);
-        // TODO Update the map image if radar map exists
+        // TODO: Update the map image if radar map exists
     }
 
     // Fast clothes loading

Client/mods/deathmatch/logic/CRadarMap.cpp

@@ -58,7 +58,7 @@ CRadarMap::CRadarMap(CClientManager* pManager)
 
     // Create the radar map image
     m_pRadarImage = nullptr;
-    SetMapImage(g_pCore->GetCVars()->GetValue<int>("radar_map_image", 0));
+    SetMapImage(g_pCore->GetCVars()->GetValue<std::uint32_t>("radar_map_image", 0));
 
     // Create the marker textures
     CreateMarkerTextures();
@@ -116,16 +116,15 @@ CRadarMap::~CRadarMap()
 }
 
 // If invalid presetIndex is passed, it will use the first preset
-void CRadarMap::SetMapImage(const int presetIndex)
+void CRadarMap::SetMapImage(const std::uint32_t presetIndex)
 {
     if (m_pRadarImage != nullptr)
         SAFE_RELEASE(m_pRadarImage);
 
     auto [fileName, width, height] = GetRadarImagePreset(presetIndex);
     m_pRadarImage = g_pCore->GetGraphics()->GetRenderItemManager()->CreateTexture(CalcMTASAPath("MTA\\cgui\\images\\" + fileName), nullptr, false, width, height,
                                                                                   RFORMAT_DXT1);
-    g_pCore->GetConsole()->Printf("Radar map image preset id %d loaded (%d x %d)", presetIndex, width, height);
-
+    g_pCore->GetConsole()->Printf("Radar map image preset id loaded: [%d] %d x %d", presetIndex, width, height);
     SetupMapVariables();
 }
 

Client/mods/deathmatch/logic/CRadarMap.h

@@ -62,14 +62,15 @@ class CRadarMap
     void ZoomIn();
     void ZoomOut();
 
-    void SetMapImage(const int presetIndex);
+    void SetMapImage(const std::uint32_t presetIndex);
 
     SString GetBoundKeyName(const SString& strCommand);
 
-    std::tuple<std::string, int, int> GetRadarImagePreset(int index) const noexcept
+    std::tuple<std::string, std::uint32_t, std::uint32_t> GetRadarImagePreset(std::uint32_t index) const
     {
         if (index < 0 || index >= m_radarImagePresets.size())
             index = 0;
+        assert(index < m_radarImagePresets.size()); // Vector should never be empty
         return m_radarImagePresets[index];
     }
 
@@ -92,7 +93,7 @@ class CRadarMap
     CTextureItem*              m_pLocalPlayerBlip;
     std::vector<CTextureItem*> m_MarkerTextureList;
 
-    std::vector<std::tuple<std::string, int, int>> const m_radarImagePresets = {
+    const std::vector<std::tuple<std::string, std::uint32_t, std::uint32_t>> m_radarImagePresets = {
         {"radar_1024.png", 1024, 1024},
         {"radar_2048.png", 2048, 2048},
     };