fix: the cheeky fix for orbis

Minecraft.Client/Common/Consoles_App.cpp

@@ -4419,9 +4419,7 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
 	else
 	{
 		//  4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
-#ifdef __ORBIS__
-		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#if defined __PSVITA__ || defined __ORBIS__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);
@@ -6648,7 +6646,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 	switch(uiVKey)
 	{
 	case VK_PAD_A:
-#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) || defined(_WINDOWS64)
 		if( InputManager.IsCircleCrossSwapped() ) replacement = L"ButtonB";
 		else replacement = L"ButtonA";
 #else
@@ -10048,7 +10046,7 @@ enum ETitleUpdateTexturePacks
 };
 
 #ifdef _WINDOWS64
-wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\";
+wstring titleUpdateTexturePackRoot = L"Windows64Media\\DLC\\";
 #elif defined(__ORBIS__)
 wstring titleUpdateTexturePackRoot = L"app0/Orbis/DLC/";
 #elif defined(__PSVITA__)

Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp

@@ -54,9 +54,7 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo
 	else if( newState == SQRNetworkManager::SNM_STATE_JOINING )
 	{
 		// 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon
-#ifdef __ORBIS__
-		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#if defined __PSVITA__ || defined __ORBIS__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		m_bLeavingGame = false;

Minecraft.Client/Common/Network/Sony/SonyCommerce.h

@@ -170,8 +170,7 @@ public:
 	virtual void CheckForTrialUpgradeKey() = 0;
 	virtual bool LicenseChecked() = 0;
 
-// str1k3r: Currently does not work on Orbis.
-#if defined __PSVITA__ // || defined __ORBIS__
+#if defined __PSVITA__ || defined __ORBIS__
 	virtual void ShowPsStoreIcon() = 0;
 	virtual void HidePsStoreIcon() = 0;
 #endif

Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp

@@ -53,10 +53,8 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void *initData, UILayer *pare
 	
 	TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0);
 
-#ifdef __ORBIS__
-	sceNpCommerceShowPsStoreIcon(SCE_NP_COMMERCE_PS_STORE_ICON_RIGHT);
-#elif defined __PSVITA__
-	sceNpCommerce2ShowPsStoreIcon(SCE_NP_COMMERCE2_ICON_DISP_RIGHT);
+#if defined __ORBIS__ || defined __PSVITA__
+	app.GetCommerce()->ShowPsStoreIcon();
 #endif
 
 #if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ )
@@ -98,9 +96,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 	case ACTION_MENU_CANCEL:
 		if(pressed)
 		{
-#ifdef __ORBIS__
-		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#if defined __PSVITA__ || defined __ORBIS__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 			navigateBack();
@@ -172,9 +168,7 @@ int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMess
 {
 	UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam;
 
-#ifdef __ORBIS__
-		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#if defined __PSVITA__ || defined __ORBIS__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 	pClass->navigateBack();

Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp

@@ -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__
-	app.GetCommerce()->HidePsStoreIcon();
+#if defined __PSVITA__ || defined __ORBIS__
+		app.GetCommerce()->HidePsStoreIcon();
 #endif
 	ui.NavigateToHomeMenu();//iPad,eUIScene_MainMenu);