Skip to content

Fix PDA task icons: enable icons for additional tasks and restore texture rendering #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yaroslavrib wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix PDA task icons: enable icons for additional tasks and restore texture rendering #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/xrGame/ui/UITaskWnd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
21 changes: 16 additions & 5 deletions src/xrGame/ui/map_hint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading