Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-14 02:16:10 +00:00
Code Issues Activity

Use NpadGcState instead of handheld state to save trigger info (#312)

Browse source
This commit is contained in:
GradualSyrup 2022-02-24 18:13:34 -06:00 • committed by GitHub
parent 884c00b069
commit 057502e02a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/training/input_delay.rs
View file

@ -1,11 +1,11 @@
use crate::common::MENU;
use lazy_static::lazy_static;
use parking_lot::Mutex;
use skyline::nn::hid::{GetNpadStyleSet, NpadHandheldState};
use skyline::nn::hid::{GetNpadStyleSet, NpadGcState};
use std::collections::VecDeque;
lazy_static! {
static ref P1_DELAYED_NPAD_STATES: Mutex<VecDeque<NpadHandheldState>> =
static ref P1_DELAYED_NPAD_STATES: Mutex<VecDeque<NpadGcState>> =
Mutex::new(VecDeque::new());
}
@ -23,7 +23,7 @@ pub unsafe fn p1_controller_id() -> u32 {
}
}
pub fn handle_get_npad_state(state: *mut NpadHandheldState, controller_id: *const u32) {
pub fn handle_get_npad_state(state: *mut NpadGcState, controller_id: *const u32) {
unsafe {
if crate::common::is_training_mode() {
if *controller_id == p1_controller_id() {
@ -32,7 +32,7 @@ pub fn handle_get_npad_state(state: *mut NpadHandheldState, controller_id: *cons
if delayed_states.len() < MENU.input_delay as usize {
let update_count = (*state).updateCount;
*state = NpadHandheldState::default();
*state = NpadGcState::default();
(*state).updateCount = update_count;
} else if let Some(delayed_state) = delayed_states.back() {
let update_count = (*state).updateCount;

2
src/training/mod.rs
View file

@ -452,7 +452,7 @@ pub unsafe fn handle_effect(
#[allow(improper_ctypes)]
extern "C" {
fn add_nn_hid_hook(callback: fn(*mut NpadHandheldState, *const u32));
fn add_nn_hid_hook(callback: fn(*mut NpadGcState, *const u32));
}
pub fn training_mods() {