Skip to content

Enable all map filters in ClearSky mode #1884

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.

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

Merged
merged 5 commits into from
Jun 9, 2025
Merged

Conversation

cropinghigh
Copy link
Contributor

Seems like Clear Sky doesn't have map filter functionality, thus all CUITaskWnd::Is... functions always return false, resulting in unusable task focus and hide/show buttons.
Additional testing requested.
Should not affect Call of Pripyat mode.

@cropinghigh
Copy link
Contributor Author

Also fixes always invisible treasure icons

Copy link
Member

@Xottab-DUTY Xottab-DUTY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for helping to find the culprit!
I remember that everything was working, so I didn't knew the clue when #1835 was reported.
It turned out that I forgot that filters should be always enabled by default when I was working on dbc8a5c, so I made them disabled in that commit accidentally.

The correct fix is to make the functions to return true if the filters are missing, no need to specifically check for Clear Sky mode.
And you also need to change CUIMapFilters::IsFilterEnabled in xrGame/UIMapFilters.cpp so it looks like this:

bool CUIMapFilters::IsFilterEnabled(eSpotsFilter filter) const
{
    return !m_filters[filter] || m_filters[filter]->GetCheck();
}

Could you make this change?
Oh nevermind, it's fast to do through the GitHub interface. I did that.

@Xottab-DUTY Xottab-DUTY moved this to In Progress in Roadmap Jun 9, 2025
@Xottab-DUTY Xottab-DUTY merged commit 7597de4 into OpenXRay:dev Jun 9, 2025
33 of 35 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Roadmap Jun 9, 2025
@Xottab-DUTY Xottab-DUTY added Bug The issue in the run-time. Clear Sky This can affect Clear Sky compatibility, or related to this game. Shadow of Chernobyl This can affect Shadow of Chernobyl compatibility, or related to this game. labels Jun 10, 2025
@Xottab-DUTY Xottab-DUTY removed this from Roadmap Jun 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug The issue in the run-time. Clear Sky This can affect Clear Sky compatibility, or related to this game. Shadow of Chernobyl This can affect Shadow of Chernobyl compatibility, or related to this game. UI
Projects
None yet
2 participants