Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
View File

@@ -191,13 +191,13 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
switch(iTextC)
{
case 0:
m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des f<>tes de fin d'ann<6E>e.<br><br>1-4 joueurs<br>2-8 joueurs en r<>seau<br><br> Cet article fait l<>objet d<>une licence ou d<>une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions g<>n<EFBFBD>rales du service du r<>seau, au contrat d<>utilisateur, aux restrictions d<>utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne t<>l<EFBFBD>chargez pas ce produit. Cet article peut <20>tre utilis<69> avec un maximum de deux syst<73>mes PlayStation<6F>3 activ<69>s associ<63>s <20> ce compte Sony Entertainment Network.<2E><br><br>'Minecraft' est une marque commerciale de Notch Development AB.");
m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des f<>tes de fin d'ann<6E>e.<br><br>1-4 joueurs<br>2-8 joueurs en r<>seau<br><br> Cet article fait l<>objet d<>une licence ou d<>une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions g<>n<EFBFBD>rales du service du r<>seau, au contrat d<>utilisateur, aux restrictions d<>utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne t<>l<EFBFBD>chargez pas ce produit. Cet article peut <20>tre utilis<69> avec un maximum de deux syst<73>mes PlayStation<6F>3 activ<69>s associ<63>s <20> ce compte Sony Entertainment Network.<2E><br><br>'Minecraft' est une marque commerciale de Notch Development AB.");
break;
case 1:
m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.<br><br>1-4 jugadores<br>2-8 jugadores en red<br><br> Sony Computer Entertainment America le concede la licencia o sublicencia de este art<72>culo, que est<73> sujeto a los t<>rminos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este art<72>culo, as<61> como otros t<>rminos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos t<>rminos, no descargue este art<72>culo. Este art<72>culo puede usarse en hasta dos sistemas PlayStation<6F>3 activados asociados con esta cuenta de Sony Entertainment Network.<2E><br><br>'Minecraft' es una marca comercial de Notch Development AB.");
m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.<br><br>1-4 jugadores<br>2-8 jugadores en red<br><br> Sony Computer Entertainment America le concede la licencia o sublicencia de este art<72>culo, que est<73> sujeto a los t<>rminos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este art<72>culo, as<61> como otros t<>rminos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos t<>rminos, no descargue este art<72>culo. Este art<72>culo puede usarse en hasta dos sistemas PlayStation<6F>3 activados asociados con esta cuenta de Sony Entertainment Network.<2E><br><br>'Minecraft' es una marca comercial de Notch Development AB.");
break;
case 2:
m_labelHTMLSellText.init("Este <20> um incr<63>vel pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.<br><br>1-4 Jogadores<br>Jogadores em rede 2-8<br><br> Este item est<73> sendo licenciado ou sublicenciado para voc<6F> pela Sony Computer Entertainment America e est<73> sujeito aos Termos de Servi<76>o da Rede e Acordo do Usu<73>rio, as restri<72><69>es de uso deste item e outros termos aplic<69>veis est<73>o localizados em www.us.playstation.com/support/useragreements. Caso n<>o queira aceitar todos esses termos, n<>o baixe este item. Este item pode ser usado com at<61> 2 sistemas PlayStation<6F>3 ativados associados a esta Conta de Rede Sony Entertainment.<2E><br><br>'Minecraft' <20> uma marca registrada da Notch Development AB");
m_labelHTMLSellText.init("Este <20> um incr<63>vel pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.<br><br>1-4 Jogadores<br>Jogadores em rede 2-8<br><br> Este item est<73> sendo licenciado ou sublicenciado para voc<6F> pela Sony Computer Entertainment America e est<73> sujeito aos Termos de Servi<76>o da Rede e Acordo do Usu<73>rio, as restri<72><69>es de uso deste item e outros termos aplic<69>veis est<73>o localizados em www.us.playstation.com/support/useragreements. Caso n<>o queira aceitar todos esses termos, n<>o baixe este item. Este item pode ser usado com at<61> 2 sistemas PlayStation<6F>3 ativados associados a esta Conta de Rede Sony Entertainment.<2E><br><br>'Minecraft' <20> uma marca registrada da Notch Development AB");
break;
}
iTextC++;
@@ -208,7 +208,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
case ACTION_MENU_OTHER_STICK_DOWN:
case ACTION_MENU_OTHER_STICK_UP:
// don't pass down PageUp or PageDown because this will cause conflicts between the buttonlist and scrollable html text component
//case ACTION_MENU_PAGEUP:
//case ACTION_MENU_PAGEUP:
//case ACTION_MENU_PAGEDOWN:
sendInputToMovie(key, repeat, pressed, released);
break;
@@ -235,7 +235,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
#ifdef __PS3__
// is the item purchasable?
if(info.purchasabilityFlag==1)
if(info.purchasabilityFlag==1)
{
// can be bought
app.Checkout(info.skuId);
@@ -249,7 +249,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
}
#else // __ORBIS__
// is the item purchasable?
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{
// can be bought
app.Checkout(info.skuId);
@@ -280,7 +280,7 @@ void UIScene_DLCOffersMenu::handleSelectionChanged(F64 selectedId)
}
void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
{
{
app.DebugPrintf("UIScene_DLCOffersMenu::handleFocusChange\n");
#ifdef __PSVITA__
@@ -305,7 +305,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
#if defined __PSVITA__ || defined __ORBIS__
if(m_pvProductInfo)
{
{
m_bIsSelected = true;
vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
string teststring;
@@ -315,7 +315,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
}
SonyCommerce::ProductInfo info = *it;
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{
m_bHasPurchased=false;
}
@@ -379,7 +379,7 @@ void UIScene_DLCOffersMenu::tick()
#ifdef __PS3__
// is the item purchasable?
if(info.purchasabilityFlag==1)
if(info.purchasabilityFlag==1)
{
// can be bought
app.DebugPrintf("Adding DLC (%s) - not bought\n",teststring.c_str());
@@ -397,7 +397,7 @@ void UIScene_DLCOffersMenu::tick()
}
#else // __ORBIS__
// is the item purchasable?
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{
// can be bought
m_buttonListOffers.addItem(teststring,false,i);
@@ -445,13 +445,13 @@ void UIScene_DLCOffersMenu::tick()
// does the DLC info have an image?
if(pSONYDLCInfo && pSONYDLCInfo->dwImageBytes!=0)
{
{
pbImageData=pSONYDLCInfo->pbImageData;
iImageDataBytes=pSONYDLCInfo->dwImageBytes;
bDeleteData=false; // we'll clean up the local LDC images
}
}
else
#endif
#endif
if(info.imageUrl[0]!=0)
{
SonyHttp::getDataFromURL(info.imageUrl,(void **)&pbImageData,&iImageDataBytes);
@@ -460,7 +460,7 @@ void UIScene_DLCOffersMenu::tick()
if(iImageDataBytes!=0)
{
// set the image
// set the image
registerSubstitutionTexture(textureName,pbImageData,iImageDataBytes,bDeleteData);
m_bitmapIconOfferImage.setTextureName(textureName);
// 4J Stu - Don't delete this
@@ -497,25 +497,25 @@ void UIScene_DLCOffersMenu::tick()
m_labelOffers.setLabel(app.GetString(IDS_NO_DLCCATEGORIES));
}
}
m_Timer.setVisible(false);
m_bProductInfoShown=true;
}
}
else
{
#ifdef __PSVITA__
#ifdef __PSVITA__
// MGH - fixes bug 5768 on Vita - should be extended properly to work for other platforms
if((SonyCommerce_Vita::getPurchasabilityUpdated()) && app.GetCommerceProductListRetrieved()&& app.GetCommerceProductListInfoRetrieved() && m_iTotalDLC > 0)
{
{
{
vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
for(int i=0;i<m_iTotalDLC;i++)
{
SonyCommerce::ProductInfo info = *it;
// is the item purchasable?
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{
// can be bought
m_buttonListOffers.showTick(i, false);
@@ -577,11 +577,11 @@ void UIScene_DLCOffersMenu::tick()
// does the DLC info have an image?
if(pSONYDLCInfo->dwImageBytes!=0)
{
{
pbImageData=pSONYDLCInfo->pbImageData;
iImageDataBytes=pSONYDLCInfo->dwImageBytes;
bDeleteData=false; // we'll clean up the local LDC images
}
}
else
#endif
{
@@ -601,7 +601,7 @@ void UIScene_DLCOffersMenu::tick()
else
{
m_bitmapIconOfferImage.setTextureName(L"");
}
}
}
else
{
@@ -620,7 +620,7 @@ void UIScene_DLCOffersMenu::tick()
{
// DLCContentRetrieved is to see if the type of content has been retrieved - and on Durango there is only type 0 - XMARKETPLACE_OFFERING_TYPE_CONTENT
if(app.DLCContentRetrieved(e_Marketplace_Content))
{
{
m_bDLCRequiredIsRetrieved=true;
// Retrieve the info
@@ -660,29 +660,10 @@ void UIScene_DLCOffersMenu::tick()
}
}
}
// if(m_bBitmapOfferIconDisplayed==false)
// {
// // do we have it yet?
// if
// }
// retrieve the icons for the DLC
// if(m_vIconRetrieval.size()>0)
// {
// // for each icon, request it, and remove it from the list
// // the callback for the retrieval will update the display if needed
//
// AUTO_VAR(itEnd, m_vIconRetrieval.end());
// for (AUTO_VAR(it, m_vIconRetrieval.begin()); it != itEnd; it++)
// {
//
// }
//
// }
#endif
}
#if defined _XBOX_ONE
#if defined _XBOX_ONE
void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
{
MARKETPLACE_CONTENTOFFER_INFO xOffer;
@@ -719,7 +700,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
app.DebugPrintf("Unknown offer - %ls\n",xOffer.wszOfferName);
}
}
qsort( OrderA, uiDLCCount, sizeof(SORTINDEXSTRUCT), OrderSortFunction );
for(int i = 0; i < uiDLCCount; i++)
@@ -737,7 +718,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
}
if(pDLC->eDLCType==(eDLCContentType)m_iProductInfoIndex)
{
{
wstring wstrTemp=xOffer.wszOfferName;
// 4J-PB - Rog requested we remove the Minecraft at the start of the name. It's required for the Bing search, but gets in the way here
@@ -774,7 +755,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
* We've filtered results out from the list, need to keep track
* of the 'actual' list index.
*/
iCount++;
iCount++;
}
}
@@ -834,7 +815,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
// is the file in the local DLC images?
// is the file in the TMS XZP?
// is the file in the TMS XZP?
//int iIndex = app.GetLocalTMSFileIndex(cString, true);
if(dlc->dwImageBytes!=0)
@@ -862,7 +843,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
else
{
if(hasRegisteredSubstitutionTexture(cString)==false)
{
{
BYTE *pData=NULL;
DWORD dwSize=0;
app.GetMemFileDetails(cString,&pData,&dwSize);
@@ -879,12 +860,12 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
m_bitmapIconOfferImage.setTextureName(cString);
}
bImageAvailable=true;
}
}
}
m_labelHTMLSellText.setLabel(xOffer.wszSellText);
// set the price info
// set the price info
m_labelPriceTag.setVisible(true);
m_labelPriceTag.setLabel(xOffer.wszCurrencyPrice);
@@ -923,7 +904,7 @@ void UIScene_DLCOffersMenu::HandleDLCInstalled()
}
// void UIScene_DLCOffersMenu::HandleDLCMountingComplete()
// {
// {
// app.DebugPrintf(4,"UIScene_SkinSelectMenu::HandleDLCMountingComplete\n");
//}