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

This commit is contained in:
str1k3r committed 2026-09-15 21:37:32 -04:00
1 parent a4326aec9a
commit de1dacafcb
51 files changed
+71 -76

No files matched your search

+1 -1
View File
@@ -835,7 +835,7 @@ enum EControllerActions
ACTION_MENU_GTC_RESUME, ACTION_MENU_GTC_RESUME,
#endif #endif
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ACTION_MENU_TOUCHPAD_PRESS, ACTION_MENU_TOUCHPAD_PRESS,
#endif #endif
@@ -1309,7 +1309,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
break; break;
#endif #endif
case ACTION_MENU_A: case ACTION_MENU_A:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(!bRepeat) if(!bRepeat)
@@ -192,7 +192,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
bHandled = true; bHandled = true;
break; break;
case ACTION_MENU_A: case ACTION_MENU_A:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
// Do some crafting! // Do some crafting!
@@ -59,7 +59,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
handled = true; handled = true;
break; break;
case ACTION_MENU_A: case ACTION_MENU_A:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(!m_activeOffers.empty()) if(!m_activeOffers.empty())
+5 -4
View File
@@ -35,15 +35,16 @@
#ifdef __ORBIS__ #ifdef __ORBIS__
#include "Orbis\Iggy\include\iggyperfmon.h" #include "Orbis\Iggy\include\iggyperfmon.h"
#include "Orbis\Iggy\include\iggyperfmon_orbis.h" #include "Orbis\Iggy\include\iggyperfmon_orbis.h"
#elif defined _DURANGO #elif _DURANGO
#include "Durango\Iggy\include\iggyperfmon.h" #include "Durango\Iggy\include\iggyperfmon.h"
#elif defined __PS3__ #elif __PS3__
#include "PS3\Iggy\include\iggyperfmon.h" #include "PS3\Iggy\include\iggyperfmon.h"
#include "PS3\Iggy\include\iggyperfmon_ps3.h" #include "PS3\Iggy\include\iggyperfmon_ps3.h"
#elif defined __PSVITA__ #elif __PSVITA__
#include "PSVita\Iggy\include\iggyperfmon.h" #include "PSVita\Iggy\include\iggyperfmon.h"
#include "PSVita\Iggy\include\iggyperfmon_psp2.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" #include "Windows64\Iggy\include\iggyperfmon.h"
#endif #endif
+1 -1
View File
@@ -946,7 +946,7 @@ int UIScene::convertGameActionToIggyKeycode(int action)
int keycode = -1; int keycode = -1;
switch(action) switch(action)
{ {
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_A: case ACTION_MENU_A:
@@ -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 // 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_A,true);
ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true); ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true); ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
#endif #endif
ui.OverrideSFX(m_iPad,ACTION_MENU_X,true); 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_A,false);
ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false); ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false); ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
#endif #endif
ui.OverrideSFX(m_iPad,ACTION_MENU_X,false); ui.OverrideSFX(m_iPad,ACTION_MENU_X,false);
@@ -224,7 +224,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
// } // }
// break; // break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) if(pressed)
@@ -159,7 +159,7 @@ void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, bool pres
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if( pressed ) if( pressed )
@@ -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 // 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_A,true);
ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true); ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true); ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
#endif #endif
ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,true); 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_A,false);
ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false); ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false); ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
#endif #endif
ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false); ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false);
@@ -367,7 +367,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
@@ -648,7 +648,7 @@ void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed,
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -103,7 +103,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -149,7 +149,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -68,7 +68,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, bool pressed
handled = true; handled = true;
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -276,7 +276,7 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
switch(key) switch(key)
{ {
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) if(pressed)
@@ -189,7 +189,7 @@ void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, boo
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
//CD - Added for audio //CD - Added for audio
@@ -210,7 +210,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
} }
break; break;
case ACTION_MENU_A: case ACTION_MENU_A:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) if(pressed)
@@ -175,7 +175,7 @@ void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, bool pre
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -136,7 +136,7 @@ void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat,
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -313,7 +313,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -414,7 +414,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
+3 -3
View File
@@ -14,11 +14,11 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
bool bChina = false; bool bChina = false;
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
bSkipESRB = app.GetProductSKU() != e_sku_SCEA; bSkipESRB = app.GetProductSKU() != e_sku_SCEA;
#elif defined(_XBOX) || defined(_DURANGO) #elif defined _XBOX || _DURANGO || _WINDOWS64
bSkipESRB = !ProfileManager.LocaleIsUSorCanada(); bSkipESRB = !ProfileManager.LocaleIsUSorCanada();
#endif #endif
#ifdef _DURANGO #if defined _DURANGO || _WINDOWS64
bChina = ProfileManager.LocaleIsChina(); bChina = ProfileManager.LocaleIsChina();
#endif #endif
// 4J Stu - These map to values in the Actionscript // 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) switch(key)
{ {
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(!m_bIgnoreNavigate) if(!m_bIgnoreNavigate)
@@ -286,7 +286,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
} }
handled = true; handled = true;
break; break;
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -96,7 +96,7 @@ void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, bool
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -271,7 +271,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat,
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
// 4J-JEV: Inform user why their game must be offline. // 4J-JEV: Inform user why their game must be offline.
@@ -642,7 +642,7 @@ void UIScene_LoadMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
@@ -1209,7 +1209,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -237,8 +237,7 @@ void UIScene_MainMenu::handleReload()
removeControl( &m_buttons[(int)eControl_Exit], false ); removeControl( &m_buttons[(int)eControl_Exit], false );
// We don't have a way to display trophies/achievements, so remove the button // We don't have a way to display trophies/achievements, so remove the button
removeControl( &m_buttons[(int)eControl_Achievements], false ); removeControl( &m_buttons[(int)eControl_Achievements], false );
#endif #elif _DURANGO
#ifdef _DURANGO
// Allowed to not have achievements in the menu // Allowed to not have achievements in the menu
removeControl( &m_buttons[(int)eControl_Achievements], false ); removeControl( &m_buttons[(int)eControl_Achievements], false );
#endif #endif
@@ -250,7 +249,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
if ( m_bIgnorePress || (eNavigateWhenReady >= 0) ) return; 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 // ignore all players except player 0 - it's their profile that is currently being used
if(iPad!=0) return; if(iPad!=0) return;
#endif #endif
@@ -260,7 +259,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
switch(key) switch(key)
{ {
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) 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); ProfileManager.RequestSignInUI(false, false, false, false, false, ChooseUser_SignInReturned, this, iPad);
} }
break; break;
#endif #elif __PSVITA__
#ifdef __PSVITA__
case ACTION_MENU_X: case ACTION_MENU_X:
if(pressed && ProfileManager.IsFullVersion()) 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); SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_MainMenu::UnlockFullGame_SignInReturned, pClass);
break; break;
} }
#elif defined __PSVITA__ #elif __PSVITA__
switch(pClass->m_eAction) switch(pClass->m_eAction)
{ {
case eAction_RunLeaderboardsPSN: case eAction_RunLeaderboardsPSN:
@@ -104,7 +104,7 @@ void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool presse
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -83,7 +83,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool
ui.NavigateBack(m_iPad); ui.NavigateBack(m_iPad);
} }
break; break;
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_OK: case ACTION_MENU_OK:
@@ -379,7 +379,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -107,7 +107,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, bool pr
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) if(pressed)
@@ -69,7 +69,7 @@ void UIScene_ReinstallMenu::handleInput(int iPad, int key, bool repeat, bool pre
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -71,7 +71,7 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, bool press
switch(key) switch(key)
{ {
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -76,7 +76,7 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, bool
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -76,7 +76,7 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, bo
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -113,7 +113,7 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -102,7 +102,7 @@ void UIScene_SettingsMenu::handleInput(int iPad, int key, bool repeat, bool pres
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -224,7 +224,7 @@ void UIScene_SettingsOptionsMenu::handleInput(int iPad, int key, bool repeat, bo
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -129,7 +129,7 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
@@ -129,7 +129,7 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pre
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -217,7 +217,7 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool pr
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) if(pressed)
@@ -236,7 +236,7 @@ void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, bool pres
} }
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
case ACTION_MENU_UP: case ACTION_MENU_UP:
@@ -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 // 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_A,true);
ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true); ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true); ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
#endif #endif
ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,true); 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_A,false);
ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false); ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false); ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
#endif #endif
ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false); ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false);
@@ -31,7 +31,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, bool p
navigateBack(); navigateBack();
break; break;
case ACTION_MENU_OK: case ACTION_MENU_OK:
#ifdef __ORBIS__ #if defined __ORBIS__ || _WINDOWS64
case ACTION_MENU_TOUCHPAD_PRESS: case ACTION_MENU_TOUCHPAD_PRESS:
#endif #endif
if(pressed) if(pressed)
+1 -5
View File
@@ -478,17 +478,13 @@ void C_4JProfile::CancelProfileAvatarRequest() {}
#ifdef _DURANGO #ifdef _DURANGO
void SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); } void SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); }
char* C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; } char* C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
#elif _WINDOWS64 #elif !_WINDOWS64
void CConsoleMinecraftApp::SetFakeGamertag(char *name){ ProfileManager.SetFakeGamerTag(name); }
#else //str1k3r - every other platform BUT Windows64 and Durango
void SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; } void SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; }
char* C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; } char* C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
wstring C_4JProfile::GetDisplayName(int iPad){ return L"PlayerName"; } wstring C_4JProfile::GetDisplayName(int iPad){ return L"PlayerName"; }
#endif #endif
void C_4JProfile::SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam) {} void C_4JProfile::SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam) {}
void C_4JProfile::SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, 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) {} void C_4JProfile::SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam) {}
int( *defaultOptionsCallback)(LPVOID,C_4JProfile::PROFILESETTINGS *, const int iPad) = NULL; int( *defaultOptionsCallback)(LPVOID,C_4JProfile::PROFILESETTINGS *, const int iPad) = NULL;
LPVOID lpProfileParam = NULL; LPVOID lpProfileParam = NULL;
@@ -5,8 +5,6 @@ class CConsoleMinecraftApp : public CMinecraftApp
public: public:
ImageFileBuffer m_ThumbnailBuffer; ImageFileBuffer m_ThumbnailBuffer;
static void SetFakeGamertag(char* name);
CConsoleMinecraftApp(); CConsoleMinecraftApp();
virtual void SetRichPresenceContext(int iPad, int contextId); virtual void SetRichPresenceContext(int iPad, int contextId);
@@ -108,7 +108,7 @@ static Windows64LaunchArgs ParseLaunchArgs()
if (i + 1 < argc) if (i + 1 < argc)
{ {
app.CopyWideArgToAnsi(argv[i + 1], g_Username, sizeof(g_Username)); app.CopyWideArgToAnsi(argv[i + 1], g_Username, sizeof(g_Username));
app.SetFakeGamertag(g_Username); ProfileManager.SetFakeGamerTag(g_Username);
} }
} }
} }
@@ -299,6 +299,11 @@ void DefineActions(void)
InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_RIGHT, _360_JOY_BUTTON_DPAD_RIGHT); 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_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) void MemSect(int sect)
@@ -861,14 +866,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
app.UpdateTime(); app.UpdateTime();
PIXBeginNamedEvent(0,"Input manager tick"); PIXBeginNamedEvent(0,"Input manager tick");
if (GetFocus()) if (GetFocus()) InputManager.Tick();
{
InputManager.Tick();
}
PIXEndNamedEvent(); PIXEndNamedEvent();
/*PIXBeginNamedEvent(0,"Profile manager tick"); PIXBeginNamedEvent(0,"Profile manager tick");
ProfileManager.Tick(); ProfileManager.Tick();
PIXEndNamedEvent();*/ PIXEndNamedEvent();
PIXBeginNamedEvent(0,"Storage manager tick"); PIXBeginNamedEvent(0,"Storage manager tick");
StorageManager.Tick(); StorageManager.Tick();
PIXEndNamedEvent(); PIXEndNamedEvent();
@@ -877,7 +879,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
PIXEndNamedEvent(); PIXEndNamedEvent();
PIXBeginNamedEvent(0,"Network manager do work #1"); PIXBeginNamedEvent(0,"Network manager do work #1");
// g_NetworkManager.DoWork(); g_NetworkManager.DoWork();
PIXEndNamedEvent(); PIXEndNamedEvent();
// LeaderboardManager::Instance()->Tick(); // LeaderboardManager::Instance()->Tick();
Binary file not shown.