formatting fixes

AlexanderHarrison · Oct 9, 2024 · 8daee45 · 8daee45
1 parent 1396978
commit 8daee45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 26 deletions.
diff --git a/src/lab.c b/src/lab.c
@@ -44,8 +44,8 @@ static char *slots_names[] = {"A", "B"};
 static int lockout_timer = 0;
 const int LOCKOUT_DURATION = 30;
 
-static float cpu_lockPercent = 0;
-static float player_lockPercent = 0;
+static float cpu_locked_percent = 0;
+static float hmn_locked_percent = 0;
 
 // Menu Callbacks
 void Lab_ChangePlayerPercent(GOBJ *menu_gobj, int value)
@@ -54,8 +54,8 @@ void Lab_ChangePlayerPercent(GOBJ *menu_gobj, int value)
     FighterData *fighter_data = fighter->userdata;
 
     fighter_data->dmg.percent = value;
-    if(LabOptions_General[OPTGEN_HMNPCNTLOCK].option_val != OPT_LOCKPCNT_OFF)
-        player_lockPercent = fighter_data->dmg.percent;
+    if (LabOptions_General[OPTGEN_HMNPCNTLOCK].option_val)
+        hmn_locked_percent = fighter_data->dmg.percent;
 
     Fighter_SetHUDDamage(0, value);
 
@@ -66,8 +66,8 @@ void Lab_ChangePlayerLockPercent(GOBJ *menu_gobj, int value)
     GOBJ *fighter = Fighter_GetGObj(0);
     FighterData *fighter_data = fighter->userdata;
 
-    if(value != OPT_LOCKPCNT_OFF)
-        player_lockPercent = fighter_data->dmg.percent;
+    if (value)
+        hmn_locked_percent = fighter_data->dmg.percent;
 
     return;
 }
@@ -100,8 +100,8 @@ void Lab_ChangeCPUPercent(GOBJ *menu_gobj, int value)
     GOBJ *fighter = Fighter_GetGObj(1);
     FighterData *fighter_data = fighter->userdata;
 
-    if(LabOptions_CPU[OPTCPU_LOCKPCNT].option_val != OPT_LOCKPCNT_OFF)
-        cpu_lockPercent = fighter_data->dmg.percent;
+    if (LabOptions_CPU[OPTCPU_LOCKPCNT].option_val)
+        cpu_locked_percent = fighter_data->dmg.percent;
 
     fighter_data->dmg.percent = value;
     Fighter_SetHUDDamage(1, value);
@@ -114,8 +114,8 @@ void Lab_ChangeCPULockPercent(GOBJ *menu_gobj, int value)
     GOBJ *fighter = Fighter_GetGObj(1);
     FighterData *fighter_data = fighter->userdata;
 
-    if(value != OPT_LOCKPCNT_OFF)
-        cpu_lockPercent = fighter_data->dmg.percent;
+    if (value)
+        cpu_locked_percent = fighter_data->dmg.percent;
 
     return;
 }
@@ -5239,17 +5239,16 @@ void Event_Think(GOBJ *event)
     HSD_Pad *pad = PadGet(hmn_data->player_controller_number, PADGET_ENGINE);
 
     // lock percent if enabled
-    if(LabOptions_CPU[OPTCPU_LOCKPCNT].option_val != OPT_LOCKPCNT_OFF)
+    if (LabOptions_CPU[OPTCPU_LOCKPCNT].option_val)
     {
-        cpu_data->dmg.percent = cpu_lockPercent;
-        Fighter_SetHUDDamage(1, (int)cpu_lockPercent);
-
+        cpu_data->dmg.percent = cpu_locked_percent;
+        Fighter_SetHUDDamage(1, cpu_locked_percent);
     }
-    if(LabOptions_General[OPTGEN_HMNPCNTLOCK].option_val != OPT_LOCKPCNT_OFF)
-    {
-        hmn_data->dmg.percent = player_lockPercent;
-        Fighter_SetHUDDamage(0, (int)player_lockPercent);
 
+    if (LabOptions_General[OPTGEN_HMNPCNTLOCK].option_val)
+    {
+        hmn_data->dmg.percent = hmn_locked_percent;
+        Fighter_SetHUDDamage(0, hmn_locked_percent);
     }        
 
     // update menu's percent

diff --git a/src/lab.h b/src/lab.h
@@ -90,12 +90,6 @@ enum cpu_option
     OPTCPU_SHIELDHITS,
 };
 
-enum lockPercent_option
-{
-    OPT_LOCKPCNT_OFF = 0,
-    OPT_LOCKPCNT_ON,
-};
-
 enum tech_option 
 {
     OPTTECH_INVISIBLE,
@@ -1447,7 +1441,6 @@ static EventMenu LabMenu_Main = {
 // General
 static char **LabOptions_CamMode[] = {"Normal", "Zoom", "Fixed", "Advanced"};
 static char **LabOptions_FrameAdvButton[] = {"L", "Z", "X", "Y"};
-static char **LabOptions_LockPlayerPercent[] = {"Off", "On"};
 static EventOption LabOptions_General[] = {
     // frame advance
     {
@@ -1490,7 +1483,7 @@ static EventOption LabOptions_General[] = {
         .menu = 0,                           
         .option_name = "Lock Player Percent",        
         .desc = "Locks Player percent to current percent",
-        .option_values = LabOptions_LockPlayerPercent,             
+        .option_values = LabOptions_OffOn,             
         .onOptionChange = Lab_ChangePlayerLockPercent,
     },
     // model display