Сделал необязательной artefact_panel

xrSimpodin · xrSimpodin · commit a88326dc4ac6 · 2024-06-15T18:30:28.000+03:00
&#1075;&#1080;&#1088;&#1083;&#1103;&#1085;&#1076;&#1091; &#1089; &#1072;&#1088;&#1090;&#1072;&#1084;&#1080; &#1085;&#1072; &#1093;&#1091;&#1076;&#1077;
diff --git a/ogsr_engine/xrGame/Actor.cpp b/ogsr_engine/xrGame/Actor.cpp
@@ -1433,8 +1433,8 @@ void CActor::OnItemSlot(CInventoryItem* inventory_item, EItemPlace previous_plac
 
 void CActor::UpdateArtefactPanel()
 {
-    if (Level().CurrentViewEntity() && Level().CurrentViewEntity() == this) //&#1054;&#1085;&#1086; &#1085;&#1072;&#1076;&#1086; &#1074;&#1086;&#1086;&#1073;&#1097;&#1077; &#1073;&#1077;&#1079; &#1084;&#1091;&#1083;&#1100;&#1090;&#1080;&#1087;&#1083;&#1077;&#1077;&#1088;&#1072;?
-        HUD().GetUI()->UIMainIngameWnd->m_artefactPanel->InitIcons(inventory().m_belt);
+    if (auto* art_pan = HUD().GetUI()->UIMainIngameWnd->m_artefactPanel)
+        art_pan->InitIcons(inventory().m_belt);
 }
 
 void CActor::ApplyArtefactEffects(ActorRestoreParams& r, CArtefact* artefact)
diff --git a/ogsr_engine/xrGame/ui/UIMainIngameWnd.cpp b/ogsr_engine/xrGame/ui/UIMainIngameWnd.cpp
@@ -103,7 +103,6 @@ CUIMainIngameWnd::CUIMainIngameWnd()
     m_pItem = NULL;
     UIZoneMap = xr_new<CUIZoneMap>();
     m_pPickUpItem = NULL;
-    m_artefactPanel = xr_new<CUIArtefactPanel>();
 
     warn_icon_list[ewiWeaponJammed] = &UIWeaponJammedIcon;
     warn_icon_list[ewiRadiation] = &UIRadiaitionIcon;
@@ -121,7 +120,8 @@ CUIMainIngameWnd::~CUIMainIngameWnd()
 {
     DestroyFlashingIcons();
     xr_delete(UIZoneMap);
-    xr_delete(m_artefactPanel);
+    if (m_artefactPanel)
+        xr_delete(m_artefactPanel);
     HUD_SOUND::DestroySound(m_contactSnd);
     xr_delete(g_MissileForceShape);
 }
@@ -264,15 +264,12 @@ void CUIMainIngameWnd::Init()
     AttachChild(&UIMotionIcon);
     UIMotionIcon.Init();
 
-    m_artefactPanel->InitFromXML(uiXml, "artefact_panel", 0);
-    this->AttachChild(m_artefactPanel);
-
-    //AttachChild(&UIStaticDiskIO);
-    //UIStaticDiskIO.SetWndRect(1000, 750, 16, 16);
-    //UIStaticDiskIO.GetUIStaticItem().SetRect(0, 0, 16, 16);
-    //UIStaticDiskIO.InitTexture("ui\\ui_disk_io");
-    //UIStaticDiskIO.SetOriginalRect(0, 0, 32, 32);
-    //UIStaticDiskIO.SetStretchTexture(TRUE);
+    if (uiXml.NavigateToNode("artefact_panel"))
+    {
+        m_artefactPanel = xr_new<CUIArtefactPanel>();
+        m_artefactPanel->InitFromXML(uiXml, "artefact_panel", 0);
+        this->AttachChild(m_artefactPanel);
+    }
 
     HUD_SOUND::LoadSound("maingame_ui", "snd_new_contact", m_contactSnd, SOUND_TYPE_IDLE);
 }
@@ -281,21 +278,6 @@ float UIStaticDiskIO_start_time = 0.0f;
 
 void CUIMainIngameWnd::Draw()
 {
-    // show IO icon
-    //bool IOActive = (FS.dwOpenCounter > 0);
-    //if (IOActive)
-    //    UIStaticDiskIO_start_time = Device.fTimeGlobal;
-
-    //if ((UIStaticDiskIO_start_time + 1.0f) < Device.fTimeGlobal)
-    //    UIStaticDiskIO.Show(false);
-    //else
-    //{
-    //    u32 alpha = clampr(iFloor(255.f * (1.f - (Device.fTimeGlobal - UIStaticDiskIO_start_time) / 1.f)), 0, 255);
-    //    UIStaticDiskIO.Show(true);
-    //    UIStaticDiskIO.SetColor(color_rgba(255, 255, 255, alpha));
-    //}
-    //FS.dwOpenCounter = 0;
-
     if (!m_pActor)
         return;
 
diff --git a/ogsr_engine/xrGame/ui/UIMainIngameWnd.h b/ogsr_engine/xrGame/ui/UIMainIngameWnd.h
@@ -39,7 +39,6 @@ class CUIMainIngameWnd : public CUIWindow
     bool OnKeyboardPress(int dik);
 
 protected:
-    //CUIStatic UIStaticDiskIO;
     CUIStatic UIStaticHealth;
     CUIStatic UIStaticArmor;
     CUIStatic UIStaticQuickHelp;
@@ -83,7 +82,7 @@ class CUIMainIngameWnd : public CUIWindow
     CUIScrollView* m_UIIcons{};
 
 public:
-    CUIArtefactPanel* m_artefactPanel;
+    CUIArtefactPanel* m_artefactPanel{};
 
 public:
     // &#1045;&#1085;&#1091;&#1084;&#1099; &#1089;&#1086;&#1086;&#1090;&#1074;&#1077;&#1090;&#1089;&#1074;&#1091;&#1102;&#1097;&#1080;&#1077; &#1087;&#1088;&#1077;&#1076;&#1091;&#1087;&#1088;&#1077;&#1078;&#1076;&#1072;&#1102;&#1097;&#1080;&#1084; &#1080;&#1082;&#1086;&#1085;&#1082;&#1072;&#1084;

Original file line number	Diff line number	Diff line change
`@@ -1433,8 +1433,8 @@ void CActor::OnItemSlot(CInventoryItem* inventory_item, EItemPlace previous_plac`
`1433`	`1433`
`1434`	`1434`	`void CActor::UpdateArtefactPanel()`
`1435`	`1435`	`{`
`1436`		`- if (Level().CurrentViewEntity() && Level().CurrentViewEntity() == this) //Оно надо вообще без мультиплеера?`
`1437`		`- HUD().GetUI()->UIMainIngameWnd->m_artefactPanel->InitIcons(inventory().m_belt);`
	`1436`	`+ if (auto* art_pan = HUD().GetUI()->UIMainIngameWnd->m_artefactPanel)`
	`1437`	`+ art_pan->InitIcons(inventory().m_belt);`
`1438`	`1438`	`}`
`1439`	`1439`
`1440`	`1440`	`void CActor::ApplyArtefactEffects(ActorRestoreParams& r, CArtefact* artefact)`