NaN/cafeberry
0
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into networking

Browse Source
This commit is contained in:
str1k3r
2026-09-06 09:33:19 -04:00
parent 5065c28b5c 7b4821d329
commit 83e11bdf9b
1476 changed files with 260663 additions and 269030 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+11 -16
View File
@@ -369,7 +369,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
m_eAction=eAction_RunUnlockOrDLC;
signInReturnedFunc = &UIScene_MainMenu::UnlockFullGame_SignInReturned;
break;
#if defined _XBOX
#if defined(_XBOX) || defined(_WINDOWS64)
case eControl_Exit:
if( ProfileManager.IsFullVersion() )
{
@@ -380,9 +380,6 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
}
else
{
#ifdef _XBOX_ONE
ui.ShowPlayerDisplayname(true);
#endif
ui.NavigateToScene(primaryPad,eUIScene_TrialExitUpsell);
}
break;
@@ -670,7 +667,7 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,
#endif
{
ProfileManager.SetLockedProfile(ProfileManager.GetPrimaryPad());
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(iPad, eUIScene_HelpAndOptionsMenu);
@@ -794,9 +791,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
// ensure we've applied this player's settings
app.ApplyGameSettingsChanged(iPad);
#ifdef _XBOX_ONE
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu);
}
else
@@ -857,7 +852,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
// ensure we've applied this player's settings
app.ApplyGameSettingsChanged(iPad);
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu);
@@ -871,7 +866,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
ProfileManager.DisplayOfflineProfile(&CScene_Main::CreateLoad_OfflineProfileReturned,pClass, ProfileManager.GetPrimaryPad() );
#else
app.DebugPrintf("Offline Profile returned not implemented\n");
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu);
@@ -970,7 +965,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,in
else
{
ProfileManager.SetLockedProfile(ProfileManager.GetPrimaryPad());
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LeaderboardsMenu);
@@ -1437,7 +1432,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad)
}
#else
ProfileManager.SetLockedProfile(iPad);
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu);
@@ -1509,7 +1504,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad)
// ensure we've applied this player's settings
app.ApplyGameSettingsChanged(iPad);
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu);
@@ -1638,7 +1633,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad)
// If the player was signed in before selecting play, we'll not have read the profile yet, so query the sign-in status to get this to happen
ProfileManager.QuerySigninStatus();
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(iPad, eUIScene_LeaderboardsMenu);
@@ -1740,7 +1735,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
else
{
ProfileManager.SetLockedProfile(iPad);
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_DLCMainMenu);
@@ -2063,7 +2058,7 @@ void UIScene_MainMenu::RunHelpAndOptions(int iPad)
#endif
{
ProfileManager.SetLockedProfile(iPad);
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
proceedToScene(iPad, eUIScene_HelpAndOptionsMenu);
@@ -2142,7 +2137,7 @@ void UIScene_MainMenu::LoadTrial(void)
ui.ShowTrialTimer(true);
#ifdef _XBOX_ONE
#if defined _XBOX_ONE || _WINDOWS64
ui.ShowPlayerDisplayname(true);
#endif
ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);