Skip to content

Commit 4aa42d0

Browse files
committed
Show only secondary tasks in task list in Clear Sky (#382)
1 parent aa1e4f0 commit 4aa42d0

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/xrGame/ui/UISecondTaskWnd.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ void UITaskListWnd::UpdateList()
147147

148148
if (!task || task->GetTaskState() != eTaskStateInProgress)
149149
continue;
150+
if (m_show_only_secondary_tasks && task->GetTaskType() == eTaskTypeStoryline)
151+
continue;
150152

151153
auto* item = xr_new<UITaskListWndItem>();
152154
if (item->init_task(task, this))

src/xrGame/ui/UISecondTaskWnd.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ class UITaskListWnd final : public CUIWindow, public CUIWndCallback
4343
virtual void Update();
4444
virtual void SendMessage(CUIWindow* pWnd, s16 msg, void* pData);
4545

46+
void ShowOnlySecondaryTasks(bool mode) { m_show_only_secondary_tasks = mode; }
47+
4648
void UpdateList();
4749

4850
pcstr GetDebugType() override { return "UITaskListWnd"; }
@@ -63,7 +65,7 @@ class UITaskListWnd final : public CUIWindow, public CUIWndCallback
6365
CUI3tButton* m_bt_close{};
6466

6567
float m_orig_h{};
66-
68+
bool m_show_only_secondary_tasks{};
6769
}; // class UITaskListWnd
6870

6971
// -------------------------------------------------------------------------------------------------

src/xrGame/ui/UITaskWnd.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ bool CUITaskWnd::Init()
9191
m_task_wnd->SetAutoDelete(true);
9292
m_task_wnd->hint_wnd = hint_wnd;
9393
m_task_wnd->init_from_xml(xml, "second_task_wnd");
94+
m_task_wnd->ShowOnlySecondaryTasks(m_pSecondaryTaskItem != nullptr);
9495

9596
m_pMapWnd->AttachChild(m_task_wnd);
9697
m_task_wnd->SetMessageTarget(this);

0 commit comments

Comments
 (0)