Merge remote-tracking branch 'upstream/main' into TU31

This commit is contained in:
Fireblade committed 2026-07-05 18:32:31 -04:00
commit ede54a1600
85 files changed
+2061 -899

No files matched your search

@@ -4660,7 +4660,7 @@ void UIScene_LoadCreateJoinMenu::RebuildJoinGamesListVisual(bool syncFocus)
m_buttonListGames.getItemCount() - 1,
L"lceheadwer.png",
L"lceheadwer");
RefreshServerListHtmlPatch();
#endif
if (m_currentSessions == nullptr || m_currentSessions->empty())
@@ -4741,7 +4741,10 @@ void UIScene_LoadCreateJoinMenu::RebuildJoinGamesListVisual(bool syncFocus)
}
}
m_buttonListGames.addItem(sessionInfo->displayLabel, modeIconName, tpIconName);
wstring htmlLabel = app.EscapeHTMLString(sessionInfo->displayLabel);
htmlLabel = app.FormatColoredString(htmlLabel);
m_buttonListGames.addItem(htmlLabel, modeIconName, tpIconName);
if (memcmp(&selectedSessionId, &sessionInfo->sessionId, sizeof(SessionID)) == 0)
@@ -4763,6 +4766,8 @@ void UIScene_LoadCreateJoinMenu::RebuildJoinGamesListVisual(bool syncFocus)
}
RefreshServerListHtmlPatch();
if(syncFocus)
m_buttonListGames.updateChildFocus(m_buttonListGames.getCurrentSelection());
@@ -9124,6 +9129,21 @@ int UIScene_LoadCreateJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool b
}
void UIScene_LoadCreateJoinMenu::RefreshServerListHtmlPatch() {
S32 arrayItems = 0;
IggyValueGetArrayLengthRS(m_buttonListGames.getIggyValuePath(), 0, "m_aItems", &arrayItems);
IggyValuePath listPath;
IggyValuePathMakeNameRef(&listPath, m_buttonListGames.getIggyValuePath(), "m_aItems");
for (int i = 0; i < arrayItems; i++) {
IggyValuePath listItem;
IggyValuePathMakeArrayRef(&listItem, &listPath, i);
IggyValueSetBooleanRS(&listItem, 0, "m_bUseHtmlText", true);
}
}
void UIScene_LoadCreateJoinMenu::AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name)