Skip to content

Don't warn about FOV if the FOV hasn't changed #1602

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
AdamTadeusz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't warn about FOV if the FOV hasn't changed #1602

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
5 changes: 3 additions & 2 deletions src/game/client/neo/ui/neo_root.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ void CNeoRoot::MainLoopRoot(const MainLoopParam param)
NeoUI::EndContext();
}

extern ConVar neo_fov;
void CNeoRoot::MainLoopSettings(const MainLoopParam param)
{
struct NeoSettingsFunc
Expand Down Expand Up @@ -1100,7 +1101,7 @@ void CNeoRoot::MainLoopSettings(const MainLoopParam param)
if (NeoUI::Button(NeoUI::HintAlt(L"Accept (F8)", L"Accept (START)")).bPressed
|| NeoUI::Bind(BTNCODES_ACCEPT, ARRAYSIZE(BTNCODES_ACCEPT)))
{
if (m_ns.video.iFov > maxSupportedFov)
if (m_ns.video.iFov > maxSupportedFov && m_ns.video.iFov != neo_fov.GetInt())
{
m_state = STATE_CONFIRMSETTINGS;
}
Expand Down Expand Up @@ -2300,7 +2301,7 @@ void CNeoRoot::MainLoopPopup(const MainLoopParam param)
L"Error: Invalid settings, cannot save.");
NeoUI::SwapFont(NeoUI::FONT_NTNORMAL);

if (m_ns.video.iFov > maxSupportedFov)
if (m_ns.video.iFov > maxSupportedFov && m_ns.video.iFov != neo_fov.GetInt())
{
wchar_t warning[77+1];
V_swprintf_safe(warning,
Expand Down