Dima353/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swap the actions of buttons A and B

Browse Source
This commit is contained in:
Dima353
2025-02-16 16:55:56 +03:00
parent 5c189d8cf6
commit a1ec93846e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Frontend.cpp
+11 -11
View File
@@ -104,8 +104,8 @@ int GetOptionCount(int screen)
#define GetBackJustUp GetTriangleJustUp #define GetBackJustUp GetTriangleJustUp
#define GetBackJustDown GetTriangleJustDown #define GetBackJustDown GetTriangleJustDown
#elif defined(CIRCLE_BACK_BUTTON) #elif defined(CIRCLE_BACK_BUTTON)
#define GetBackJustUp GetCircleJustUp #define GetBackJustUp GetCrossJustUp
#define GetBackJustDown GetCircleJustDown #define GetBackJustDown GetCrossJustDown
#else #else
#define GetBackJustUp GetSquareJustUp #define GetBackJustUp GetSquareJustUp
#define GetBackJustDown GetSquareJustDown #define GetBackJustDown GetSquareJustDown
@@ -542,7 +542,7 @@ CMenuManager::ProcessList(bool &goBack, bool &optionSelected)
} }
#ifndef TIDY_UP_PBP #ifndef TIDY_UP_PBP
if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) { if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
m_bShowMouse = 0; m_bShowMouse = 0;
optionSelected = true; optionSelected = true;
} }
@@ -4349,7 +4349,7 @@ CMenuManager::ProcessButtonPresses(void)
} else if (isPlainTextScreen(m_nCurrScreen)) { } else if (isPlainTextScreen(m_nCurrScreen)) {
#ifndef TIDY_UP_PBP #ifndef TIDY_UP_PBP
if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown() || CPad::GetPad(0)->GetLeftMouseJustDown()) { if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown() || CPad::GetPad(0)->GetLeftMouseJustDown()) {
optionSelected = true; optionSelected = true;
} }
if (CPad::GetPad(0)->GetEscapeJustDown() || CPad::GetPad(0)->GetBackJustUp()) { if (CPad::GetPad(0)->GetEscapeJustDown() || CPad::GetPad(0)->GetBackJustUp()) {
@@ -4371,12 +4371,12 @@ CMenuManager::ProcessButtonPresses(void)
#ifndef TIDY_UP_PBP #ifndef TIDY_UP_PBP
if ((m_nCurrOption == 0) && (m_nCurrScreen == MENUPAGE_PAUSE_MENU)) { if ((m_nCurrOption == 0) && (m_nCurrScreen == MENUPAGE_PAUSE_MENU)) {
if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) { if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCircleJustUp()) {
m_bShowMouse = false; m_bShowMouse = false;
optionSelected = true; optionSelected = true;
} }
} else { } else {
if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) { if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
m_bShowMouse = false; m_bShowMouse = false;
optionSelected = true; optionSelected = true;
} }
@@ -4681,7 +4681,7 @@ CMenuManager::ProcessButtonPresses(void)
// Centralized enter/back (except some conditions) // Centralized enter/back (except some conditions)
#ifdef TIDY_UP_PBP #ifdef TIDY_UP_PBP
if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_RESUME) { if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_RESUME) {
if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown() || if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown() ||
(isPlainTextScreen(m_nCurrScreen) && CPad::GetPad(0)->GetLeftMouseJustDown())) { (isPlainTextScreen(m_nCurrScreen) && CPad::GetPad(0)->GetLeftMouseJustDown())) {
if (!isPlainTextScreen(m_nCurrScreen)) if (!isPlainTextScreen(m_nCurrScreen))
@@ -4690,7 +4690,7 @@ CMenuManager::ProcessButtonPresses(void)
optionSelected = true; optionSelected = true;
} }
} else { } else {
if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) { if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCircleJustUp()) {
m_bShowMouse = false; m_bShowMouse = false;
optionSelected = true; optionSelected = true;
} }
@@ -4722,7 +4722,7 @@ CMenuManager::ProcessButtonPresses(void)
DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, TRUE); DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, TRUE);
return; return;
} else if (bottomBarActive) { } else if (bottomBarActive) {
if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) { if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
bottomBarActive = false; bottomBarActive = false;
@@ -6464,7 +6464,7 @@ CMenuManager::PrintMap(void)
// Adding marker // Adding marker
if (m_nMenuFadeAlpha >= 255) { if (m_nMenuFadeAlpha >= 255) {
if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCrossJustDown()) { if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
if (mapCrosshair.y > fMapCenterY - fMapSize && mapCrosshair.y < fMapCenterY + fMapSize && if (mapCrosshair.y > fMapCenterY - fMapSize && mapCrosshair.y < fMapCenterY + fMapSize &&
mapCrosshair.x > fMapCenterX - fMapSize && mapCrosshair.x < fMapCenterX + fMapSize) { mapCrosshair.x > fMapCenterX - fMapSize && mapCrosshair.x < fMapCenterX + fMapSize) {
@@ -6496,7 +6496,7 @@ CMenuManager::PrintMap(void)
fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f; fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f;
} }
if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetRightShoulder2()) { if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetLeftShoulder1()) {
if (CPad::GetPad(0)->GetMouseWheelDown()) if (CPad::GetPad(0)->GetMouseWheelDown())
ZOOM(mapCrosshair.x, mapCrosshair.y, false); ZOOM(mapCrosshair.x, mapCrosshair.y, false);
else else