Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-27 20:34:03 +00:00
Code Issues Activity

Fix reading from menu option

Browse source
This commit is contained in:
jugeeya 2023-08-06 14:16:07 -07:00
parent 6d9f0455d9
commit 8b5a345abc
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/training/input_record.rs
View file

@ -184,7 +184,6 @@ pub unsafe fn get_command_flag_cat(module_accessor: &mut BattleObjectModuleAcces
module_accessor, module_accessor,
button_config::ButtonCombo::InputPlayback, button_config::ButtonCombo::InputPlayback,
) { ) {
playback(MENU.playback_slot.get_random().into_idx().unwrap_or(0)); playback(MENU.playback_slot.get_random().into_idx().unwrap_or(0));
} }
// Attack + Dpad Left: Record // Attack + Dpad Left: Record
@ -281,7 +280,7 @@ pub unsafe fn lockout_record() {
.for_each(|mapped_input| { .for_each(|mapped_input| {
*mapped_input = MappedInputs::default(); *mapped_input = MappedInputs::default();
}); });
CURRENT_FRAME_LENGTH = MENU.recording_frames as usize; CURRENT_FRAME_LENGTH = MENU.recording_frames.into_frames();
P1_FRAME_LENGTH_MAPPING.lock()[CURRENT_RECORD_SLOT] = CURRENT_FRAME_LENGTH; P1_FRAME_LENGTH_MAPPING.lock()[CURRENT_RECORD_SLOT] = CURRENT_FRAME_LENGTH;
LOCKOUT_FRAME = 30; // This needs to be this high or issues occur dropping shield - but does this cause problems when trying to record ledge? LOCKOUT_FRAME = 30; // This needs to be this high or issues occur dropping shield - but does this cause problems when trying to record ledge?
BUFFER_FRAME = 0; BUFFER_FRAME = 0;
@ -291,7 +290,6 @@ pub unsafe fn lockout_record() {
CURRENT_LR = RECORDED_LR; CURRENT_LR = RECORDED_LR;
} }
pub unsafe fn playback(slot: usize) { pub unsafe fn playback(slot: usize) {
if INPUT_RECORD == Pause { if INPUT_RECORD == Pause {
println!("Tried to playback during lockout!"); println!("Tried to playback during lockout!");
@ -350,7 +348,6 @@ pub unsafe fn playback_ledge(slot: usize) {
CURRENT_PLAYBACK_SLOT = slot; CURRENT_PLAYBACK_SLOT = slot;
CURRENT_FRAME_LENGTH = P1_FRAME_LENGTH_MAPPING.lock()[CURRENT_PLAYBACK_SLOT]; CURRENT_FRAME_LENGTH = P1_FRAME_LENGTH_MAPPING.lock()[CURRENT_PLAYBACK_SLOT];
INPUT_RECORD = Playback; INPUT_RECORD = Playback;
POSSESSION = Player; POSSESSION = Player;