xrGame: removed excess variable and simplified code in CUITaskWnd and…

… UITaskListWnd
OpenXRay · Feb 22, 2024 · 29994fe · 29994fe
1 parent 4aa42d0
commit 29994fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/xrGame/ui/UISecondTaskWnd.cpp b/src/xrGame/ui/UISecondTaskWnd.cpp
@@ -18,7 +18,6 @@
 #include "xrUICore/Windows/UIFrameLineWnd.h"
 #include "xrUICore/ScrollBar/UIFixedScrollBar.h"
 #include "xrUICore/Hint/UIHint.h"
-#include "UITaskWnd.h"
 #include "GameTaskDefs.h"
 #include "GameTask.h"
 #include "map_location.h"
@@ -126,9 +125,7 @@ void UITaskListWnd::SendMessage(CUIWindow* pWnd, s16 msg, void* pData)
 
 void UITaskListWnd::OnBtnClose(CUIWindow* w, void* d)
 {
-    if (auto* wnd = smart_cast<CUITaskWnd*>(GetParent()->GetParent()))
-        wnd->Show_TaskListWnd(false);
-    //	Show( false );
+    Show(false);
     m_bt_close->SetButtonState(CUIButton::BUTTON_NORMAL);
 }
 

diff --git a/src/xrGame/ui/UITaskWnd.cpp b/src/xrGame/ui/UITaskWnd.cpp
@@ -96,7 +96,6 @@ bool CUITaskWnd::Init()
     m_pMapWnd->AttachChild(m_task_wnd);
     m_task_wnd->SetMessageTarget(this);
     m_task_wnd->Show(false);
-    m_task_wnd_show = false;
 
     m_map_legend_wnd = xr_new<UIMapLegend>();
     m_map_legend_wnd->SetAutoDelete(true);
@@ -309,25 +308,17 @@ void CUITaskWnd::Show(bool status)
     if (status)
     {
         ReloadTaskInfo();
-        m_task_wnd->Show(m_task_wnd_show);
-    }
-    else
-    {
-        //m_task_wnd_show = false;
-        m_task_wnd->Show(false);
     }
 }
 
-void CUITaskWnd::OnShowTaskListWnd(CUIWindow* w, void* d)
+void CUITaskWnd::OnShowTaskListWnd(CUIWindow* w, void* d) const
 {
-    m_task_wnd_show = !m_task_wnd_show;
     m_task_wnd->Show(!m_task_wnd->IsShown());
 }
 
-void CUITaskWnd::Show_TaskListWnd(bool status)
+void CUITaskWnd::Show_TaskListWnd(bool status) const
 {
     m_task_wnd->Show(status);
-    m_task_wnd_show = status;
 }
 
 void CUITaskWnd::TaskSetTargetMap(CGameTask* task) const

diff --git a/src/xrGame/ui/UITaskWnd.h b/src/xrGame/ui/UITaskWnd.h
@@ -39,7 +39,6 @@ class CUITaskWnd final : public CUIWindow, public CUIWndCallback
     CUIMapFilters m_filters;
 
     UITaskListWnd* m_task_wnd{};
-    bool m_task_wnd_show{};
     UIMapLegend* m_map_legend_wnd{};
 
 public:
@@ -62,7 +61,7 @@ class CUITaskWnd final : public CUIWindow, public CUIWndCallback
     void ReloadTaskInfo();
     void ShowMapLegend(bool status) const;
     void Switch_ShowMapLegend() const;
-    void Show_TaskListWnd(bool status);
+    void Show_TaskListWnd(bool status) const;
 
     [[nodiscard]]
     bool IsTreasuresEnabled() const { return m_filters.IsFilterEnabled(CUIMapFilters::Treasures); }
@@ -82,7 +81,7 @@ class CUITaskWnd final : public CUIWindow, public CUIWndCallback
     void TaskSetTargetMap(CGameTask* task) const;
     void TaskShowMapSpot(CGameTask* task, bool show) const;
 
-    void OnShowTaskListWnd(CUIWindow* w, void* d);
+    void OnShowTaskListWnd(CUIWindow* w, void* d) const;
     void OnTask1DbClicked(CUIWindow*, void*);
     void OnTask2DbClicked(CUIWindow*, void*);
 };