xrGame/UIZoneMap.h|cpp: use CUIStatic for clip frame like in CS (#382)

Also, returned CUIMiniMap pointer instead of CUICustomMap (reverts excess change from 4b1d592)
OpenXRay · Feb 22, 2024 · 02e6e09 · 02e6e09
1 parent 29994fe
commit 02e6e09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -3,20 +3,20 @@
 #include "xrUICore/Static/UIStatic.h"
 
 class CActor;
-class CUICustomMap;
+class CUIMiniMap;
 
 class CUIZoneMap
 {
 public:
  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{};