From dfab53ff6e553c3b62e61a1c9d1d3f0e5c218770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AF=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2?= Date: Wed, 15 Apr 2026 20:51:03 +0300 Subject: [PATCH] Fix PDA task icons: enable icons for additional tasks and restore texture rendering --- src/xrGame/ui/UITaskWnd.cpp | 1 + src/xrGame/ui/map_hint.cpp | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/xrGame/ui/UITaskWnd.cpp b/src/xrGame/ui/UITaskWnd.cpp index 8149ff9b061..8b5cfbddca2 100644 --- a/src/xrGame/ui/UITaskWnd.cpp +++ b/src/xrGame/ui/UITaskWnd.cpp @@ -441,6 +441,7 @@ void CUITaskItem::InitTask(CGameTask* task) { if (task) { + S->TextureOn(); S->InitTexture(task->m_icon_texture_name.c_str()); S->SetStretchTexture(true); m_info["t_icon_over"]->Show(true); diff --git a/src/xrGame/ui/map_hint.cpp b/src/xrGame/ui/map_hint.cpp index 9e260b915d5..bb1db2edb6d 100644 --- a/src/xrGame/ui/map_hint.cpp +++ b/src/xrGame/ui/map_hint.cpp @@ -173,20 +173,31 @@ void CUIMapLocationHint::SetInfoTask(CGameTask* task) } else if (task->GetTaskType() == eTaskTypeAdditional) { - m_info["t_icon"]->Show(false); - float w = m_info["t_hint_text"]->GetWidth(); + // Иконка побочного задания + m_info["t_icon"]->Show(true); + + // Ширина рамки под описание задания (выравнивается по строке времени t_time) + float w = m_info["t_time"]->GetWidth(); - Fvector2 pos = m_info["t_caption"]->GetWndPos(); + // Расположение иконки побочного задания слева + Fvector2 pos = m_info["t_icon"]->GetWndPos(); pos.x = m_posx_icon; + m_info["t_icon"]->SetWndPos(pos); + + // Заголовок справа от иконки + pos = m_info["t_caption"]->GetWndPos(); + pos.x = m_posx_caption; m_info["t_caption"]->SetWndPos(pos); m_info["t_caption"]->SetWidth(w); + // Время pos = m_info["t_time"]->GetWndPos(); - pos.x = m_posx_icon; + pos.x = m_posx_caption; m_info["t_time"]->SetWndPos(pos); + // Сколько осталось времени pos = m_info["t_time_rem"]->GetWndPos(); - pos.x = m_posx_icon; + pos.x = m_posx_caption; m_info["t_time_rem"]->SetWndPos(pos); }