Skip to content

Commit f269bb1

Browse files
committed
move out of main_loop
1 parent 1e740bd commit f269bb1

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

fighters/common/src/djc.rs

-8
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ pub unsafe extern "C" fn attack_air_main_status(fighter: &mut L2CFighterCommon)
2323
/// Performs the leniency check for double jump canceling
2424
#[utils::export(common::djc)]
2525
pub unsafe extern "C" fn attack_air_main_status_loop(fighter: &mut L2CFighterCommon) -> L2CValue {
26-
if KineticModule::get_kinetic_type(fighter.module_accessor) == *FIGHTER_KINETIC_TYPE_JUMP_AERIAL_MOTION_2ND
27-
&& !fighter.is_in_hitlag()
28-
&& MotionModule::frame_2nd(fighter.module_accessor) >= 2.0
29-
&& fighter.global_table[CURRENT_FRAME].get_i32() <= ParamModule::get_int(fighter.battle_object, ParamType::Common, "djc_leniency_frame")
30-
&& ControlModule::check_button_off(fighter.module_accessor, *CONTROL_PAD_BUTTON_JUMP) {
31-
WorkModule::on_flag(fighter.module_accessor, *FIGHTER_INSTANCE_WORK_ID_FLAG_JUMP_NO_LIMIT_ONCE);
32-
KineticModule::change_kinetic(fighter.module_accessor, *FIGHTER_KINETIC_TYPE_MOTION_FALL);
33-
}
3426
if !fighter.status_AttackAir_Main_common().get_bool() {
3527
fighter.sub_air_check_superleaf_fall_slowly();
3628
if !fighter.global_table[IS_STOPPING].get_bool() {

fighters/peach/src/status/attack_air.rs

-8
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ unsafe extern "C" fn peach_attack_air_no_float_main_loop(fighter: &mut L2CFighte
8989
fighter.change_status(FIGHTER_PEACH_STATUS_KIND_UNIQ_FLOAT_START.into(), true.into());
9090
return 1.into();
9191
}
92-
if KineticModule::get_kinetic_type(fighter.module_accessor) == *FIGHTER_KINETIC_TYPE_JUMP_AERIAL_MOTION_2ND
93-
&& !fighter.is_in_hitlag()
94-
&& MotionModule::frame_2nd(fighter.module_accessor) >= 2.0
95-
&& fighter.global_table[CURRENT_FRAME].get_i32() <= ParamModule::get_int(fighter.battle_object, ParamType::Common, "djc_leniency_frame")
96-
&& ControlModule::check_button_off(fighter.module_accessor, *CONTROL_PAD_BUTTON_JUMP) {
97-
WorkModule::on_flag(fighter.module_accessor, *FIGHTER_INSTANCE_WORK_ID_FLAG_JUMP_NO_LIMIT_ONCE);
98-
KineticModule::change_kinetic(fighter.module_accessor, *FIGHTER_KINETIC_TYPE_MOTION_FALL);
99-
}
10092
if fighter.status_AttackAir_Main_common().get_bool() {
10193
return 0.into();
10294
}

0 commit comments

Comments
 (0)