Revert "rework: README.md (in progress)"

This reverts commit babe3fdc650799a10a8bb0a0545ff8d7ba95cb83.

.gitattributes

@@ -0,0 +1 @@
+*.sfo binary

Minecraft.Client/Common/App_enums.h

@@ -835,7 +835,7 @@ enum EControllerActions
 	ACTION_MENU_GTC_RESUME,
 #endif
 
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ACTION_MENU_TOUCHPAD_PRESS,
 #endif
 

Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp

@@ -1309,7 +1309,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 		break;
 #endif
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(!bRepeat)

Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp

@@ -192,7 +192,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 		bHandled = true;
 		break;
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		// Do some crafting!

Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp

@@ -59,7 +59,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 		handled = true;
 		break;
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(!m_activeOffers.empty())

Minecraft.Client/Common/UI/UIController.cpp

@@ -35,15 +35,16 @@
 #ifdef __ORBIS__
 #include "Orbis\Iggy\include\iggyperfmon.h"
 #include "Orbis\Iggy\include\iggyperfmon_orbis.h"
-#elif defined _DURANGO
+#elif _DURANGO
 #include "Durango\Iggy\include\iggyperfmon.h"
-#elif defined __PS3__
+#elif __PS3__
 #include "PS3\Iggy\include\iggyperfmon.h"
 #include "PS3\Iggy\include\iggyperfmon_ps3.h"
-#elif defined __PSVITA__
+#elif __PSVITA__
 #include "PSVita\Iggy\include\iggyperfmon.h"
 #include "PSVita\Iggy\include\iggyperfmon_psp2.h"
-#elif defined __WINDOWS64
+#elif _WINDOWS64
+//str1k3r - IggyPerfmon is broken on windows64 as we dont have the DLL
 #include "Windows64\Iggy\include\iggyperfmon.h"
 #endif
 

Minecraft.Client/Common/UI/UIScene.cpp

@@ -946,7 +946,7 @@ int UIScene::convertGameActionToIggyKeycode(int action)
 	int keycode = -1;
 	switch(action)
 	{
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_A:

Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp

@@ -12,7 +12,7 @@ UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *
 	// in this scene, we override the press sound with our own for crafting success or fail
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,true);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_X,true);
@@ -51,7 +51,7 @@ void UIScene_AbstractContainerMenu::handleDestroy()
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_X,false);

Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp

@@ -224,7 +224,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 // 			}
 // 			break;
 		case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 			if(pressed)

Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp

@@ -159,7 +159,7 @@ void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if( pressed )

Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp

@@ -163,7 +163,7 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 	// in this scene, we override the press sound with our own for crafting success or fail
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,true);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,true);
@@ -204,7 +204,7 @@ void UIScene_CraftingMenu::handleDestroy()
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false);

Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp

@@ -367,7 +367,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 

Minecraft.Client/Common/UI/UIScene_Credits.cpp

@@ -648,7 +648,7 @@ void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp

@@ -103,7 +103,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp

@@ -149,7 +149,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp

@@ -68,7 +68,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 		handled = true;
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp

@@ -276,7 +276,7 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
 		switch(key)
 		{
 		case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 			if(pressed)

Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp

@@ -189,7 +189,7 @@ void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, boo
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	//CD - Added for audio

Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp

@@ -210,7 +210,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 		}
 		break;
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)

Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp

@@ -175,7 +175,7 @@ void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp

@@ -136,7 +136,7 @@ void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp

@@ -313,7 +313,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp

@@ -414,7 +414,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_Intro.cpp

@@ -12,27 +12,27 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
 
 	bool bSkipESRB = false;
 	bool bChina = false;
-#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-	bSkipESRB = app.GetProductSKU() != e_sku_SCEA;
-#elif defined(_XBOX) || defined(_DURANGO)
+#if (defined __PS3__ || __ORBIS__ || __PSVITA__)
+	bSkipESRB = app.IsAmericanSKU();
+#else
 	bSkipESRB = !ProfileManager.LocaleIsUSorCanada();
 #endif
 
-#ifdef _DURANGO
+#if (defined _DURANGO || _WINDOWS64)
 	bChina = ProfileManager.LocaleIsChina();
 #endif
 	// 4J Stu - These map to values in the Actionscript
 #ifdef _WINDOWS64
 	int platformIdx = 0;
