From bbc0c93c9ac624617103bef63e13f71adac04aa1 Mon Sep 17 00:00:00 2001
From: asimon-1 <40246417+asimon-1@users.noreply.github.com>
Date: Thu, 6 Oct 2022 16:03:41 -0700
Subject: [PATCH] Refactor input_delay from i32 to Delay (#386)

* Change input_delay to use Delay structure instead of i32

* Update input_delay.rs
---
 src/training/input_delay.rs    | 4 ++--
 training_mod_consts/src/lib.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/training/input_delay.rs b/src/training/input_delay.rs
index 8e31d0a..c4a91c1 100644
--- a/src/training/input_delay.rs
+++ b/src/training/input_delay.rs
@@ -29,7 +29,7 @@ pub fn handle_get_npad_state(state: *mut NpadGcState, controller_id: *const u32)
                 let mut delayed_states = P1_DELAYED_NPAD_STATES.lock();
                 let actual_state = *state;
 
-                if delayed_states.len() < MENU.input_delay as usize {
+                if delayed_states.len() < MENU.input_delay.into_delay() as usize {
                     let update_count = (*state).updateCount;
                     *state = NpadGcState::default();
                     (*state).updateCount = update_count;
@@ -40,7 +40,7 @@ pub fn handle_get_npad_state(state: *mut NpadGcState, controller_id: *const u32)
                 }
 
                 delayed_states.push_front(actual_state);
-                delayed_states.truncate(MENU.input_delay as usize);
+                delayed_states.truncate(MENU.input_delay.into_delay() as usize);
             }
         }
     }
diff --git a/training_mod_consts/src/lib.rs b/training_mod_consts/src/lib.rs
index 43fd9f1..13a7135 100644
--- a/training_mod_consts/src/lib.rs
+++ b/training_mod_consts/src/lib.rs
@@ -1019,7 +1019,7 @@ pub struct TrainingModpackMenu {
     pub frame_advantage: OnOff,
     pub full_hop: BoolFlag,
     pub hitbox_vis: OnOff,
-    pub input_delay: i32,
+    pub input_delay: Delay,
     pub ledge_delay: LongDelay,
     pub ledge_state: LedgeOption,
     pub mash_state: Action,
@@ -1082,7 +1082,7 @@ impl TrainingModpackMenu {
             follow_up = Action::from_bits(val),
             full_hop = BoolFlag::from_bits(val),
             hitbox_vis = OnOff::from_val(val),
-            input_delay = Some(log_2(val) as i32),
+            input_delay = Delay::from_bits(val),
             ledge_delay = LongDelay::from_bits(val),
             ledge_state = LedgeOption::from_bits(val),
             mash_state = Action::from_bits(val),
@@ -1159,7 +1159,7 @@ pub static DEFAULTS_MENU: TrainingModpackMenu = TrainingModpackMenu {
     frame_advantage: OnOff::Off,
     full_hop: BoolFlag::empty(),
     hitbox_vis: OnOff::On,
-    input_delay: 0,
+    input_delay: Delay::D0,
     ledge_delay: LongDelay::empty(),
     ledge_state: LedgeOption::all(),
     mash_state: Action::empty(),