From fda0850ad76cbd907082d9019d91bf85e6d5c9e3 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Sun, 16 Aug 2015 21:39:42 +0200
Subject: [PATCH] Condensed duplicated function, alphabetized PREPs

---
 addons/repair/ACE_Repair.hpp                  |  4 ++--
 addons/repair/XEH_preInit.sqf                 | 15 ++++++------
 ...c_canRemoveTrack.sqf => fnc_canRemove.sqf} |  6 ++---
 .../repair/functions/fnc_canRemoveWheel.sqf   | 23 -------------------
 4 files changed, 12 insertions(+), 36 deletions(-)
 rename addons/repair/functions/{fnc_canRemoveTrack.sqf => fnc_canRemove.sqf} (72%)
 delete mode 100644 addons/repair/functions/fnc_canRemoveWheel.sqf

diff --git a/addons/repair/ACE_Repair.hpp b/addons/repair/ACE_Repair.hpp
index 01ad3aee23..c12566d5b1 100644
--- a/addons/repair/ACE_Repair.hpp
+++ b/addons/repair/ACE_Repair.hpp
@@ -25,7 +25,7 @@ class ACE_Repair {
         class RemoveWheel: ReplaceWheel {
             displayName = CSTRING(RemoveWheel);
             displayNameProgress = CSTRING(RemovingWheel);
-            condition = QUOTE(call FUNC(canRemoveWheel));
+            condition = QUOTE(call FUNC(canRemove));
             callbackSuccess = QUOTE(call FUNC(doRemoveWheel));
         };
         class MiscRepair: ReplaceWheel {
@@ -46,7 +46,7 @@ class ACE_Repair {
         class RemoveTrack: MiscRepair {
             displayName = CSTRING(RemoveTrack);
             displayNameProgress = CSTRING(RemovingTrack);
-            condition = QUOTE(call FUNC(canRemoveTrack));
+            condition = QUOTE(call FUNC(canRemove));
             callbackSuccess = QUOTE(call FUNC(doRemoveTrack));
             requiredEngineer = QGVAR(engineerSetting_Wheel);
         };
diff --git a/addons/repair/XEH_preInit.sqf b/addons/repair/XEH_preInit.sqf
index 38de84a452..ebf4c87537 100644
--- a/addons/repair/XEH_preInit.sqf
+++ b/addons/repair/XEH_preInit.sqf
@@ -3,19 +3,18 @@
 ADDON = false;
 
 PREP(addRepairActions);
-PREP(canRemoveWheel);
-PREP(canRemoveTrack);
+PREP(canRemove);
 PREP(canRepair);
 PREP(canRepairTrack);
-PREP(canReplaceWheel);
 PREP(canReplaceTrack);
-PREP(doRemoveWheel);
-PREP(doRemoveTrack);
-PREP(doRepair);
+PREP(canReplaceWheel);
 PREP(doFullRepair);
+PREP(doRemoveTrack);
+PREP(doRemoveWheel);
+PREP(doRepair);
 PREP(doRepairTrack);
-PREP(doReplaceWheel);
 PREP(doReplaceTrack);
+PREP(doReplaceWheel);
 PREP(getPostRepairDamage);
 PREP(getWheelHitPointsWithSelections);
 PREP(hasItems);
@@ -23,10 +22,10 @@ PREP(isEngineer);
 PREP(isInRepairFacility);
 PREP(isNearRepairVehicle);
 PREP(isRepairVehicle);
-PREP(moduleRepairSettings);
 PREP(moduleAssignEngineer);
 PREP(moduleAssignRepairVehicle);
 PREP(moduleAssignRepairFacility);
+PREP(moduleRepairSettings);
 PREP(normalizeHitPoints);
 PREP(repair);
 PREP(repair_failure);
diff --git a/addons/repair/functions/fnc_canRemoveTrack.sqf b/addons/repair/functions/fnc_canRemove.sqf
similarity index 72%
rename from addons/repair/functions/fnc_canRemoveTrack.sqf
rename to addons/repair/functions/fnc_canRemove.sqf
index ef1e3a6a00..9fa657a2bb 100644
--- a/addons/repair/functions/fnc_canRemoveTrack.sqf
+++ b/addons/repair/functions/fnc_canRemove.sqf
@@ -1,6 +1,6 @@
 /*
  * Author: commy2
- * Check if the unit can remove given wheel of the vehicle.
+ * Check if the unit can remove given wheel/track of the vehicle.
  *
  * Arguments:
  * 0: Unit that does the repairing <OBJECT>
@@ -8,10 +8,10 @@
  * 2: Selected hitpoint <STRING>
  *
  * Return Value:
- * None
+ * Can Remove <BOOL>
  *
  * Example:
- * [unit, vehicle, "hitpoint"] call ace_repair_fnc_canRemoveTrack
+ * [unit, vehicle, "hitpoint"] call ace_repair_fnc_canRemove
  *
  * Public: No
  */
diff --git a/addons/repair/functions/fnc_canRemoveWheel.sqf b/addons/repair/functions/fnc_canRemoveWheel.sqf
deleted file mode 100644
index 079f5e1fff..0000000000
--- a/addons/repair/functions/fnc_canRemoveWheel.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Author: commy2
- * Check if the unit can remove given wheel of the vehicle.
- *
- * Arguments:
- * 0: Unit that does the repairing <OBJECT>
- * 1: Vehicle to repair <OBJECT>
- * 2: Selected hitpoint <STRING>
- *
- * Return Value:
- * None
- *
- * Example:
- * [unit, vehicle, "hitpoint"] call ace_repair_fnc_canRemoveWheel
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-params ["_unit", "_target", "_hitPoint"];
-TRACE_3("params",_unit,_target,_hitPoint);
-
-alive _target && {_target getHitPointDamage _hitPoint < 1}