-#elif defined(_XBOX)
+#elif _XBOX
 	int platformIdx = 1;
-#elif defined(_DURANGO)
+#elif _DURANGO
 	int platformIdx = 2;
-#elif defined(__PS3__)
+#elif __PS3__
 	int platformIdx = 3;
-#elif defined(__ORBIS__)
+#elif __ORBIS__
 	int platformIdx = 4;
-#elif defined(__PSVITA__)
+#elif __PSVITA__
 	int platformIdx = 5;
 #endif
 
@@ -67,7 +67,7 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, bo
 	switch(key)
 	{
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(!m_bIgnoreNavigate)

Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp

@@ -286,7 +286,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 		}
 		handled = true;
 		break;
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp

@@ -96,7 +96,7 @@ void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, bool
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp

@@ -271,7 +271,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		// 4J-JEV: Inform user why their game must be offline.

Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp

@@ -642,7 +642,7 @@ void UIScene_LoadMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		

Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -1209,7 +1209,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
         break;
 
     case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
     case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
     case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_MainMenu.cpp

@@ -237,8 +237,7 @@ void UIScene_MainMenu::handleReload()
 	removeControl( &m_buttons[(int)eControl_Exit], false );
 	// We don't have a way to display trophies/achievements, so remove the button
 	removeControl( &m_buttons[(int)eControl_Achievements], false );
-#endif
-#ifdef _DURANGO
+#elif _DURANGO
 	// Allowed to not have achievements in the menu
 	removeControl( &m_buttons[(int)eControl_Achievements], false );
 #endif
@@ -250,7 +249,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 	
 	if ( m_bIgnorePress || (eNavigateWhenReady >= 0) ) return;
 
-#if defined (__ORBIS__) || defined (__PSVITA__)
+#if (defined __ORBIS__ || __PSVITA__ || _WINDOWS64)
 	// ignore all players except player 0 - it's their profile that is currently being used
 	if(iPad!=0) return;
 #endif
@@ -260,7 +259,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 	switch(key)
 	{
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)
@@ -278,8 +277,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 			ProfileManager.RequestSignInUI(false, false, false, false, false, ChooseUser_SignInReturned, this, iPad);
 		}
 		break;
-#endif
-#ifdef __PSVITA__
+#elif __PSVITA__
 	case ACTION_MENU_X:
 		if(pressed && ProfileManager.IsFullVersion()) 
 		{
@@ -563,7 +561,7 @@ int UIScene_MainMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EM
 			SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_MainMenu::UnlockFullGame_SignInReturned, pClass);
 			break;
 		}
-#elif defined __PSVITA__
+#elif __PSVITA__
 		switch(pClass->m_eAction)
 		{
 		case eAction_RunLeaderboardsPSN:

Minecraft.Client/Common/UI/UIScene_MessageBox.cpp

@@ -104,7 +104,7 @@ void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool presse
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp

@@ -83,7 +83,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool
 			ui.NavigateBack(m_iPad);
 		}
 		break;
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_OK:

Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp

@@ -379,7 +379,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp

@@ -107,7 +107,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, bool pr
 			}
 			break;
 		case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 			if(pressed)

Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp

@@ -69,7 +69,7 @@ void UIScene_ReinstallMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp

@@ -71,7 +71,7 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, bool press
 	switch(key)
 	{
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp

@@ -76,7 +76,7 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, bool
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp

@@ -76,7 +76,7 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, bo
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp

@@ -113,7 +113,7 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp

@@ -102,7 +102,7 @@ void UIScene_SettingsMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp

@@ -224,7 +224,7 @@ void UIScene_SettingsOptionsMenu::handleInput(int iPad, int key, bool repeat, bo
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp

@@ -129,7 +129,7 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp

@@ -129,7 +129,7 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp

@@ -217,7 +217,7 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)

Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp

@@ -236,7 +236,7 @@ void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp

@@ -53,7 +53,7 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *par
 	// in this scene, we override the press sound with our own for crafting success or fail
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,true);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,true);
@@ -99,7 +99,7 @@ void UIScene_TradingMenu::handleDestroy()
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false);

Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp

@@ -31,7 +31,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, bool p
 		navigateBack();
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)

