Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-24 10:54:16 +00:00
Code Issues Activity

Fix issue where you could not control the "select fighter with controller" menu when the quick menu is up.

Browse source
This commit is contained in:
jugeeya 2023-02-09 23:25:25 -08:00
parent 3d6ea34eeb
commit 0c64959333
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/menu.rs
View file

@ -3,7 +3,7 @@ use crate::events::{Event, EVENT_QUEUE};
use crate::logging::*; use crate::logging::*;
use crate::training::frame_counter; use crate::training::frame_counter;
use skyline::nn::hid::NpadGcState; use skyline::nn::hid::{GetNpadStyleSet, NpadGcState};
use training_mod_consts::MenuJsonStruct; use training_mod_consts::MenuJsonStruct;
static mut FRAME_COUNTER_INDEX: usize = 0; static mut FRAME_COUNTER_INDEX: usize = 0;
@ -261,6 +261,16 @@ pub unsafe fn quick_menu_loop() {
continue; continue;
} }
// Check for all controllers unplugged
let mut potential_controller_ids = (0..8).collect::<Vec<u32>>();
potential_controller_ids.push(0x20);
if potential_controller_ids
.iter()
.all(|i| GetNpadStyleSet(i as *const _).flags == 0) {
QUICK_MENU_ACTIVE = false;
continue;
}
let app = &mut *QUICK_MENU_APP.data_ptr(); let app = &mut *QUICK_MENU_APP.data_ptr();
button_presses.a.read_press().then(|| { button_presses.a.read_press().then(|| {
app.on_a(); app.on_a();