Skip to content

Commit 02e6e09

Browse files
committed
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)
1 parent 29994fe commit 02e6e09

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/xrGame/UIZoneMap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void CUIZoneMap::Init(bool motionIconAttached)
2424
uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "zone_map.xml");
2525

2626
CUIXmlInit::InitStatic(uiXml, "minimap:background", 0, &m_background);
27-
CUIXmlInit::InitWindow(uiXml, "minimap:level_frame", 0, &m_clipFrame);
27+
CUIXmlInit::InitStatic(uiXml, "minimap:level_frame", 0, &m_clipFrame);
2828
CUIXmlInit::InitStatic(uiXml, "minimap:center", 0, &m_center);
2929

3030
m_clock_wnd = UIHelper::CreateStatic(uiXml, "minimap:clock_wnd", &m_background, false);

src/xrGame/UIZoneMap.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
#include "xrUICore/Static/UIStatic.h"
44

55
class CActor;
6-
class CUICustomMap;
6+
class CUIMiniMap;
77

88
class CUIZoneMap
99
{
1010
public:
1111
bool visible{ true };
1212

1313
private:
14-
CUICustomMap* m_activeMap{};
14+
CUIMiniMap* m_activeMap{};
1515

1616
CUIStatic m_background{ "Background" };
1717
CUIStatic m_center{ "Center" };
1818
CUIStatic m_compass{ "Compass" };
19-
CUIWindow m_clipFrame{ "Clip frame" };
19+
CUIStatic m_clipFrame{ "Clip frame" };
2020
CUIStatic m_Counter{ "Counter" };
2121
CUIStatic m_Counter_text{ "Counter text" };
2222
CUIStatic* m_clock_wnd{};

0 commit comments

Comments
 (0)