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 standby on Ryujinx; fix playback when no slot is selected (#560)

Browse source
This commit is contained in:
jugeeya 2023-08-03 18:13:02 -07:00 committed by GitHub
parent 9ef506aac7
commit a8f533da47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/training/input_record.rs
View file

@ -271,7 +271,11 @@ pub unsafe fn playback() {
println!("Tried to playback during lockout!"); println!("Tried to playback during lockout!");
return; return;
} }
CURRENT_PLAYBACK_SLOT = MENU.playback_slot.get_random().into_idx().unwrap(); if MENU.playback_slot.is_empty() {
println!("Tried to playback without a slot selected!");
return;
}
CURRENT_PLAYBACK_SLOT = MENU.playback_slot.get_random().into_idx().unwrap_or(0);
INPUT_RECORD = Playback; INPUT_RECORD = Playback;
POSSESSION = Player; POSSESSION = Player;
INPUT_RECORD_FRAME = 0; INPUT_RECORD_FRAME = 0;
@ -317,7 +321,9 @@ pub unsafe fn is_end_standby() -> bool {
let clamped_rstick_y = let clamped_rstick_y =
((first_frame_input.rstick_y as f32) * STICK_CLAMP_MULTIPLIER).clamp(-1.0, 1.0); ((first_frame_input.rstick_y as f32) * STICK_CLAMP_MULTIPLIER).clamp(-1.0, 1.0);
let buttons_pressed = !first_frame_input.buttons.is_empty(); // No buttons pressed or just flick jump-- if they really did a stick jump, we'd have lstick movement as well
let buttons_pressed =
!(first_frame_input.buttons.is_empty() || first_frame_input.buttons == Buttons::FLICK_JUMP);
let lstick_movement = let lstick_movement =
clamped_lstick_x.abs() >= STICK_NEUTRAL || clamped_lstick_y.abs() >= STICK_NEUTRAL; clamped_lstick_x.abs() >= STICK_NEUTRAL || clamped_lstick_y.abs() >= STICK_NEUTRAL;
let rstick_movement = let rstick_movement =