diff --git a/Client/mods/deathmatch/logic/CRadarMap.cpp b/Client/mods/deathmatch/logic/CRadarMap.cpp index 11b010015c..37119d01be 100644 --- a/Client/mods/deathmatch/logic/CRadarMap.cpp +++ b/Client/mods/deathmatch/logic/CRadarMap.cpp @@ -54,11 +54,15 @@ CRadarMap::CRadarMap(CClientManager* pManager) m_iVerticalMovement = 0; SetupMapVariables(); - // Create the radar and local player blip images - m_pRadarImage = - g_pCore->GetGraphics()->GetRenderItemManager()->CreateTexture(CalcMTASAPath("MTA\\cgui\\images\\radar.jpg"), NULL, false, 2048, 2048, RFORMAT_DXT1); + // Create the local player blip image m_pLocalPlayerBlip = g_pCore->GetGraphics()->GetRenderItemManager()->CreateTexture(CalcMTASAPath("MTA\\cgui\\images\\radarset\\02.png")); + // Create the radar map image + int radarImagePreset = 0; // TEMP + auto [radarImgFileName, radarImgWidth, radarImgHeight] = GetRadarImagePreset(radarImagePreset); + m_pRadarImage = g_pCore->GetGraphics()->GetRenderItemManager()->CreateTexture(CalcMTASAPath("MTA\\cgui\\images\\" + radarImgFileName), NULL, false, + radarImgWidth, radarImgHeight, RFORMAT_DXT1); + // Create the marker textures CreateMarkerTextures(); diff --git a/Client/mods/deathmatch/logic/CRadarMap.h b/Client/mods/deathmatch/logic/CRadarMap.h index a3dd8f0d51..cf1a7b41aa 100644 --- a/Client/mods/deathmatch/logic/CRadarMap.h +++ b/Client/mods/deathmatch/logic/CRadarMap.h @@ -64,6 +64,13 @@ class CRadarMap SString GetBoundKeyName(const SString& strCommand); + std::tuple GetRadarImagePreset(int index) const + { + if (index < 0 || index >= m_radarImagePresets.size()) + index = 0; + return m_radarImagePresets[index]; + } + private: bool CalculateEntityOnScreenPosition(class CClientEntity* pEntity, CVector2D& vecLocalPos); bool CalculateEntityOnScreenPosition(CVector vecPosition, CVector2D& vecLocalPos); @@ -83,6 +90,11 @@ class CRadarMap CTextureItem* m_pLocalPlayerBlip; std::vector m_MarkerTextureList; + std::vector> m_radarImagePresets = { + {"radar_1024.png", 1024, 1024}, + {"radar_2048.png", 2048, 2048}, + }; + unsigned int m_uiHeight; unsigned int m_uiWidth; diff --git a/Shared/data/MTA San Andreas/MTA/cgui/images/radar.jpg b/Shared/data/MTA San Andreas/MTA/cgui/images/radar.jpg deleted file mode 100644 index 71828b269c..0000000000 Binary files a/Shared/data/MTA San Andreas/MTA/cgui/images/radar.jpg and /dev/null differ diff --git a/Shared/data/MTA San Andreas/MTA/cgui/images/radar_1024.png b/Shared/data/MTA San Andreas/MTA/cgui/images/radar_1024.png new file mode 100644 index 0000000000..cc11884154 Binary files /dev/null and b/Shared/data/MTA San Andreas/MTA/cgui/images/radar_1024.png differ diff --git a/Shared/data/MTA San Andreas/MTA/cgui/images/radar_2048.png b/Shared/data/MTA San Andreas/MTA/cgui/images/radar_2048.png new file mode 100644 index 0000000000..9a7421481b Binary files /dev/null and b/Shared/data/MTA San Andreas/MTA/cgui/images/radar_2048.png differ