Fix all the Cherry Pick Commits from TU24 to TU30

This commit is contained in:
GabsPuNs
2026-06-07 01:25:23 -04:00
parent 23f1c2255e
commit c38286e075
38 changed files with 2404 additions and 7648 deletions

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "UI.h"
#include "UIScene_LoadCreateJoinMenu.h"
@@ -3132,33 +3131,7 @@ void UIScene_LoadCreateJoinMenu::CheckAndJoinGame(int gameIndex)
}
if (bHasTexturePackInstalled == false)
{
#ifdef _XBOX
ULONGLONG ullOfferID_Full;
app.GetDLCFullOfferIDForPackID(m_initData->selectedSession->data.texturePackParentId, &ullOfferID_Full);
TelemetryManager->
RecordUpsellPresented(m_iPad, eSet_UpsellID_Texture_DLC, ullOfferID_Full & 0xFFFFFFFF);
#endif
UINT uiIDA[2];
uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION;
//uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION;
uiIDA[1] = IDS_CONFIRM_CANCEL;
ui.RequestAlertMessage(
IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, m_iPad,
&UIScene_LoadCreateJoinMenu::TexturePackDialogReturned, this);
return;
}
#ifdef __PSVITA__