Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 16 insertions, 8 deletions

diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index 9dbdc3d4..65c1b6fc 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -34,8 +34,8 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void *initData, UILayer *
 
 	m_labelOffers.init(app.GetString(IDS_DOWNLOADABLE_CONTENT_OFFERS));
 	m_buttonListOffers.init(eControl_OffersList);
-	m_labelHTMLSellText.init(" ");
-	m_labelPriceTag.init(" ");
+	m_labelHTMLSellText.init(L" ");
+	m_labelPriceTag.init(L" ");
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_DLCOffersMenu, 0);
 
 	m_bHasPurchased = false;
@@ -93,7 +93,7 @@ void UIScene_DLCOffersMenu::handleTimerComplete(int id)
 			// If they have, bring up the PSN warning and exit from the DLC menu
 			unsigned int uiIDA[1];
 			uiIDA[0]=IDS_OK;
-			C4JStorage::EMessageResult result = ui.RequestMessageBox( IDS_CONNECTION_LOST, g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT), uiIDA,1,ProfileManager.GetPrimaryPad(),UIScene_DLCOffersMenu::ExitDLCOffersMenu,this, app.GetStringTable());
+			C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CONNECTION_LOST, g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT), uiIDA,1,ProfileManager.GetPrimaryPad(),UIScene_DLCOffersMenu::ExitDLCOffersMenu,this);
 		}
 #endif
 		break;
@@ -105,10 +105,8 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::E
 {
 	UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam;
 
-#ifdef __ORBIS__
-	sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
-	sceNpCommerce2HidePsStoreIcon();
+#if defined __ORBIS__ || defined __PSVITA__
+	app.GetCommerce()->HidePsStoreIcon();
 #endif
 	ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu);
 
@@ -446,7 +444,7 @@ void UIScene_DLCOffersMenu::tick()
 						SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfoFromKeyname(info.productId);
 
 						// does the DLC info have an image?
-						if(pSONYDLCInfo->dwImageBytes!=0)
+						if(pSONYDLCInfo && pSONYDLCInfo->dwImageBytes!=0)
 						{ 
 							pbImageData=pSONYDLCInfo->pbImageData;
 							iImageDataBytes=pSONYDLCInfo->dwImageBytes;
@@ -645,6 +643,16 @@ void UIScene_DLCOffersMenu::tick()
 			int iIndex = getControlChildFocus();
 			MARKETPLACE_CONTENTOFFER_INFO xOffer = StorageManager.GetOffer(iIndex);
 
+			if (!ui.UsingBitmapFont()) // 4J-JEV: Replace characters we don't have.
+			{
+				for (int i=0; xOffer.wszCurrencyPrice[i]!=0; i++)
+				{
+					WCHAR *c = &xOffer.wszCurrencyPrice[i];
+					if (*c == L'\u20A9')		*c = L'\uFFE6'; // Korean Won.
+					else if (*c == L'\u00A5')	*c = L'\uFFE5'; // Japanese Yen.
+				}
+			}
+
 			if(UpdateDisplay(xOffer))
 			{
 				// image was available