small cleanup

Author: WuBoytH

fighters/buddy/src/opff.rs

@@ -539,9 +539,7 @@ extern "C" fn buddy_reset(fighter: &mut L2CFighterCommon) {
     unsafe {
         let lua_state = fighter.lua_state_agent;    
         let boma = smash::app::sv_system::battle_object_module_accessor(lua_state);
-        if fighter.kind() == *FIGHTER_KIND_BUDDY {
-            on_rebirth(fighter,boma);
-        }
+        on_rebirth(fighter, boma);
     }
 }
 

fighters/buddy/src/status.rs

@@ -278,9 +278,7 @@ unsafe extern "C" fn change_status_callback(fighter: &mut L2CFighterCommon) -> L
 extern "C" fn buddy_init(fighter: &mut L2CFighterCommon) {
     unsafe {
         // set the callbacks on fighter init
-        if fighter.kind() == *FIGHTER_KIND_BUDDY {
-            fighter.global_table[globals::STATUS_CHANGE_CALLBACK].assign(&L2CValue::Ptr(change_status_callback as *const () as _));   
-        }
+        fighter.global_table[globals::STATUS_CHANGE_CALLBACK].assign(&L2CValue::Ptr(change_status_callback as *const () as _));   
     }
 }
 

fighters/ken/src/opff.rs

@@ -64,9 +64,6 @@ extern "Rust" {
 
 unsafe extern "C" fn ken_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
-        if fighter.kind() != FIGHTER_KIND_KEN {
-            return;
-        }
         MeterModule::update(fighter.battle_object, false);
         MeterModule::set_meter_cap(fighter.object(), 10);
         MeterModule::set_meter_per_level(fighter.object(), 30.0);

fighters/lucario/src/opff.rs

@@ -5,9 +5,6 @@ use globals::*;
 
 pub extern "C" fn lucario_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
-        if fighter.kind() != FIGHTER_KIND_LUCARIO {
-            return;
-        }
         MeterModule::update(fighter.object(), false);
         MeterModule::set_meter_cap(fighter.object(), 2);
         MeterModule::set_meter_per_level(fighter.object(), 100.0);

fighters/nana/src/opff.rs

@@ -5,11 +5,9 @@ use globals::*;
 
 // Ice Climbers Cheer Cancel (Techy)
 unsafe fn cheer_cancel(fighter: &mut L2CFighterCommon) {
-    if fighter.kind() == *FIGHTER_KIND_NANA {
-        if fighter.is_status(*FIGHTER_POPO_STATUS_KIND_THROW_NANA) {
-            MotionModule::set_frame(fighter.module_accessor, MotionModule::end_frame(fighter.module_accessor), true);
-            StatusModule::change_status_force(fighter.module_accessor, *FIGHTER_STATUS_KIND_WAIT, true);
-        }
+    if fighter.is_status(*FIGHTER_POPO_STATUS_KIND_THROW_NANA) {
+        MotionModule::set_frame(fighter.module_accessor, MotionModule::end_frame(fighter.module_accessor), true);
+        StatusModule::change_status_force(fighter.module_accessor, *FIGHTER_STATUS_KIND_WAIT, true);
     }
 }
 

fighters/palutena/src/opff.rs

@@ -311,9 +311,7 @@ unsafe fn power_cast(fighter: &mut L2CFighterCommon) {
 
 pub extern "C" fn palu_power_board(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
-        if fighter.kind() != FIGHTER_KIND_PALUTENA {
-            return;
-        }
+        println!("power board meter");
         MeterModule::update(fighter.object(), false);
         MeterModule::set_meter_cap(fighter.object(), 2);
         utils::ui::UiManager::set_power_board_enable(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32, true);

fighters/ryu/src/opff.rs

@@ -63,9 +63,6 @@ extern "Rust" {
 
 unsafe extern "C" fn ryu_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
-        if fighter.kind() != FIGHTER_KIND_RYU {
-            return;
-        }
         MeterModule::update(fighter.battle_object, false);
         utils::ui::UiManager::set_ex_meter_enable(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32, true);
         utils::ui::UiManager::set_ex_meter_info(