Minecraft.Client/Extrax64Stubs.cpp

@@ -478,17 +478,13 @@ void				C_4JProfile::CancelProfileAvatarRequest() {}
 #ifdef _DURANGO
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
-#elif _WINDOWS64
-void				CConsoleMinecraftApp::SetFakeGamertag(char *name){ ProfileManager.SetFakeGamerTag(name); }
-#else //str1k3r - every other platform BUT Windows64 and Durango
+#elif !_WINDOWS64
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
 wstring				C_4JProfile::GetDisplayName(int iPad){ return L"PlayerName"; }
 #endif
 void				C_4JProfile::SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam) {}
 void				C_4JProfile::SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, unsigned int),LPVOID lpParam) {}
-bool				C_4JProfile::RegionIsNorthAmerica(void) { return false; }
-bool				C_4JProfile::LocaleIsUSorCanada(void) { return false; }
 void				C_4JProfile::SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam) {}
 int( *defaultOptionsCallback)(LPVOID,C_4JProfile::PROFILESETTINGS *, const int iPad) = NULL;
 LPVOID lpProfileParam = NULL;

Minecraft.Client/Textures.cpp

@@ -466,7 +466,7 @@ ResourceLocation *Textures::getTextureLocation(int iconType)
 	case Icon::TYPE_TERRAIN:
 		return &TextureAtlas::LOCATION_BLOCKS;
 		break;
-	case Icon::TYPE_ITEM:
+	default: //case Icon::TYPE_ITEM
 		return &TextureAtlas::LOCATION_ITEMS;
 		break;
 	}

Minecraft.Client/Windows64/Windows64_App.h

@@ -5,8 +5,6 @@ class CConsoleMinecraftApp : public CMinecraftApp
 public:
 	ImageFileBuffer m_ThumbnailBuffer;
 
-	static void SetFakeGamertag(char* name);
-
 	CConsoleMinecraftApp();
 
 	virtual void SetRichPresenceContext(int iPad, int contextId);

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -108,7 +108,7 @@ static Windows64LaunchArgs ParseLaunchArgs()
 			if (i + 1 < argc) 
 			{
 				app.CopyWideArgToAnsi(argv[i + 1], g_Username, sizeof(g_Username));
-				app.SetFakeGamertag(g_Username);
+				ProfileManager.SetFakeGamerTag(g_Username);
 			}
 		}
 	}
@@ -298,7 +298,12 @@ void DefineActions(void)
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_LEFT,				_360_JOY_BUTTON_DPAD_LEFT);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_RIGHT,				_360_JOY_BUTTON_DPAD_RIGHT);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_UP,				_360_JOY_BUTTON_DPAD_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_DOWN,				_360_JOY_BUTTON_DPAD_DOWN);	
+	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_DOWN,				_360_JOY_BUTTON_DPAD_DOWN);
+
+	// Touchpad mapping
+	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_TOUCHPAD_PRESS,				_PS_JOY_BUTTON_TOUCHPAD);
+	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_TOUCHPAD_PRESS,				_PS_JOY_BUTTON_TOUCHPAD);
+	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_TOUCHPAD_PRESS,				_PS_JOY_BUTTON_TOUCHPAD);
 }
 
 void MemSect(int sect)
@@ -861,14 +866,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 		app.UpdateTime();
 		PIXBeginNamedEvent(0,"Input manager tick");
-		if (GetFocus())
-		{
-			InputManager.Tick();
-		}
+		if (GetFocus()) InputManager.Tick();
 		PIXEndNamedEvent();
-		/*PIXBeginNamedEvent(0,"Profile manager tick");
+		PIXBeginNamedEvent(0,"Profile manager tick");
 		ProfileManager.Tick();
-		PIXEndNamedEvent();*/
+		PIXEndNamedEvent();
 		PIXBeginNamedEvent(0,"Storage manager tick");
 		StorageManager.Tick();
 		PIXEndNamedEvent();
@@ -877,7 +879,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		PIXEndNamedEvent();
 
 		PIXBeginNamedEvent(0,"Network manager do work #1");
-		//		g_NetworkManager.DoWork();
+		g_NetworkManager.DoWork();
 		PIXEndNamedEvent();
 
 		// LeaderboardManager::Instance()->Tick();