qloak/cafeberry
1
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

feat: Touchpad support on W64, update 4JLibs & update x360 xzp

Browse Source
This commit is contained in:
str1k3r
2026-09-15 21:37:32 -04:00
parent a4326aec9a
commit de1dacafcb
51 changed files with 72 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+5 -4
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -14,11 +14,11 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
bool bChina = false;
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
bSkipESRB = app.GetProductSKU() != e_sku_SCEA;
#elif defined(_XBOX) || defined(_DURANGO)
#elif defined _XBOX || _DURANGO || _WINDOWS64
bSkipESRB = !ProfileManager.LocaleIsUSorCanada();
#endif
#ifdef _DURANGO
#if defined _DURANGO || _WINDOWS64
bChina = ProfileManager.LocaleIsChina();
#endif
// 4J Stu - These map to values in the Actionscript
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+5 -7
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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)