Merge L and Z button action (#120)

<!--- Provide a general summary of your changes in the Title above -->

## Description
<!--- Describe your changes in detail -->
Merge the L and Z action to be the "same" button press, depending on how
the joypad is gripped.

## Motivation and Context
<!--- What does this sample do? What problem does it solve? -->
<!--- If it fixes/closes/resolves an open issue, please link to the
issue here -->
Simplifies the menu controls.

https://github.com/Polprzewodnikowy/N64FlashcartMenu/pull/119#issuecomment-2218853256

## How Has This Been Tested?
<!-- (if applicable) -->
<!--- Please describe in detail how you tested your sample/changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots
<!-- (if appropriate): -->

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [x] Improvement (non-breaking change that adds a new feature)
- [ ] Bug fix (fixes an issue)
- [ ] Breaking change (breaking change)
- [ ] Config and build (change in the configuration and build system,
has no impact on code or features)

## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.

<!--- It would be nice if you could sign off your contribution by
replacing the name with your GitHub user name and GitHub email contact.
-->
Signed-off-by: GITHUB_USER <GITHUB_USER_EMAIL>
This commit is contained in:
Robin Jones 2024-07-13 22:18:33 +01:00 committed by GitHub
parent deb78d1212
commit fa4bdbbfb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions

View File

@ -21,8 +21,7 @@ static void actions_clear (menu_t *menu) {
menu->actions.back = false; menu->actions.back = false;
menu->actions.options = false; menu->actions.options = false;
menu->actions.settings = false; menu->actions.settings = false;
menu->actions.l_context = false; menu->actions.lz_context = false;
menu->actions.z_context = false;
} }
static void actions_update_direction (menu_t *menu) { static void actions_update_direction (menu_t *menu) {
@ -93,10 +92,8 @@ static void actions_update_buttons (menu_t *menu) {
menu->actions.options = true; menu->actions.options = true;
} else if (pressed.start) { } else if (pressed.start) {
menu->actions.settings = true; menu->actions.settings = true;
} else if (pressed.l) { } else if (pressed.l || pressed.z) {
menu->actions.l_context = true; menu->actions.lz_context = true;
} else if (pressed.z) {
menu->actions.z_context = true;
} }
} }

View File

@ -85,8 +85,7 @@ typedef struct {
bool back; bool back;
bool options; bool options;
bool settings; bool settings;
bool l_context; bool lz_context;
bool z_context;
} actions; } actions;
struct { struct {