aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp')
-rw-r--r--Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp85
1 files changed, 33 insertions, 52 deletions
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index 65c1b6fc..c109ed62 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -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é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é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échargez pas ce produit. Cet article peut être utilisé avec un maximum de deux systèmes PlayStation®3 activés associés à ce compte Sony Entertainment Network. <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�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�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�chargez pas ce produit. Cet article peut �tre utilis� avec un maximum de deux syst�mes PlayStation�3 activ�s associ�s � ce compte Sony Entertainment Network.�<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ículo, que está sujeto a los términos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artículo, así 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ículo. Este artículo puede usarse en hasta dos sistemas PlayStation®3 activados asociados con esta cuenta de Sony Entertainment Network. <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�culo, que est� sujeto a los t�rminos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este art�culo, as� 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�culo. Este art�culo puede usarse en hasta dos sistemas PlayStation�3 activados asociados con esta cuenta de Sony Entertainment Network.�<br><br>'Minecraft' es una marca comercial de Notch Development AB.");
break;
case 2:
- m_labelHTMLSellText.init("Este é um incrí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á sendo licenciado ou sublicenciado para você pela Sony Computer Entertainment America e está sujeito aos Termos de Serviço da Rede e Acordo do Usuário, as restrições de uso deste item e outros termos aplicáveis estã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é 2 sistemas PlayStation®3 ativados associados a esta Conta de Rede Sony Entertainment. <br><br>'Minecraft' é uma marca registrada da Notch Development AB");
+ m_labelHTMLSellText.init("Este � um incr�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� sendo licenciado ou sublicenciado para voc� pela Sony Computer Entertainment America e est� sujeito aos Termos de Servi�o da Rede e Acordo do Usu�rio, as restri��es de uso deste item e outros termos aplic�veis est�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� 2 sistemas PlayStation�3 ativados associados a esta Conta de Rede Sony Entertainment.�<br><br>'Minecraft' � 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");
//}
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-22 00:30:20 +0000