From 02e6e0999500533c49d1cce0618a4421842f129e Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Wed, 21 Feb 2024 08:00:08 +0500 Subject: [PATCH] xrGame/UIZoneMap.h|cpp: use CUIStatic for clip frame like in CS (#382) Also, returned CUIMiniMap pointer instead of CUICustomMap (reverts excess change from 4b1d5920268d65a2ce4d6b8af80a39cc84d26597) --- src/xrGame/UIZoneMap.cpp | 2 +- src/xrGame/UIZoneMap.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xrGame/UIZoneMap.cpp b/src/xrGame/UIZoneMap.cpp index a7dff759555..8dfd304b005 100644 --- a/src/xrGame/UIZoneMap.cpp +++ b/src/xrGame/UIZoneMap.cpp @@ -24,7 +24,7 @@ void CUIZoneMap::Init(bool motionIconAttached) uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "zone_map.xml"); CUIXmlInit::InitStatic(uiXml, "minimap:background", 0, &m_background); - CUIXmlInit::InitWindow(uiXml, "minimap:level_frame", 0, &m_clipFrame); + CUIXmlInit::InitStatic(uiXml, "minimap:level_frame", 0, &m_clipFrame); CUIXmlInit::InitStatic(uiXml, "minimap:center", 0, &m_center); m_clock_wnd = UIHelper::CreateStatic(uiXml, "minimap:clock_wnd", &m_background, false); diff --git a/src/xrGame/UIZoneMap.h b/src/xrGame/UIZoneMap.h index 43492b60941..cb73c38265f 100644 --- a/src/xrGame/UIZoneMap.h +++ b/src/xrGame/UIZoneMap.h @@ -3,7 +3,7 @@ #include "xrUICore/Static/UIStatic.h" class CActor; -class CUICustomMap; +class CUIMiniMap; class CUIZoneMap { @@ -11,12 +11,12 @@ class CUIZoneMap bool visible{ true }; private: - CUICustomMap* m_activeMap{}; + CUIMiniMap* m_activeMap{}; CUIStatic m_background{ "Background" }; CUIStatic m_center{ "Center" }; CUIStatic m_compass{ "Compass" }; - CUIWindow m_clipFrame{ "Clip frame" }; + CUIStatic m_clipFrame{ "Clip frame" }; CUIStatic m_Counter{ "Counter" }; CUIStatic m_Counter_text{ "Counter text" }; CUIStatic* m_clock_wnd{};