Skip to content

Fix loading UI vanishing when using a background map #1413

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

Merged
DESTROYGIRL merged 1 commit into from
Oct 26, 2025
Merged

Fix loading UI vanishing when using a background map #1413

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
8 changes: 2 additions & 6 deletions src/game/client/neo/ui/neo_loading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ CNeoLoading::CNeoLoading()

vgui::IScheme *pScheme = vgui::scheme()->GetIScheme(neoscheme);
ApplySchemeSettings(pScheme);

m_pHostMap = g_pCVar->FindVar("host_map");
Assert(m_pHostMap != nullptr);
}

CNeoLoading::~CNeoLoading()
Expand Down Expand Up @@ -193,10 +190,9 @@ void CNeoLoading::OnMainLoop(const NeoUI::Mode eMode)

static bool bStaticInitNeoUI = false;
bool bSkipRender = false;
if (iStrIdx == m_aStrIdxMap[LOADINGSTATE_LOADING] && m_pHostMap)
if (iStrIdx == m_aStrIdxMap[LOADINGSTATE_LOADING])
{
auto hostMapName = m_pHostMap->GetString();
if (Q_stristr(hostMapName, "background_"))
if (engine->IsLevelMainMenuBackground())
{
bSkipRender = true;
}
Expand Down
2 changes: 0 additions & 2 deletions src/game/client/neo/ui/neo_loading.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ class CNeoLoading : public vgui::EditablePanel
int m_iRowsInScreen = 0;
int m_iRootSubPanelWide = 0;

ConVar* m_pHostMap;

bool m_bValidGameUIPanels = false;
vgui::Frame *m_pLoadingPanel = nullptr;
vgui::ProgressBar *m_pProgressBarMain = nullptr;
Expand Down